symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
+4-2Lines changed: 4 additions & 2 deletions b/‎src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
-8Lines changed: 0 additions & 8 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
-8Lines changed: 0 additions & 8 deletions
@@ -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);
         }
     }
 
 
@@ -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
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,13 @@ public function __construct(ChoiceListInterface $choiceList)`
`38`	`38`	`/**`
`39`	`39`	`* {@inheritdoc}`
`40`	`40`	`*/`
`41`		`- public function mapDataToForms($data, $radios)`
	`41`	`+ public function mapDataToForms($choice, $radios)`
`42`	`42`	`{`
	`43`	`+ $valueMap = array_flip($this->choiceList->getValuesForChoices(array($choice)));`
	`44`	`+`
`43`	`45`	`foreach ($radios as $radio) {`
`44`	`46`	`$value = $radio->getConfig()->getOption('value');`
`45`		`- $radio->setData($value === $data ? true : false);`
	`47`	`+ $radio->setData(isset($valueMap[$value]) ? true : false);`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`