[Serializer] Fix AbstractObjectNormalizer TypeError on denormalization

JustDylan23 · fancyweb · commit 89092ea27919 · 2022-01-12T13:46:58.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -296,7 +296,7 @@ protected function isAllowedAttribute(object|string $classOrObject, string $attr
      * Normalizes the given data to an array. It's particularly useful during
      * the denormalization process.
      */
-    protected function prepareForDenormalization(object|array|null $data): array
+    protected function prepareForDenormalization(mixed $data): array
     {
         return (array) $data;
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -14,6 +14,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\Exception\ExtraAttributesException;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
@@ -387,6 +388,17 @@ public function testNormalizeEmptyObject()
         $normalizedData = $normalizer->normalize(new EmptyDummy(), 'any', ['preserve_empty_objects' => true]);
         $this->assertEquals(new \ArrayObject(), $normalizedData);
     }
+
+    public function testDenormalizeRecursiveWithObjectAttributeWithStringValue()
+    {
+        $extractor = new ReflectionExtractor();
+        $normalizer = new ObjectNormalizer(null, null, null, $extractor);
+        $serializer = new Serializer([$normalizer]);
+
+        $obj = $serializer->denormalize(['inner' => 'foo'], ObjectOuter::class);
+
+        $this->assertInstanceOf(ObjectInner::class, $obj->getInner());
+    }
 }
 
 class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ protected function isAllowedAttribute(object\|string $classOrObject, string $attr`
`296`	`296`	`* Normalizes the given data to an array. It's particularly useful during`
`297`	`297`	`* the denormalization process.`
`298`	`298`	`*/`
`299`		`- protected function prepareForDenormalization(object\|array\|null $data): array`
	`299`	`+ protected function prepareForDenormalization(mixed $data): array`
`300`	`300`	`{`
`301`	`301`	`return (array) $data;`
`302`	`302`	`}`