Merge branch '3.0' into 3.1

nicolas-grekas · nicolas-grekas · commit fe6841c46177 · 2016-06-29T15:38:22.000+02:00
* 3.0: [Form] fixed ChoiceTypeTest after #17822
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -590,7 +590,6 @@ public function testSubmitSingleChoiceWithEmptyData()
             'multiple' => false,
             'expanded' => false,
             'choices' => array('test'),
-            'choices_as_values' => true,
             'empty_data' => 'test',
         ));
 
@@ -605,7 +604,6 @@ public function testSubmitMultipleChoiceWithEmptyData()
             'multiple' => true,
             'expanded' => false,
             'choices' => array('test'),
-            'choices_as_values' => true,
             'empty_data' => array('test'),
         ));
 
@@ -620,7 +618,6 @@ public function testSubmitSingleChoiceExpandedWithEmptyData()
             'multiple' => false,
             'expanded' => true,
             'choices' => array('test'),
-            'choices_as_values' => true,
             'empty_data' => 'test',
         ));
 
@@ -635,7 +632,6 @@ public function testSubmitMultipleChoiceExpandedWithEmptyData()
             'multiple' => true,
             'expanded' => true,
             'choices' => array('test'),
-            'choices_as_values' => true,
             'empty_data' => array('test'),
         ));
 
