From aaba6b4c2bdbe2d4a92754ea4f9a43570af2ff16 Mon Sep 17 00:00:00 2001
From: stoccc <dummy.it@gmail.com>
Date: Fri, 25 Aug 2017 09:11:28 +0200
Subject: [PATCH] Tests and fix for issue in array model data in EntityType
 field with multiple=true

---
 .../Tests/Form/Type/EntityTypeTest.php        | 34 +++++++++++++++++++
 src/Symfony/Bridge/Doctrine/composer.json     |  2 +-
 .../EventListener/MergeCollectionListener.php |  2 +-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index 587ebd6b3e..a7d41ce8f3 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -1482,4 +1482,38 @@ class EntityTypeTest extends BaseTypeTest
         $this->assertEquals($collection, $form->getNormData());
         $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
     }
+
+    public function testSetDataEmptyArraySubmitNullMultiple()
+    {
+        $emptyArray = array();
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+            'multiple' => true,
+        ));
+        $form->setData($emptyArray);
+        $form->submit(null);
+        $this->assertInternalType('array', $form->getData());
+        $this->assertEquals(array(), $form->getData());
+        $this->assertEquals(array(), $form->getNormData());
+        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+    }
+
+    public function testSetDataNonEmptyArraySubmitNullMultiple()
+    {
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $this->persist(array($entity1));
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+            'multiple' => true,
+        ));
+        $existing = array(0 => $entity1);
+        $form->setData($existing);
+        $form->submit(null);
+        $this->assertInternalType('array', $form->getData());
+        $this->assertEquals(array(), $form->getData());
+        $this->assertEquals(array(), $form->getNormData());
+        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 22635d45ec..dc8e0d528f 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "symfony/stopwatch": "~2.2",
         "symfony/dependency-injection": "~2.2",
-        "symfony/form": "~2.7.25|^2.8.18",
+        "symfony/form": "~2.7.34|^2.8.27",
         "symfony/http-kernel": "~2.2",
         "symfony/property-access": "~2.3",
         "symfony/security": "~2.2",
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
index a65116fd5c..0c16bd42ba 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
@@ -80,7 +80,7 @@ class MergeCollectionListener implements EventSubscriberInterface
             return;
         }
 
-        if (!$dataToMergeInto) {
+        if (null === $dataToMergeInto) {
             // No original data was set. Set it if allowed
             if ($this->allowAdd) {
                 $dataToMergeInto = $data;