bug #50937 [Form] fetch all known ChoiceType values at once (xabbuh)

fabpot · fabpot · commit fbd39882d790 · 2023-07-13T14:56:55.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Form] fetch all known ChoiceType values at once | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #50898 | License | MIT | Doc PR | Commits ------- 5e0f832 fetch all known ChoiceType values at once
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -165,11 +165,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         }
                     }
                 } else {
-                    foreach ($data as $value) {
-                        if ($choiceList->getChoicesForValues([$value])) {
-                            $knownValues[] = $value;
-                            unset($unknownValues[$value]);
-                        }
+                    foreach ($choiceList->getChoicesForValues($data) as $key => $choice) {
+                        $knownValues[] = $data[$key];
+                        unset($unknownValues[$data[$key]]);
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -165,11 +165,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`} else {`
`168`		`- foreach ($data as $value) {`
`169`		`- if ($choiceList->getChoicesForValues([$value])) {`
`170`		`- $knownValues[] = $value;`
`171`		`- unset($unknownValues[$value]);`
`172`		`- }`
	`168`	`+ foreach ($choiceList->getChoicesForValues($data) as $key => $choice) {`
	`169`	`+ $knownValues[] = $data[$key];`
	`170`	`+ unset($unknownValues[$data[$key]]);`
`173`	`171`	`}`
`174`	`172`	`}`
`175`	`173`