[Serializer] Fix denormalizing date intervals having both weeks and days

oneNevan · oneNevan · commit c88d49ea1bb7 · 2023-11-20T12:47:24.000+03:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -128,6 +128,10 @@ public function supportsDenormalization($data, string $type, string $format = nu
 
     private function isISO8601(string $string): bool
     {
+        if (\PHP_VERSION_ID >= 80000) {
+            return preg_match('/^[\-+]?P(?=\w*(?:\d|%\w))(?:\d+Y|%[yY]Y)?(?:\d+M|%[mM]M)?(?:\d+W|%[wW]W)?(?:\d+D|%[dD]D)?(?:T(?:\d+H|[hH]H)?(?:\d+M|[iI]M)?(?:\d+S|[sS]S)?)?$/', $string);
+        }
+
         return preg_match('/^[\-+]?P(?=\w*(?:\d|%\w))(?:\d+Y|%[yY]Y)?(?:\d+M|%[mM]M)?(?:(?:\d+D|%[dD]D)|(?:\d+W|%[wW]W))?(?:T(?:\d+H|[hH]H)?(?:\d+M|[iI]M)?(?:\d+S|[sS]S)?)?$/', $string);
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
@@ -119,6 +119,21 @@ public function testDenormalizeIntervalsWithOmittedPartsBeingZero()
         $this->assertDateIntervalEquals($this->getInterval('P0Y0M0DT12H34M0S'), $normalizer->denormalize('PT12H34M', \DateInterval::class));
     }
 
+    /**
+     * Since PHP 8.0 DateInterval::construct supports periods containing both D and W period designators.
+     *
+     * @requires PHP 8
+     */
+    public function testDenormalizeIntervalWithBothWeeksAndDays()
+    {
+        $input = 'P1W1D';
+        $interval = $this->normalizer->denormalize($input, \DateInterval::class, null, [
+            DateIntervalNormalizer::FORMAT_KEY => '%rP%yY%mM%wW%dDT%hH%iM%sS',
+        ]);
+        $this->assertDateIntervalEquals($this->getInterval($input), $interval);
+        $this->assertSame(8, $interval->d);
+    }
+
     public function testDenormalizeExpectsString()
     {
         $this->expectException(NotNormalizableValueException::class);

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,10 @@ public function supportsDenormalization($data, string $type, string $format = nu`
`128`	`128`
`129`	`129`	`private function isISO8601(string $string): bool`
`130`	`130`	`{`
	`131`	`+ if (\PHP_VERSION_ID >= 80000) {`
	`132`	`+ return preg_match('/^[\-+]?P(?=\w*(?:\d\|%\w))(?:\d+Y\|%[yY]Y)?(?:\d+M\|%[mM]M)?(?:\d+W\|%[wW]W)?(?:\d+D\|%[dD]D)?(?:T(?:\d+H\|[hH]H)?(?:\d+M\|[iI]M)?(?:\d+S\|[sS]S)?)?$/', $string);`
	`133`	`+ }`
	`134`	`+`
`131`	`135`	`return preg_match('/^[\-+]?P(?=\w*(?:\d\|%\w))(?:\d+Y\|%[yY]Y)?(?:\d+M\|%[mM]M)?(?:(?:\d+D\|%[dD]D)\|(?:\d+W\|%[wW]W))?(?:T(?:\d+H\|[hH]H)?(?:\d+M\|[iI]M)?(?:\d+S\|[sS]S)?)?$/', $string);`
`132`	`136`	`}`
`133`	`137`	`}`