bug #49700 [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize() (André Laugks)

nicolas-grekas · nicolas-grekas · commit e39ff9300dfc · 2023-09-29T11:35:20.000+02:00
This PR was squashed before being merged into the 6.3 branch. Discussion ---------- [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize() | Q | A | ------------- | --- | Branch | 6.2 | Bug fix | yes | New feature? | no | Deprecations? | no | Tickets | #49538 | License | MIT | Doc PR | no In the method `AbstractObjectNormalizer::denormalize()` the index of the array `$normalizedData` is reindexed after an `array_merge`. This error occurs when a JSON is deserialised and when the SerializedName is numeric. This results in an incorrect mapping to the properties. ```json { "1": "John", "2": "Doe", "10031": "john.doe@example.com", } ``` Array before merge: ```php array ( 1 => 'John', 2 => 'Doe', 10031 => 'john.doe@example.com', ) ``` After merge with `array_merge`: ```php array ( 0 => 'John', 1 => 'Doe', 2 => 'john.doe@example.com', ) ``` After merge with `array_replace`: ```php array ( 0 => 'John', 1 => 'Doe', 10031 => 'john.doe@example.com', ) ``` All Serializer unittests run successfully. Commits ------- 91d9427 [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize()
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -339,7 +339,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
             $normalizedData = $this->removeNestedValue($serializedPath->getElements(), $normalizedData);
         }
 
-        $normalizedData = array_merge($normalizedData, $nestedData);
+        $normalizedData = $normalizedData + $nestedData;
 
         $object = $this->instantiateObject($normalizedData, $mappedClass, $context, new \ReflectionClass($mappedClass), $allowedAttributes, $format);
         $resolvedClass = ($this->objectClassResolver)($object);
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -787,6 +787,32 @@ classMetadataFactory: new ClassMetadataFactory(new AnnotationLoader()),
         $normalized = $serializer->normalize(new DummyWithEnumUnion(EnumB::B));
         $this->assertEquals(new DummyWithEnumUnion(EnumB::B), $serializer->denormalize($normalized, DummyWithEnumUnion::class));
     }
+
+    public function testDenormalizeWithNumberAsSerializedNameAndNoArrayReindex()
+    {
+        $normalizer = new AbstractObjectNormalizerWithMetadata();
+
+        $data = [
+            '1' => 'foo',
+            '99' => 'baz',
+        ];
+
+        $obj = new class() {
+            /**
+             * @SerializedName("1")
+             */
+            public $foo;
+
+            /**
+             * @SerializedName("99")
+             */
+            public $baz;
+        };
+
+        $test = $normalizer->denormalize($data, $obj::class);
+        $this->assertSame('foo', $test->foo);
+        $this->assertSame('baz', $test->baz);
+    }
 }
 
 class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar`
`339`	`339`	`$normalizedData = $this->removeNestedValue($serializedPath->getElements(), $normalizedData);`
`340`	`340`	`}`
`341`	`341`
`342`		`- $normalizedData = array_merge($normalizedData, $nestedData);`
	`342`	`+ $normalizedData = $normalizedData + $nestedData;`
`343`	`343`
`344`	`344`	`$object = $this->instantiateObject($normalizedData, $mappedClass, $context, new \ReflectionClass($mappedClass), $allowedAttributes, $format);`
`345`	`345`	`$resolvedClass = ($this->objectClassResolver)($object);`