Merge branch '3.0' into 3.1

* 3.0: [Form] fixed ChoiceTypeTest after #17822
symfony · Jun 29, 2016 · fe6841c · fe6841c
2 parents 4976c7f + 46b379b
commit fe6841c
Showing 1 changed file with 0 additions and 4 deletions.
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'),
         ));