bug #23980 Tests and fix for issue in array model data in EntityType field with multiple=true (stoccc)

fabpot · fabpot · commit a11589f45c0d · 2017-10-01T11:10:38.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #23980). Discussion ---------- Tests and fix for issue in array model data in EntityType field with multiple=true | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | License | MIT | Fixed tickets | #23927 Provided some tests and the fix for #23927. Rebased to 2.7, replaces #23930 Commits ------- aaba6b4 Tests and fix for issue in array model data in EntityType field with multiple=true
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -1482,4 +1482,38 @@ public function testSubmitNullExpandedMultiple()
         $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
@@ -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
@@ -80,7 +80,7 @@ public function onSubmit(FormEvent $event)
             return;
         }
 
-        if (!$dataToMergeInto) {
+        if (null === $dataToMergeInto) {
             // No original data was set. Set it if allowed
             if ($this->allowAdd) {
                 $dataToMergeInto = $data;

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function onSubmit(FormEvent $event)`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`	`82`
`83`		`- if (!$dataToMergeInto) {`
	`83`	`+ if (null === $dataToMergeInto) {`
`84`	`84`	`// No original data was set. Set it if allowed`
`85`	`85`	`if ($this->allowAdd) {`
`86`	`86`	`$dataToMergeInto = $data;`