[Form] fix tests added by #17760 by removing choices_as_values

HeahDude · HeahDude · commit e7234d8dcbe1 · 2016-02-26T06:44:33.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -148,7 +148,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 // 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');
+                    $choiceList = $event->getForm()->getConfig()->getAttribute('choice_list');
                     $value = current($choiceList->getValuesForChoices(array($event->getData())));
                     $event->setData((string) $value);
                 });
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -29,7 +29,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
         'No' => false,
         'n/a' => '',
     );
-	
+
     private $objectChoices;
 
     protected $groupedChoices = array(
@@ -104,7 +104,6 @@ public function testChoiceListWithScalarValues()
     {
         $view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
             'choices' => $this->scalarChoices,
-            'choices_as_values' => true,
         ))->createView();
 
         $this->assertSame('1', $view->vars['choices'][0]->value);
@@ -119,7 +118,6 @@ public function testChoiceListWithScalarValuesAndFalseAsPreSetData()
     {
         $view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', false, array(
             'choices' => $this->scalarChoices,
-            'choices_as_values' => true,
         ))->createView();
 
         $this->assertTrue($view->vars['is_selected']($view->vars['choices'][1]->value, $view->vars['value']), 'False value should be pre selected');
@@ -129,7 +127,6 @@ public function testExpandedChoiceListWithScalarValues()
     {
         $view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
             'choices' => $this->scalarChoices,
-            'choices_as_values' => true,
             'expanded' => true,
         ))->createView();
 
@@ -142,7 +139,6 @@ public function testExpandedChoiceListWithScalarValuesAndFalseAsPreSetData()
     {
         $view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', false, array(
             'choices' => $this->scalarChoices,
-            'choices_as_values' => true,
             'expanded' => true,
         ))->createView();
 
@@ -218,7 +214,6 @@ public function testPlaceholderWithBooleanChoices()
                 'No' => false,
             ),
             'placeholder' => 'Select an option',
-            'choices_as_values' => true,
         ));
 
         $view = $form->createView();
@@ -240,7 +235,6 @@ public function testPlaceholderWithBooleanChoicesWithFalseAsPreSetData()
                 'No' => false,
             ),
             'placeholder' => 'Select an option',
-            'choices_as_values' => true,
         ));
 
         $view = $form->createView();
@@ -262,7 +256,6 @@ public function testPlaceholderWithExpandedBooleanChoices()
                 'No' => false,
             ),
             'placeholder' => 'Select an option',
-            'choices_as_values' => true,
         ));
 
         $this->assertTrue(isset($form['placeholder']), 'Placeholder should be set');
@@ -287,7 +280,6 @@ public function testPlaceholderWithExpandedBooleanChoicesAndWithFalseAsPreSetDat
                 'No' => false,
             ),
             'placeholder' => 'Select an option',
-            'choices_as_values' => true,
         ));
 
         $this->assertTrue(isset($form['placeholder']), 'Placeholder should be set');
