Merge pull request #2859 from karser/2.4-collection-denormalization-fix

Fixed denormalization of a constructor argument which is a collection of non-resources

Author: teohhanhui

features/serializer/deserialize_objects_using_constructor.feature

@@ -10,7 +10,12 @@ Feature: Resource with constructor deserializable
     """
     {
       "foo": "hello",
-      "bar": "world"
+      "bar": "world",
+      "items": [
+        {
+          "foo": "bar"
+        }
+      ]
     }
     """
     Then the response status code should be 201
@@ -25,7 +30,11 @@ Feature: Resource with constructor deserializable
       "id": 1,
       "foo": "hello",
       "bar": "world",
+      "items": [
+        {
+          "foo": "bar"
+        }
+      ],
       "baz": null
     }
     """
-

src/Serializer/AbstractItemNormalizer.php

@@ -677,7 +677,7 @@ private function createAttributeValue($attribute, $value, $format = null, array
 
             unset($context['resource_class']);
 
-            return $this->serializer->denormalize($value, $className, $format, $context);
+            return $this->serializer->denormalize($value, $className.'[]', $format, $context);
         }
 
         if (null !== $className = $type->getClassName()) {

tests/Fixtures/TestBundle/Document/DummyEntityWithConstructor.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Document;
 
 use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Tests\Fixtures\DummyObjectWithoutConstructor;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -62,10 +63,19 @@ class DummyEntityWithConstructor
      */
     private $baz;
 
-    public function __construct(string $foo, string $bar)
+    /**
+     * @var DummyObjectWithoutConstructor[]
+     */
+    private $items;
+
+    /**
+     * @param DummyObjectWithoutConstructor[] $items
+     */
+    public function __construct(string $foo, string $bar, array $items)
     {
         $this->foo = $foo;
         $this->bar = $bar;
+        $this->items = $items;
     }
 
     public function getId(): int
@@ -83,6 +93,14 @@ public function getBar(): string
         return $this->bar;
     }
 
+    /**
+     * @return DummyObjectWithoutConstructor[]
+     */
+    public function getItems(): array
+    {
+        return $this->items;
+    }
+
     /**
      * @return string
      */

tests/Fixtures/TestBundle/Entity/DummyEntityWithConstructor.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Tests\Fixtures\DummyObjectWithoutConstructor;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -64,10 +65,19 @@ class DummyEntityWithConstructor
      */
     private $baz;
 
-    public function __construct(string $foo, string $bar)
+    /**
+     * @var DummyObjectWithoutConstructor[]
+     */
+    private $items;
+
+    /**
+     * @param DummyObjectWithoutConstructor[] $items
+     */
+    public function __construct(string $foo, string $bar, array $items)
     {
         $this->foo = $foo;
         $this->bar = $bar;
+        $this->items = $items;
     }
 
     public function getId(): int
@@ -85,6 +95,14 @@ public function getBar(): string
         return $this->bar;
     }
 
+    /**
+     * @return DummyObjectWithoutConstructor[]
+     */
+    public function getItems(): array
+    {
+        return $this->items;
+    }
+
     /**
      * @return string
      */