bug #37845 [Serializer] Fix variadic support when using type hints (fabpot)

fabpot · fabpot · commit 688dbd9dabe8 · 2020-08-16T10:23:32.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Serializer] Fix variadic support when using type hints | Q | A | ------------- | --- | Branch? | 3.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | n/a  | License | MIT | Doc PR | n/a Commits ------- 3fffa96 [Serializer] Fix variadic support when using type hints
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -304,7 +304,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
      */
     protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)
     {
-        if (null === $this->propertyTypeExtractor || null === $this->propertyTypeExtractor->getTypes($class->getName(), $parameterName)) {
+        if ((method_exists($parameter, 'isVariadic') && $parameter->isVariadic()) || null === $this->propertyTypeExtractor || null === $this->propertyTypeExtractor->getTypes($class->getName(), $parameterName)) {
             return parent::denormalizeParameter($class, $parameter, $parameterName, $parameterData, $context, $format);
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/VariadicConstructorTypedArgsDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/VariadicConstructorTypedArgsDummy.php
@@ -20,6 +20,7 @@ public function __construct(Dummy ...$foo)
         $this->foo = $foo;
     }
 
+    /** @return Dummy[] */
     public function getFoo()
     {
         return $this->foo;
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
@@ -4,6 +4,8 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Mapping\AttributeMetadata;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
@@ -135,19 +137,49 @@ public function testObjectWithNullableConstructorArgument()
     }
 
     /**
+     * @dataProvider getNormalizer
+     *
      * @requires PHP 5.6
      */
-    public function testObjectWithVariadicConstructorTypedArguments()
+    public function testObjectWithVariadicConstructorTypedArguments(AbstractNormalizer $normalizer)
     {
-        $normalizer = new PropertyNormalizer();
-        $normalizer->setSerializer(new Serializer([$normalizer]));
-        $data = ['foo' => [['foo' => 'Foo', 'bar' => 'Bar', 'baz' => 'Baz', 'qux' => 'Qux'], ['foo' => 'FOO', 'bar' => 'BAR', 'baz' => 'BAZ', 'qux' => 'QUX']]];
-        $dummy = $normalizer->denormalize($data, VariadicConstructorTypedArgsDummy::class);
+        $d1 = new Dummy();
+        $d1->foo = 'Foo';
+        $d1->bar = 'Bar';
+        $d1->baz = 'Baz';
+        $d1->qux = 'Quz';
+        $d2 = new Dummy();
+        $d2->foo = 'FOO';
+        $d2->bar = 'BAR';
+        $d2->baz = 'BAZ';
+        $d2->qux = 'QUZ';
+        $obj = new VariadicConstructorTypedArgsDummy($d1, $d2);
+
+        $serializer = new Serializer([$normalizer], [new JsonEncoder()]);
+        $normalizer->setSerializer($serializer);
+        $data = $serializer->serialize($obj, 'json');
+        $dummy = $normalizer->denormalize(json_decode($data, true), VariadicConstructorTypedArgsDummy::class);
+        $this->assertInstanceOf(VariadicConstructorTypedArgsDummy::class, $dummy);
+        $this->assertCount(2, $dummy->getFoo());
+        foreach ($dummy->getFoo() as $foo) {
+            $this->assertInstanceOf(Dummy::class, $foo);
+        }
 
+        $dummy = $serializer->deserialize($data, VariadicConstructorTypedArgsDummy::class, 'json');
         $this->assertInstanceOf(VariadicConstructorTypedArgsDummy::class, $dummy);
         $this->assertCount(2, $dummy->getFoo());
         foreach ($dummy->getFoo() as $foo) {
             $this->assertInstanceOf(Dummy::class, $foo);
         }
     }
+
+    public function getNormalizer()
+    {
+        $extractor = new PhpDocExtractor();
+
+        yield [new PropertyNormalizer()];
+        yield [new PropertyNormalizer(null, null, $extractor)];
+        yield [new ObjectNormalizer()];
+        yield [new ObjectNormalizer(null, null, null, $extractor)];
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma`
`304`	`304`	`*/`
`305`	`305`	`protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)`
`306`	`306`	`{`
`307`		`- if (null === $this->propertyTypeExtractor \|\| null === $this->propertyTypeExtractor->getTypes($class->getName(), $parameterName)) {`
	`307`	`+ if ((method_exists($parameter, 'isVariadic') && $parameter->isVariadic()) \|\| null === $this->propertyTypeExtractor \|\| null === $this->propertyTypeExtractor->getTypes($class->getName(), $parameterName)) {`
`308`	`308`	`return parent::denormalizeParameter($class, $parameter, $parameterName, $parameterData, $context, $format);`
`309`	`309`	`}`
`310`	`310`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public function __construct(Dummy ...$foo)`
`20`	`20`	`$this->foo = $foo;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ /** @return Dummy[] */`
`23`	`24`	`public function getFoo()`
`24`	`25`	`{`
`25`	`26`	`return $this->foo;`