Fix using DateIntervalNormalizer with union types

Jeroeny · Jeroeny · commit 230ba6b79890 · 2023-10-11T14:58:20.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -11,8 +11,9 @@
 
 namespace Symfony\Component\Serializer\Normalizer;
 
+use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 
 /**
  * Normalizes an instance of {@see \DateInterval} to an interval string.
@@ -70,17 +71,16 @@ public function hasCacheableSupportsMethod(): bool
      *
      * @return \DateInterval
      *
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
+     * @throws NotNormalizableValueException
      */
     public function denormalize($data, string $type, string $format = null, array $context = [])
     {
         if (!\is_string($data)) {
-            throw new InvalidArgumentException(sprintf('Data expected to be a string, "%s" given.', get_debug_type($data)));
+            throw NotNormalizableValueException::createForUnexpectedDataType('Data expected to be a string.', $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
         }
 
         if (!$this->isISO8601($data)) {
-            throw new UnexpectedValueException('Expected a valid ISO 8601 interval string.');
+            throw NotNormalizableValueException::createForUnexpectedDataType('Expected a valid ISO 8601 interval string.', $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
         }
 
         $dateIntervalFormat = $context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY];
@@ -98,7 +98,7 @@ public function denormalize($data, string $type, string $format = null, array $c
         }
         $valuePattern = '/^'.$signPattern.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?:(?P<$1>\d+)$2)?', preg_replace('/(T.*)$/', '($1)?', $dateIntervalFormat)).'$/';
         if (!preg_match($valuePattern, $data)) {
-            throw new UnexpectedValueException(sprintf('Value "%s" contains intervals not accepted by format "%s".', $data, $dateIntervalFormat));
+            throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Value "%s" contains intervals not accepted by format "%s".', $data, $dateIntervalFormat), $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, false);
         }
 
         try {
@@ -114,8 +114,10 @@ public function denormalize($data, string $type, string $format = null, array $c
             }
 
             return new \DateInterval($data);
+        } catch (NotNormalizableValueException $e) {
+            throw $e;
         } catch (\Exception $e) {
-            throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);
+            throw NotNormalizableValueException::createForUnexpectedDataType($e->getMessage(), $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, false, $e->getCode(), $e);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Serializer\Normalizer;`
`13`	`13`
	`14`	`+use Symfony\Component\PropertyInfo\Type;`
`14`	`15`	`use Symfony\Component\Serializer\Exception\InvalidArgumentException;`
`15`		`-use Symfony\Component\Serializer\Exception\UnexpectedValueException;`
	`16`	`+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* Normalizes an instance of {@see \DateInterval} to an interval string.`
`@@ -70,17 +71,16 @@ public function hasCacheableSupportsMethod(): bool`
`70`	`71`	`*`
`71`	`72`	`* @return \DateInterval`
`72`	`73`	`*`
`73`		`- * @throws InvalidArgumentException`
`74`		`- * @throws UnexpectedValueException`
	`74`	`+ * @throws NotNormalizableValueException`
`75`	`75`	`*/`
`76`	`76`	`public function denormalize($data, string $type, string $format = null, array $context = [])`
`77`	`77`	`{`
`78`	`78`	`if (!\is_string($data)) {`
`79`		`- throw new InvalidArgumentException(sprintf('Data expected to be a string, "%s" given.', get_debug_type($data)));`
	`79`	`+ throw NotNormalizableValueException::createForUnexpectedDataType('Data expected to be a string.', $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (!$this->isISO8601($data)) {`
`83`		`- throw new UnexpectedValueException('Expected a valid ISO 8601 interval string.');`
	`83`	`+ throw NotNormalizableValueException::createForUnexpectedDataType('Expected a valid ISO 8601 interval string.', $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`$dateIntervalFormat = $context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY];`
`@@ -98,7 +98,7 @@ public function denormalize($data, string $type, string $format = null, array $c`
`98`	`98`	`}`
`99`	`99`	`$valuePattern = '/^'.$signPattern.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?:(?P<$1>\d+)$2)?', preg_replace('/(T.*)$/', '($1)?', $dateIntervalFormat)).'$/';`
`100`	`100`	`if (!preg_match($valuePattern, $data)) {`
`101`		`- throw new UnexpectedValueException(sprintf('Value "%s" contains intervals not accepted by format "%s".', $data, $dateIntervalFormat));`
	`101`	`+ throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Value "%s" contains intervals not accepted by format "%s".', $data, $dateIntervalFormat), $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, false);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`try {`
`@@ -114,8 +114,10 @@ public function denormalize($data, string $type, string $format = null, array $c`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`return new \DateInterval($data);`
	`117`	`+ } catch (NotNormalizableValueException $e) {`
	`118`	`+ throw $e;`
`117`	`119`	`} catch (\Exception $e) {`
`118`		`- throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);`
	`120`	`+ throw NotNormalizableValueException::createForUnexpectedDataType($e->getMessage(), $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, false, $e->getCode(), $e);`
`119`	`121`	`}`
`120`	`122`	`}`
`121`	`123`