Revert "[Form] refactor RadioListMapper::mapDataToForm()"

closes #18173. This reverts commit 8f918e5.
symfony · fabpot · Apr 28, 2016 · Mar 15, 2016 · Mar 15, 2016 · Apr 9, 2016
commit 71841c737cbda8aedf450d5b72ed5de4a70132f4
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
@@ -38,11 +38,13 @@ public function __construct(ChoiceListInterface $choiceList)
    /**
     * {@inheritdoc}
     */
-    public function mapDataToForms($data, $radios)
+    public function mapDataToForms($choice, $radios)
    {
+        $valueMap = array_flip($this->choiceList->getValuesForChoices(array($choice)));
+
        foreach ($radios as $radio) {
            $value = $radio->getConfig()->getOption('value');
-            $radio->setData($value === $data ? true : false);
+            $radio->setData(isset($valueMap[$value]) ? 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,14 +143,6 @@ 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