update fix

HeahDude · HeahDude · commit ee9dc9b09882 · 2016-02-16T02:57:05.000+01:00
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -562,6 +562,7 @@ public function submit($submittedData, $clearMissing = true)
 
                 foreach ($this->children as $name => $child) {
                     $isSubmitted = array_key_exists($name, $submittedData);
+                    $clearMissing = $this->getConfig()->getOption('expanded') ?: $clearMissing;
 
                     if ($isSubmitted || $clearMissing) {
                         $child->submit($isSubmitted ? $submittedData[$name] : null, $clearMissing);
@@ -580,8 +581,6 @@ public function submit($submittedData, $clearMissing = true)
                         if (method_exists($child, 'getClickedButton') && null !== $child->getClickedButton()) {
                             $this->clickedButton = $child->getClickedButton();
                         }
-                    } elseif (!$isSubmitted && !$clearMissing && array_key_exists($name, $submittedData)) {
-                        $child->submit($submittedData[$name], $clearMissing);
                     }
                 }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -1934,4 +1934,23 @@ public function testSubmitDoesMapChoiceDataIfNotClearMissingWhenExpanded()
 
         $this->assertSame(array('foo' => 'baz'), $form->getData());
     }
+
+    public function testSubmitDoesMapChoiceDataIfNotClearMissingWhenCollapsed()
+    {
+        $builder = $this->factory->createBuilder('form', array('foo' => 'bar'));
+
+        $form = $builder->add('foo', 'choice', array(
+            'choices' => array(
+                'bar' => 'BAR',
+                'baz' => 'BAZ',
+            ),
+        ))
+            ->getForm();
+
+        $this->assertSame(array('foo' => 'bar'), $form->getData());
+
+        $form->submit(array('foo' => 'baz'), false);
+
+        $this->assertSame(array('foo' => 'baz'), $form->getData());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -562,6 +562,7 @@ public function submit($submittedData, $clearMissing = true)`
`562`	`562`
`563`	`563`	`foreach ($this->children as $name => $child) {`
`564`	`564`	`$isSubmitted = array_key_exists($name, $submittedData);`
	`565`	`+ $clearMissing = $this->getConfig()->getOption('expanded') ?: $clearMissing;`
`565`	`566`
`566`	`567`	`if ($isSubmitted \|\| $clearMissing) {`
`567`	`568`	`$child->submit($isSubmitted ? $submittedData[$name] : null, $clearMissing);`
`@@ -580,8 +581,6 @@ public function submit($submittedData, $clearMissing = true)`
`580`	`581`	`if (method_exists($child, 'getClickedButton') && null !== $child->getClickedButton()) {`
`581`	`582`	`$this->clickedButton = $child->getClickedButton();`
`582`	`583`	`}`
`583`		`- } elseif (!$isSubmitted && !$clearMissing && array_key_exists($name, $submittedData)) {`
`584`		`- $child->submit($submittedData[$name], $clearMissing);`
`585`	`584`	`}`
`586`	`585`	`}`
`587`	`586`