From fbbbb4144b5529c94ac0027edd842cfa5c0145fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Auswo=CC=88ger?= <martin@auswoeger.com>
Date: Wed, 29 Nov 2023 14:15:38 +0100
Subject: [PATCH 1/2] Fix legacy class palceholder definitions for static
 analysis

---
 Mapping/Loader/AnnotationLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mapping/Loader/AnnotationLoader.php b/Mapping/Loader/AnnotationLoader.php
index f5c8f9ccc..5ffbb3406 100644
--- a/Mapping/Loader/AnnotationLoader.php
+++ b/Mapping/Loader/AnnotationLoader.php
@@ -19,7 +19,7 @@ class_exists(AttributeLoader::class);
     /**
      * @deprecated since Symfony 6.4, to be removed in 7.0, use {@link AttributeLoader} instead
      */
-    class AnnotationLoader
+    class AnnotationLoader extends AttributeLoader
     {
     }
 }

From d751878816665fa3e51c75f01d31c6ee62e94ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20M=C3=BCller?= <anderson.a.muller@gmail.com>
Date: Wed, 29 Nov 2023 16:14:43 +0100
Subject: [PATCH 2/2] Fix support to denormalize plain object types

When denormalizing properties with a plain `object` type without a class the `ObjectNormalizer` would fail with a `TypeError`.
---
 Normalizer/AbstractObjectNormalizer.php         |  2 +-
 .../Normalizer/AbstractObjectNormalizerTest.php | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Normalizer/AbstractObjectNormalizer.php b/Normalizer/AbstractObjectNormalizer.php
index 732586bd8..79ede1a90 100644
--- a/Normalizer/AbstractObjectNormalizer.php
+++ b/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/Tests/Normalizer/AbstractObjectNormalizerTest.php b/Tests/Normalizer/AbstractObjectNormalizerTest.php
index 35616b658..4e781c5d8 100644
--- a/Tests/Normalizer/AbstractObjectNormalizerTest.php
+++ b/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 */