Merge branch '5.4' into 6.3

* 5.4: Fix support to denormalize plain object types [Routing] Restore aliases removal in RouteCollection::remove() remove duplicated service definition
symfony · Dec 1, 2023 · 6eee0fd · 6eee0fd
2 parents 87faafc + d751878
commit 6eee0fd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Normalizer/AbstractObjectNormalizer.php b/Normalizer/AbstractObjectNormalizer.php
@@ -547,7 +547,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/Tests/Normalizer/AbstractObjectNormalizerTest.php b/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -122,6 +122,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 testDenormalizeWithDuplicateNestedAttributes()
     {
         $this->expectException(LogicException::class);
@@ -1145,6 +1156,12 @@ protected function setAttributeValue(object $object, string $attribute, $value,
     }
 }
 
+class DummyWithPlainObject
+{
+    /** @var object */
+    public $plainObject;
+}
+
 class ObjectWithBasicProperties
 {
     /** @var bool */