bug #57928 [Serializer] fix denormalizing mixed collection values (rynhndrcksn)

nicolas-grekas · nicolas-grekas · commit dfffe58c33cd · 2024-08-13T12:18:00.000+02:00
This PR was merged into the 7.1 branch. Discussion ---------- [Serializer] fix denormalizing mixed collection values | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #57914 | License | MIT Commits ------- f42ff39 fix denormalizing mixed collection values
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -767,6 +767,12 @@ private function validateAndDenormalize(Type $type, string $currentClass, string
                                 $class = null;
                             }
                         }
+                    } elseif ($t instanceof ObjectType) {
+                        $typeIdentifier = TypeIdentifier::OBJECT;
+                        $class = $t->getClassName();
+                    } else {
+                        $typeIdentifier = $t->getTypeIdentifier();
+                        $class = null;
                     }
                 } else {
                     if ($t instanceof ObjectType) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -1224,6 +1224,29 @@ public function provideDenormalizeWithFilterBoolData(): array
             [['foo' => 'something'], null],
         ];
     }
+
+    public function testDenormalizeArrayObject()
+    {
+        $normalizer = new class() extends AbstractObjectNormalizerDummy {
+            public function __construct()
+            {
+                parent::__construct(null, null, new PhpDocExtractor());
+            }
+
+            protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+            {
+                return true;
+            }
+        };
+        $serializer = new Serializer([$normalizer]);
+        $normalizer->setSerializer($serializer);
+
+        $actual = $normalizer->denormalize(['foo' => ['array' => ['key' => 'value']]], DummyWithArrayObject::class);
+
+        $this->assertInstanceOf(DummyWithArrayObject::class, $actual);
+        $this->assertInstanceOf(\ArrayObject::class, $actual->foo);
+        $this->assertSame(1, $actual->foo->count());
+    }
 }
 
 class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer
@@ -1515,6 +1538,12 @@ class BoolPropertyDummy
     public $foo;
 }
 
+class DummyWithArrayObject
+{
+    /** @var \ArrayObject<string, mixed> */
+    public $foo;
+}
+
 class SerializerCollectionDummy implements SerializerInterface, DenormalizerInterface
 {
     private array $normalizers;

Original file line number	Diff line number	Diff line change
`@@ -767,6 +767,12 @@ private function validateAndDenormalize(Type $type, string $currentClass, string`
`767`	`767`	`$class = null;`
`768`	`768`	`}`
`769`	`769`	`}`
	`770`	`+ } elseif ($t instanceof ObjectType) {`
	`771`	`+ $typeIdentifier = TypeIdentifier::OBJECT;`
	`772`	`+ $class = $t->getClassName();`
	`773`	`+ } else {`
	`774`	`+ $typeIdentifier = $t->getTypeIdentifier();`
	`775`	`+ $class = null;`
`770`	`776`	`}`
`771`	`777`	`} else {`
`772`	`778`	`if ($t instanceof ObjectType) {`