minor #52344 [Serializer] throw better exception in TranslatableNormalizer, add to changelog (xabbuh)

fabpot · fabpot · commit e8fe85177d84 · 2023-10-28T16:26:32.000-07:00
This PR was merged into the 6.4 branch. Discussion ---------- [Serializer] throw better exception in TranslatableNormalizer, add to changelog | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | follows #50212 Commits ------- d8a03d1 throw better exception in TranslatableNormalizer, add to changelog
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.4
 ---
 
+ * Add `TranslatableNormalizer`
  * Allow `Context` attribute to target classes
  * Deprecate Doctrine annotations support in favor of native attributes
  * Allow the `Groups` attribute/annotation on classes
diff --git a/src/Symfony/Component/Serializer/Normalizer/TranslatableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/TranslatableNormalizer.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Serializer\Normalizer;
 
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Contracts\Translation\TranslatableInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -36,7 +37,7 @@ public function __construct(
     public function normalize(mixed $object, string $format = null, array $context = []): string
     {
         if (!$object instanceof TranslatableInterface) {
-            throw new InvalidArgumentException(sprintf('The object must implement the "%s".', TranslatableInterface::class));
+            throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The object must implement the "%s".', TranslatableInterface::class), $object, [TranslatableInterface::class]);
         }
 
         return $object->trans($this->translator, $context[self::NORMALIZATION_LOCALE_KEY] ?? $this->defaultContext[self::NORMALIZATION_LOCALE_KEY]);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Serializer\Normalizer;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Serializer\Exception\InvalidArgumentException;`
	`15`	`+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;`
`15`	`16`	`use Symfony\Contracts\Translation\TranslatableInterface;`
`16`	`17`	`use Symfony\Contracts\Translation\TranslatorInterface;`
`17`	`18`
`@@ -36,7 +37,7 @@ public function __construct(`
`36`	`37`	`public function normalize(mixed $object, string $format = null, array $context = []): string`
`37`	`38`	`{`
`38`	`39`	`if (!$object instanceof TranslatableInterface) {`
`39`		`- throw new InvalidArgumentException(sprintf('The object must implement the "%s".', TranslatableInterface::class));`
	`40`	`+ throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The object must implement the "%s".', TranslatableInterface::class), $object, [TranslatableInterface::class]);`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`return $object->trans($this->translator, $context[self::NORMALIZATION_LOCALE_KEY] ?? $this->defaultContext[self::NORMALIZATION_LOCALE_KEY]);`