Merge branch '3.0'

fabpot · fabpot · commit 731d7a6bf096 · 2016-04-28T16:43:15.000+02:00
* 3.0: [Form] Fix tests added in symfony#18180
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -153,7 +153,6 @@ public function testExpandedChoiceListWithBooleanAndNullValues()
     {
         $view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
             'choices' => $this->booleanChoicesWithNull,
-            'choices_as_values' => true,
             'expanded' => true,
         ))->createView();
 
@@ -179,7 +178,6 @@ public function testExpandedChoiceListWithBooleanAndNullValuesAndFalseAsPreSetDa
     {
         $view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', false, array(
             'choices' => $this->booleanChoicesWithNull,
-            'choices_as_values' => true,
             'expanded' => true,
         ))->createView();
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ public function testExpandedChoiceListWithBooleanAndNullValues()`
`153`	`153`	`{`
`154`	`154`	`$view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(`
`155`	`155`	`'choices' => $this->booleanChoicesWithNull,`
`156`		`- 'choices_as_values' => true,`
`157`	`156`	`'expanded' => true,`
`158`	`157`	`))->createView();`
`159`	`158`
`@@ -179,7 +178,6 @@ public function testExpandedChoiceListWithBooleanAndNullValuesAndFalseAsPreSetDa`
`179`	`178`	`{`
`180`	`179`	`$view = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', false, array(`
`181`	`180`	`'choices' => $this->booleanChoicesWithNull,`
`182`		`- 'choices_as_values' => true,`
`183`	`181`	`'expanded' => true,`
`184`	`182`	`))->createView();`
`185`	`183`