minor #22230 [Form] Avoid forcing to define the choices_as_values option when using choice_loader (stof)

fabpot · fabpot · commit 994e90c12977 · 2017-03-31T14:46:10.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Form] Avoid forcing to define the choices_as_values option when using choice_loader | Q | A | ------------- | --- | Branch? |2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a When using the choice loader, choices are ignored entirely. Forcing the dev to add the choices_as_values just to avoid the deprecation warning (and then to remove the option again at some point in 3.x due to deprecation) is a bad developer experience. Commits ------- fb4d8de Avoid forcing to define the choices_as_values option when using choice_loader
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -357,7 +357,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $choicesAsValuesNormalizer = function (Options $options, $choicesAsValues) use ($that) {
-            if (true !== $choicesAsValues) {
+            if (true !== $choicesAsValues && null === $options['choice_loader']) {
                 @trigger_error(sprintf('The value "false" for the "choices_as_values" option of the "%s" form type (%s) is deprecated since version 2.8 and will not be supported anymore in 3.0. Set this option to "true" and flip the contents of the "choices" option instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ public function configureOptions(OptionsResolver $resolver)`
`357`	`357`	`};`
`358`	`358`
`359`	`359`	`$choicesAsValuesNormalizer = function (Options $options, $choicesAsValues) use ($that) {`
`360`		`- if (true !== $choicesAsValues) {`
	`360`	`+ if (true !== $choicesAsValues && null === $options['choice_loader']) {`
`361`	`361`	`@trigger_error(sprintf('The value "false" for the "choices_as_values" option of the "%s" form type (%s) is deprecated since version 2.8 and will not be supported anymore in 3.0. Set this option to "true" and flip the contents of the "choices" option instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);`
`362`	`362`	`}`
`363`	`363`