[Serializer] [PropertyAccess] Fix "type unknown" on denormalize

seferov · seferov · commit 003dbeed2eac · 2023-12-04T03:08:44.000+03:00
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -252,7 +252,7 @@ public function testValidationNotPassed()
         } catch (HttpException $e) {
             $validationFailedException = $e->getPrevious();
             $this->assertInstanceOf(ValidationFailedException::class, $validationFailedException);
-            $this->assertSame('This value should be of type unknown.', $validationFailedException->getViolations()[0]->getMessage());
+            $this->assertSame('This value should be of type string.', $validationFailedException->getViolations()[0]->getMessage());
             $this->assertSame('Test', $validationFailedException->getViolations()[1]->getMessage());
         }
     }
diff --git a/src/Symfony/Component/PropertyAccess/Exception/InvalidTypeException.php b/src/Symfony/Component/PropertyAccess/Exception/InvalidTypeException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Thrown when a type of given value does not match an expected type.
+ *
+ * @author Farhad Safarov <farhad.safarov@gmail.com>
+ */
+class InvalidTypeException extends InvalidArgumentException
+{
+    public function __construct(
+        public readonly string $expectedType,
+        public readonly string $actualType,
+        public readonly string $propertyPath,
+        \Throwable $previous = null,
+    ) {
+        parent::__construct(
+            sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $expectedType, 'NULL' === $actualType ? 'null' : $actualType, $propertyPath),
+            previous: $previous,
+        );
+    }
+}
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\PropertyAccess\Exception\AccessException;
-use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;
+use Symfony\Component\PropertyAccess\Exception\InvalidTypeException;
 use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 use Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException;
@@ -208,12 +208,12 @@ private static function throwInvalidArgumentException(string $message, array $tr
         if (preg_match('/^\S+::\S+\(\): Argument #\d+ \(\$\S+\) must be of type (\S+), (\S+) given/', $message, $matches)) {
             [, $expectedType, $actualType] = $matches;
 
-            throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $expectedType, 'NULL' === $actualType ? 'null' : $actualType, $propertyPath), 0, $previous);
+            throw new InvalidTypeException($expectedType, $actualType, $propertyPath, $previous);
         }
         if (preg_match('/^Cannot assign (\S+) to property \S+::\$\S+ of type (\S+)$/', $message, $matches)) {
             [, $actualType, $expectedType] = $matches;
 
-            throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $expectedType, 'NULL' === $actualType ? 'null' : $actualType, $propertyPath), 0, $previous);
+            throw new InvalidTypeException($expectedType, $actualType, $propertyPath, $previous);
         }
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Serializer\Normalizer;
 
 use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException as PropertyAccessInvalidArgumentException;
+use Symfony\Component\PropertyAccess\Exception\InvalidTypeException as PropertyAccessInvalidTypeException;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
@@ -398,7 +399,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
                 $exception = NotNormalizableValueException::createForUnexpectedDataType(
                     sprintf('Failed to denormalize attribute "%s" value for class "%s": '.$e->getMessage(), $attribute, $type),
                     $data,
-                    ['unknown'],
+                    $e instanceof PropertyAccessInvalidTypeException ? [$e->expectedType] : ['unknown'],
                     $context['deserialization_path'] ?? null,
                     false,
                     $e->getCode(),

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public function testValidationNotPassed()`
`252`	`252`	`} catch (HttpException $e) {`
`253`	`253`	`$validationFailedException = $e->getPrevious();`
`254`	`254`	`$this->assertInstanceOf(ValidationFailedException::class, $validationFailedException);`
`255`		`- $this->assertSame('This value should be of type unknown.', $validationFailedException->getViolations()[0]->getMessage());`
	`255`	`+ $this->assertSame('This value should be of type string.', $validationFailedException->getViolations()[0]->getMessage());`
`256`	`256`	`$this->assertSame('Test', $validationFailedException->getViolations()[1]->getMessage());`
`257`	`257`	`}`
`258`	`258`	`}`