[Form] Fixed behavior of expanded multiple-choice field when submitted without ticks

webmozart · webmozart · commit bc9bc4af5df7 · 2012-04-10T17:42:05.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
@@ -41,7 +41,7 @@ public function onBindClientData(FilterDataEvent $event)
         $values = (array) $event->getData();
         $indices = $this->choiceList->getIndicesForValues($values);
 
-        $event->setData(array_combine($indices, $values));
+        $event->setData(count($indices) > 0 ? array_combine($indices, $values) : array());
     }
 
     static public function getSubscribedEvents()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -399,6 +399,29 @@ public function testBindMultipleExpanded()
         $this->assertNull($form[4]->getClientData());
     }
 
+    public function testBindMultipleExpandedEmpty()
+    {
+        $form = $this->factory->create('choice', null, array(
+            'multiple' => true,
+            'expanded' => true,
+            'choices' => $this->choices,
+        ));
+
+        $form->bind(array());
+
+        $this->assertSame(array(), $form->getData());
+        $this->assertFalse($form[0]->getData());
+        $this->assertFalse($form[1]->getData());
+        $this->assertFalse($form[2]->getData());
+        $this->assertFalse($form[3]->getData());
+        $this->assertFalse($form[4]->getData());
+        $this->assertNull($form[0]->getClientData());
+        $this->assertNull($form[1]->getClientData());
+        $this->assertNull($form[2]->getClientData());
+        $this->assertNull($form[3]->getClientData());
+        $this->assertNull($form[4]->getClientData());
+    }
+
     public function testBindMultipleExpandedWithEmptyField()
     {
         $form = $this->factory->create('choice', null, array(

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function onBindClientData(FilterDataEvent $event)`
`41`	`41`	`$values = (array) $event->getData();`
`42`	`42`	`$indices = $this->choiceList->getIndicesForValues($values);`
`43`	`43`
`44`		`- $event->setData(array_combine($indices, $values));`
	`44`	`+ $event->setData(count($indices) > 0 ? array_combine($indices, $values) : array());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`static public function getSubscribedEvents()`