[Serializer] Improve UidNormalizer denormalize error message

fancyweb · fancyweb · commit b97bc531ec5d · 2021-12-15T16:37:19.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
@@ -71,10 +71,8 @@ public function denormalize($data, string $type, string $format = null, array $c
     {
         try {
             return AbstractUid::class !== $type ? $type::fromString($data) : Uuid::fromString($data);
-        } catch (\InvalidArgumentException $exception) {
-            throw NotNormalizableValueException::createForUnexpectedDataType('The data is not a valid UUID string representation.', $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
-        } catch (\TypeError $exception) {
-            throw NotNormalizableValueException::createForUnexpectedDataType('The data is not a valid UUID string representation.', $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
+        } catch (\InvalidArgumentException|\TypeError $exception) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The data is not a valid "%s" string representation.', $type), $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
         } catch (\Error $e) {
             if (str_starts_with($e->getMessage(), 'Cannot instantiate abstract class')) {
                 return $this->denormalize($data, AbstractUid::class, $format, $context);
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -884,7 +884,7 @@ public function testCollectDenormalizationErrors()
                 ],
                 'path' => 'uuid',
                 'useMessageForUser' => true,
-                'message' => 'The data is not a valid UUID string representation.',
+                'message' => 'The data is not a valid "Symfony\Component\Uid\Uuid" string representation.',
             ],
             [
                 'currentType' => 'null',

Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ public function testCollectDenormalizationErrors()`
`884`	`884`	`],`
`885`	`885`	`'path' => 'uuid',`
`886`	`886`	`'useMessageForUser' => true,`
`887`		`- 'message' => 'The data is not a valid UUID string representation.',`
	`887`	`+ 'message' => 'The data is not a valid "Symfony\Component\Uid\Uuid" string representation.',`
`888`	`888`	`],`
`889`	`889`	`[`
`890`	`890`	`'currentType' => 'null',`