From a190f6139ac31f2ef8f114262a4d8d3dd0558e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Thu, 10 Nov 2016 11:06:30 +0100
Subject: [PATCH 1/2] [FrameworkBundle] Register the ArrayDenormalizer

---
 .../Resources/config/serializer.xml           |  7 ++-
 .../Tests/Functional/SerializerTest.php       | 52 +++++++++++++++++++
 .../Functional/app/Serializer/bundles.php     | 16 ++++++
 .../Functional/app/Serializer/config.yml      |  6 +++
 4 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index 370b364cd9e78..c96e42c6084cb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -23,10 +23,15 @@
             <argument type="service" id="serializer.property_accessor" />
             <argument type="service" id="property_info" on-invalid="ignore" />
 
-            <!-- Run after all custom serializers -->
+            <!-- Run after all custom normalizers -->
             <tag name="serializer.normalizer" priority="-1000" />
         </service>
 
+        <service id="serializer.denormalizer.array" class="Symfony\Component\Serializer\Normalizer\ArrayDenormalizer" public="false">
+            <!-- Run before the object normalizer -->
+            <tag name="serializer.normalizer" priority="-990" />
+        </service>
+
         <!-- Loader -->
         <service id="serializer.mapping.chain_loader" class="Symfony\Component\Serializer\Mapping\Loader\LoaderChain" public="false">
             <argument type="collection" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
new file mode 100644
index 0000000000000..bc7dc12ebfbca
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class SerializerTest extends WebTestCase
+{
+    public function testDeserializeArrayOfObject()
+    {
+        static::bootKernel(array('test_case' => 'Serializer'));
+        $container = static::$kernel->getContainer();
+
+        $result = $container->get('serializer')->deserialize('{"bars": [{"id": 1}, {"id": 2}]}', Foo::class, 'json');
+
+        $bar1 = new Bar();
+        $bar1->id = 1;
+        $bar2 = new Bar();
+        $bar2->id = 2;
+
+        $expected = new Foo();
+        $expected->bars = array($bar1, $bar2);
+
+        $this->assertEquals($expected, $result);
+    }
+}
+
+class Foo
+{
+    /**
+     * @var Bar[]
+     */
+    public $bars;
+}
+
+class Bar
+{
+    /**
+     * @var int
+     */
+    public $id;
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php
new file mode 100644
index 0000000000000..144db90236034
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return array(
+    new FrameworkBundle(),
+);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
new file mode 100644
index 0000000000000..cac135c315d00
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/config.yml
@@ -0,0 +1,6 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    serializer: { enabled: true }
+    property_info: { enabled: true }

From 8c5b756a56e7efd2efcbc4c5827848417da49a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Thu, 10 Nov 2016 17:49:35 +0100
Subject: [PATCH 2/2] Skip test for Serializer Component <3.1

---
 .../FrameworkBundle/Tests/Functional/SerializerTest.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
index bc7dc12ebfbca..ee79850c47dfb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
+
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
@@ -18,6 +20,10 @@ class SerializerTest extends WebTestCase
 {
     public function testDeserializeArrayOfObject()
     {
+        if (!class_exists(DataUriNormalizer::class)) {
+            $this->markTestSkipped('This test is only applicable when using the Symfony Serializer Component version 3.1 or superior.');
+        }
+
         static::bootKernel(array('test_case' => 'Serializer'));
         $container = static::$kernel->getContainer();