fetch all known ChoiceType values at once

xabbuh · xabbuh · commit 5e0f8326de29 · 2023-07-11T14:50:22.000+02:00
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`