Skip to content

Commit 9ec4439

Browse files
Merge branch '5.4' into 6.2
* 5.4: [Security] Allow custom scheme to be used as redirection URIs [Validator] Do not mock metadata factory on debug command tests [HttpKernel][WebProfilerBundle] Fix search feature update Intl component to take into account B-variant when converting Alpha3 to Alpha2. fixing issue with Darwin. [VarDumper] Fix dumping `ArrayObject` with `DumpDataCollector` [VarDumper] Add tests to demonstrate a bug when dumping ArrayObject with full stack fmk [DebugBundle][FrameworkBundle] Fix using the framework without the Console component [FrameworkBundle] Add missing monolog channel tag to the `messenger:failed:retry` command fetch all known ChoiceType values at once [RateLimiter] fix incorrect retryAfter of FixedWindow Fix Finder phpdoc
2 parents 494e21c + b9b4b57 commit 9ec4439

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Extension/Core/Type/ChoiceType.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
144144
}
145145
}
146146
} 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 $key => $choice) {
148+
$knownValues[] = $data[$key];
149+
unset($unknownValues[$data[$key]]);
152150
}
153151
}
154152

0 commit comments

Comments
 (0)