minor #17927 [3.0] [Form/Tests] minor fix following #17787 (HeahDude)

fabpot · fabpot · commit 2e22c39dbb4d · 2016-02-26T05:26:04.000+01:00
This PR was merged into the 3.0 branch. Discussion ---------- [3.0] [Form/Tests] minor fix following #17787 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | - Commits ------- 020ac04 [3.0] [Tests] minor fix following #17787
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -235,7 +235,6 @@ public function testSelectWithSizeBiggerThanOneCanBeRequired()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
             'choices' => array('a', 'b'),
-            'choices_as_values' => true,
             'multiple' => false,
             'expanded' => false,
             'attr' => array('size' => 2),
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -521,7 +521,6 @@ public function testSelectWithSizeBiggerThanOneCanBeRequired()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
             'choices' => array('a', 'b'),
-            'choices_as_values' => true,
             'multiple' => false,
             'expanded' => false,
             'attr' => array('size' => 2),
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -1306,7 +1306,6 @@ public function testDontPassPlaceholderIfContainedInChoices($multiple, $expanded
             'required' => $required,
             'placeholder' => $placeholder,
             'choices' => array('Empty' => '', 'A' => 'a'),
-            'choices_as_values' => true,
         ));
         $view = $form->createView();
 
@@ -1496,7 +1495,6 @@ public function testCustomChoiceTypeDoesNotInheritChoiceLabels()
                     '1' => '1',
                     '2' => '2',
                 ),
-                'choices_as_values' => true,
             )
         );
         $builder->add('subChoice', 'Symfony\Component\Form\Tests\Fixtures\ChoiceSubType');

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,6 @@ public function testSelectWithSizeBiggerThanOneCanBeRequired()`
`235`	`235`	`{`
`236`	`236`	`$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(`
`237`	`237`	`'choices' => array('a', 'b'),`
`238`		`- 'choices_as_values' => true,`
`239`	`238`	`'multiple' => false,`
`240`	`239`	`'expanded' => false,`
`241`	`240`	`'attr' => array('size' => 2),`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,6 @@ public function testSelectWithSizeBiggerThanOneCanBeRequired()`
`521`	`521`	`{`
`522`	`522`	`$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(`
`523`	`523`	`'choices' => array('a', 'b'),`
`524`		`- 'choices_as_values' => true,`
`525`	`524`	`'multiple' => false,`
`526`	`525`	`'expanded' => false,`
`527`	`526`	`'attr' => array('size' => 2),`