minor #48342 [Form] Call getChoicesForValues() once, to prevent several SQL queries (elementaire)

fabpot · fabpot · commit 50694f209ed1 · 2022-12-09T08:32:19.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [Form] Call `getChoicesForValues()` once, to prevent several SQL queries | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - The feature "Keeping valid submitted choices when additional choices are submitted" adds some overload to list the valid choices. With options set to `multiple=true`, `expanded=false` and using an `EntityType`, it performs several queries, one for each value. Commits ------- d5f11e0 [Form] Call getChoicesForValues() once, to prevent several SQL queries
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -144,11 +144,10 @@ 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 $index => $choice) {
+                        $value = $data[$index];
+                        $knownValues[] = $value;
+                        unset($unknownValues[$value]);
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`} else {`
`147`		`- foreach ($data as $value) {`
`148`		`- if ($choiceList->getChoicesForValues([$value])) {`
`149`		`- $knownValues[] = $value;`
`150`		`- unset($unknownValues[$value]);`
`151`		`- }`
	`147`	`+ foreach ($choiceList->getChoicesForValues($data) as $index => $choice) {`
	`148`	`+ $value = $data[$index];`
	`149`	`+ $knownValues[] = $value;`
	`150`	`+ unset($unknownValues[$value]);`
`152`	`151`	`}`
`153`	`152`	`}`
`154`	`153`