minor #17469 [Form] Make tests compatible with master (paradajozsef)

fabpot · fabpot · commit 05afbb8fa871 · 2016-01-21T09:37:12.000+01:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Form] Make tests compatible with master | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - I wrote tests in this PR: #17406 which was compatible only with 2.7. @xabbuh fixed it in 2.8 and 3.0 here: #17463. And this PR fixes deprecated notices in master. Kind of an unfortunate situation... Commits ------- 96e40b2 Fix unit tests in master
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -1495,7 +1495,6 @@ public function testCustomChoiceTypeDoesNotInheritChoiceLabels()
                     '1' => '1',
                     '2' => '2',
                 ),
-                'choices_as_values' => true,
             )
         );
         $builder->add('subChoice', 'Symfony\Component\Form\Tests\Fixtures\ChoiceSubType');
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
@@ -24,7 +24,7 @@ class ChoiceSubType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array('expanded' => true, 'choices_as_values' => true));
+        $resolver->setDefaults(array('expanded' => true));
         $resolver->setNormalizer('choices', function () {
             return array(
                 'attr1' => 'Attribute 1',

Original file line number	Diff line number	Diff line change
`@@ -1495,7 +1495,6 @@ public function testCustomChoiceTypeDoesNotInheritChoiceLabels()`
`1495`	`1495`	`'1' => '1',`
`1496`	`1496`	`'2' => '2',`
`1497`	`1497`	`),`
`1498`		`- 'choices_as_values' => true,`
`1499`	`1498`	`)`
`1500`	`1499`	`);`
`1501`	`1500`	`$builder->add('subChoice', 'Symfony\Component\Form\Tests\Fixtures\ChoiceSubType');`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ChoiceSubType extends AbstractType`
`24`	`24`	`*/`
`25`	`25`	`public function configureOptions(OptionsResolver $resolver)`
`26`	`26`	`{`
`27`		`- $resolver->setDefaults(array('expanded' => true, 'choices_as_values' => true));`
	`27`	`+ $resolver->setDefaults(array('expanded' => true));`
`28`	`28`	`$resolver->setNormalizer('choices', function () {`
`29`	`29`	`return array(`
`30`	`30`	`'attr1' => 'Attribute 1',`