Fix support to denormalize plain object types

andersonamuller · andersonamuller · commit 4a728f70dcdf · 2023-12-01T11:42:49.000+01:00
When denormalizing properties with a plain `object` type without a class the `ObjectNormalizer` would fail with a `TypeError`.
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -584,7 +584,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
 
                 $expectedTypes[Type::BUILTIN_TYPE_OBJECT === $builtinType && $class ? $class : $builtinType] = true;
 
-                if (Type::BUILTIN_TYPE_OBJECT === $builtinType) {
+                if (Type::BUILTIN_TYPE_OBJECT === $builtinType && null !== $class) {
                     if (!$this->serializer instanceof DenormalizerInterface) {
                         throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));
                     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -113,6 +113,17 @@ public function testDenormalizeWithExtraAttributesAndNoGroupsWithMetadataFactory
         );
     }
 
+    public function testDenormalizePlainObject()
+    {
+        $extractor = new PhpDocExtractor();
+        $normalizer = new ObjectNormalizer(null, null, null, $extractor);
+        $dummy = $normalizer->denormalize(['plainObject' => (object) ['foo' => 'bar']], DummyWithPlainObject::class);
+
+        $this->assertInstanceOf(DummyWithPlainObject::class, $dummy);
+        $this->assertInstanceOf(\stdClass::class, $dummy->plainObject);
+        $this->assertSame('bar', $dummy->plainObject->foo);
+    }
+
     public function testDenormalizeCollectionDecodedFromXmlWithOneChild()
     {
         $denormalizer = $this->getDenormalizerForDummyCollection();
@@ -598,6 +609,12 @@ protected function setAttributeValue(object $object, string $attribute, $value,
     }
 }
 
+class DummyWithPlainObject
+{
+    /** @var object */
+    public $plainObject;
+}
+
 class ObjectWithBasicProperties
 {
     /** @var bool */

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri`
`584`	`584`
`585`	`585`	`$expectedTypes[Type::BUILTIN_TYPE_OBJECT === $builtinType && $class ? $class : $builtinType] = true;`
`586`	`586`
`587`		`- if (Type::BUILTIN_TYPE_OBJECT === $builtinType) {`
	`587`	`+ if (Type::BUILTIN_TYPE_OBJECT === $builtinType && null !== $class) {`
`588`	`588`	`if (!$this->serializer instanceof DenormalizerInterface) {`
`589`	`589`	`throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));`
`590`	`590`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,17 @@ public function testDenormalizeWithExtraAttributesAndNoGroupsWithMetadataFactory`
`113`	`113`	`);`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ public function testDenormalizePlainObject()`
	`117`	`+ {`
	`118`	`+ $extractor = new PhpDocExtractor();`
	`119`	`+ $normalizer = new ObjectNormalizer(null, null, null, $extractor);`
	`120`	`+ $dummy = $normalizer->denormalize(['plainObject' => (object) ['foo' => 'bar']], DummyWithPlainObject::class);`
	`121`	`+`
	`122`	`+ $this->assertInstanceOf(DummyWithPlainObject::class, $dummy);`
	`123`	`+ $this->assertInstanceOf(\stdClass::class, $dummy->plainObject);`
	`124`	`+ $this->assertSame('bar', $dummy->plainObject->foo);`
	`125`	`+ }`
	`126`	`+`
`116`	`127`	`public function testDenormalizeCollectionDecodedFromXmlWithOneChild()`
`117`	`128`	`{`
`118`	`129`	`$denormalizer = $this->getDenormalizerForDummyCollection();`
`@@ -598,6 +609,12 @@ protected function setAttributeValue(object $object, string $attribute, $value,`
`598`	`609`	`}`
`599`	`610`	`}`
`600`	`611`
	`612`	`+class DummyWithPlainObject`
	`613`	`+{`
	`614`	`+ /** @var object */`
	`615`	`+ public $plainObject;`
	`616`	`+}`
	`617`	`+`
`601`	`618`	`class ObjectWithBasicProperties`
`602`	`619`	`{`
`603`	`620`	`/** @var bool */`