bug #52713 [Serializer] Fix deserialization_path missing using contructor (mtarld)

xabbuh · xabbuh · commit cd98a3ff8704 · 2023-11-24T11:20:24.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Serializer] Fix deserialization_path missing using contructor | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #44925 #52683 | License | MIT While trying to fix #44925, I used a wrong approach (#52683), and therefore introduced a bug. This PR fixes it and solve the previous issue in a better way. Commits ------- 8a33f53 [Serializer] Fix deserialization_path missing using contructor
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -351,10 +351,14 @@ protected function instantiateObject(array &$data, string $class, array &$contex
             $missingConstructorArguments = [];
             $params = [];
             $unsetKeys = [];
+            $objectDeserializationPath = $context['deserialization_path'] ?? null;
+
             foreach ($constructorParameters as $constructorParameter) {
                 $paramName = $constructorParameter->name;
                 $key = $this->nameConverter ? $this->nameConverter->normalize($paramName, $class, $format, $context) : $paramName;
 
+                $context['deserialization_path'] = $objectDeserializationPath ? $objectDeserializationPath.'.'.$paramName : $paramName;
+
                 $allowed = false === $allowedAttributes || \in_array($paramName, $allowedAttributes);
                 $ignored = !$this->isAllowedAttribute($class, $paramName, $format, $context);
                 if ($constructorParameter->isVariadic()) {
@@ -410,13 +414,15 @@ protected function instantiateObject(array &$data, string $class, array &$contex
                         sprintf('Failed to create object because the class misses the "%s" property.', $constructorParameter->name),
                         $data,
                         ['unknown'],
-                        $context['deserialization_path'] ?? null,
+                        $objectDeserializationPath,
                         true
                     );
                     $context['not_normalizable_value_exceptions'][] = $exception;
                 }
             }
 
+            $context['deserialization_path'] = $objectDeserializationPath;
+
             if ($missingConstructorArguments) {
                 throw new MissingConstructorArgumentsException(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires the following parameters to be present : "$%s".', $class, implode('", "$', $missingConstructorArguments)), 0, null, $missingConstructorArguments);
             }
@@ -489,8 +495,6 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
      */
     protected function createChildContext(array $parentContext, string $attribute, ?string $format): array
     {
-        $parentContext['deserialization_path'] = ($parentContext['deserialization_path'] ?? false) ? $parentContext['deserialization_path'].'.'.$attribute : $attribute;
-
         if (isset($parentContext[self::ATTRIBUTES][$attribute])) {
             $parentContext[self::ATTRIBUTES] = $parentContext[self::ATTRIBUTES][$attribute];
         } else {
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -1024,15 +1024,6 @@ public function testCollectDenormalizationErrors(?ClassMetadataFactory $classMet
                 'useMessageForUser' => true,
                 'message' => 'Failed to create object because the class misses the "constructorArgument" property.',
             ],
-            [
-                'currentType' => 'string',
-                'expectedTypes' => [
-                    'float',
-                ],
-                'path' => 'php74FullWithTypedConstructor',
-                'useMessageForUser' => false,
-                'message' => 'The type of the "something" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\Php74FullWithTypedConstructor" must be one of "float" ("string" given).',
-            ],
             [
                 'currentType' => 'string',
                 'expectedTypes' => [
