apply fabbpot.io patch

oneNevan · oneNevan · commit 7744b3494c34 · 2023-11-17T15:56:19.000+03:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -34,8 +34,6 @@ public function __construct(array $defaultContext = [])
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return string
      *
      * @throws InvalidArgumentException
@@ -49,25 +47,17 @@ public function normalize($object, string $format = null, array $context = [])
         return $object->format($context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsNormalization($data, string $format = null)
     {
         return $data instanceof \DateInterval;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasCacheableSupportsMethod(): bool
     {
         return __CLASS__ === static::class;
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return \DateInterval
      *
      * @throws NotNormalizableValueException
@@ -118,17 +108,14 @@ public function denormalize($data, string $type, string $format = null, array $c
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsDenormalization($data, string $type, string $format = null)
     {
         return \DateInterval::class === $type;
     }
 
     private function isISO8601(string $string): bool
     {
-        if (PHP_VERSION_ID >= 80000) {
+        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);
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
@@ -123,6 +123,7 @@ public function testDenormalizeIntervalsWithOmittedPartsBeingZero()
      * Since PHP 8.0 DateInterval::construct supports periods containing both D and W period designators.
      *
      * @requires PHP 8
+     *
      * @testWith ["%rP%yY%mM%wW%dDT%hH%iM%sS","P3W2D", 23]
      */
     public function testDenormalizeIntervalWithBothWeeksAndDays(string $format, string $input, int $expectedDays)

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ public function __construct(array $defaultContext = [])`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`37`		`- * {@inheritdoc}`
`38`		`- *`
`39`	`37`	`* @return string`
`40`	`38`	`*`
`41`	`39`	`* @throws InvalidArgumentException`
`@@ -49,25 +47,17 @@ public function normalize($object, string $format = null, array $context = [])`
`49`	`47`	`return $object->form 8000 at($context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY]);`
`50`	`48`	`}`
`51`	`49`
`52`		`- /**`
`53`		`- * {@inheritdoc}`
`54`		`- */`
`55`	`50`	`public function supportsNormalization($data, string $format = null)`
`56`	`51`	`{`
`57`	`52`	`return $data instanceof \DateInterval;`
`58`	`53`	`}`
`59`	`54`
`60`		`- /**`
`61`		`- * {@inheritdoc}`
`62`		`- */`
`63`	`55`	`public function hasCacheableSupportsMethod(): bool`
`64`	`56`	`{`
`65`	`57`	`return __CLASS__ === static::class;`
`66`	`58`	`}`
`67`	`59`
`68`	`60`	`/**`
`69`		`- * {@inheritdoc}`
`70`		`- *`
`71`	`61`	`* @return \DateInterval`
`72`	`62`	`*`
`73`	`63`	`* @throws NotNormalizableValueException`
`@@ -118,17 +108,14 @@ public function denormalize($data, string $type, string $format = null, array $c`
`118`	`108`	`}`
`119`	`109`	`}`
`120`	`110`
`121`		`- /**`
`122`		`- * {@inheritdoc}`
`123`		`- */`
`124`	`111`	`public function supportsDenormalization($data, string $type, string $format = null)`
`125`	`112`	`{`
`126`	`113`	`return \DateInterval::class === $type;`
`127`	`114`	`}`
`128`	`115`
`129`	`116`	`private function isISO8601(string $string): bool`
`130`	`117`	`{`
`131`		`- if (PHP_VERSION_ID >= 80000) {`
	`118`	`+ if (\PHP_VERSION_ID >= 80000) {`
`132`	`119`	`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`	`120`	`}`
`134`	`121`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ public function testDenormalizeIntervalsWithOmittedPartsBeingZero()`
`123`	`123`	`* Since PHP 8.0 DateInterval::construct supports periods containing both D and W period designators.`
`124`	`124`	`*`
`125`	`125`	`* @requires PHP 8`
	`126`	`+ *`
`126`	`127`	`* @testWith ["%rP%yY%mM%wW%dDT%hH%iM%sS","P3W2D", 23]`
`127`	`128`	`*/`
`128`	`129`	`public function testDenormalizeIntervalWithBothWeeksAndDays(string $format, string $input, int $expectedDays)`