minor #17784 [Form] remove deprecated empty_value_in_choices (Tobion)

fabpot · fabpot · commit c80c8b71ce6e · 2016-02-14T10:59:52.000+01:00
This PR was merged into the 3.0 branch. Discussion ---------- [Form] remove deprecated empty_value_in_choices | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | tiny | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This has been deprecated since 2.6 in #12003. One part has already been removed (`empty_value`) but this part has been forgotten. Commits ------- 735f92e [Form] remove deprecated empty_value_in_choices
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -210,9 +210,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             $view->vars['placeholder'] = $options['placeholder'];
         }
 
-        // BC
-        $view->vars['empty_value_in_choices'] = $view->vars['placeholder_in_choices'];
-
         if ($options['multiple'] && !$options['expanded']) {
             // Add "[]" to the name in case a select tag with multiple options is
             // displayed. Otherwise only one of the selected options is sent in the

Original file line number	Diff line number	Diff line change
`@@ -210,9 +210,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)`
`210`	`210`	`< 65FE span class=pl-c1>$view->vars['placeholder'] = $options['placeholder'];`
`211`	`211`	`}`
`212`	`212`
`213`		`- // BC`
`214`		`- $view->vars['empty_value_in_choices'] = $view->vars['placeholder_in_choices'];`
`215`		`-`
`216`	`213`	`if ($options['multiple'] && !$options['expanded']) {`
`217`	`214`	`// Add "[]" to the name in case a select tag with multiple options is`
`218`	`215`	`// displayed. Otherwise only one of the selected options is sent in the`