[Form] refactor RadioListMapper::mapDataToForm()

HeahDude · HeahDude · commit 8f918e5f84c5 · 2016-02-22T16:33:26.000+01:00
This fixes "false" choice pre selection when `ChoiceType`
is `expanded` and not `multiple`
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
@@ -38,13 +38,11 @@ public function __construct(ChoiceListInterface $choiceList)
     /**
      * {@inheritdoc}
      */
-    public function mapDataToForms($choice, $radios)
+    public function mapDataToForms($data, $radios)
     {
-        $valueMap = array_flip($this->choiceList->getValuesForChoices(array($choice)));
-
         foreach ($radios as $radio) {
             $value = $radio->getConfig()->getOption('value');
-            $radio->setData(isset($valueMap[$value]) ? true : false);
+            $radio->setData($value === $data ? true : false);
         }
     }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -143,6 +143,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         $event->setData(null);
                     }
                 });
+                // For radio lists, pre selection of the choice needs to pre set data
+                // with the string value so it can be matched in
+                // {@link \Symfony\Component\Form\Extension\Core\DataMapper\RadioListMapper::mapDataToForms()}
+                $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+                    $choiceList = $event->getForm()->getConfig()->getOption('choice_list');
+                    $value = current($choiceList->getValuesForChoices(array($event->getData())));
+                    $event->setData((string) $value);
+                });
             }
         } elseif ($options['multiple']) {
             // <select> tag with "multiple" option

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,11 @@ public function __construct(ChoiceListInterface $choiceList)`
`38`	`38`	`/**`
`39`	`39`	`* {@inheritdoc}`
`40`	`40`	`*/`
`41`		`- public function mapDataToForms($choice, $radios)`
	`41`	`+ public function mapDataToForms($data, $radios)`
`42`	`42`	`{`
`43`		`- $valueMap = array_flip($this->choiceList->getValuesForChoices(array($choice)));`
`44`		`-`
`45`	`43`	`foreach ($radios as $radio) {`
`46`	`44`	`$value = $radio->getConfig()->getOption('value');`
`47`		`- $radio->setData(isset($valueMap[$value]) ? true : false);`
	`45`	`+ $radio->setData($value === $data ? true : false);`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`