Merge branch '2.7' into 2.8

fabpot · fabpot · commit 78ff9dc515a3 · 2015-11-27T11:16:11.000+01:00
* 2.7:
  [Form] Deprecated setting "choices_as_values" to "false"
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -142,7 +142,7 @@ public function testExpandedChoicesOptionsTurnIntoChildren()
      */
     public function testExpandedFlippedChoicesOptionsTurnIntoChildren()
     {
-        $form = $this->factory->create('choice', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
             'expanded' => true,
             'choices' => array_flip($this->choices),
         ));

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function testExpandedChoicesOptionsTurnIntoChildren()`
`142`	`142`	`*/`
`143`	`143`	`public function testExpandedFlippedChoicesOptionsTurnIntoChildren()`
`144`	`144`	`{`
`145`		`- $form = $this->factory->create('choice', null, array(`
	`145`	`+ $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(`
`146`	`146`	`'expanded' => true,`
`147`	`147`	`'choices' => array_flip($this->choices),`
`148`	`148`	`));`