Skip to content

Commit 31a56ef

Browse files
Merge branch '6.2' into 6.3
* 6.2: [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 59e7c5a + 9ec4439 commit 31a56ef

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Extension/Core/Type/ChoiceType.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
147147
}
148148
}
149149
} else {
150-
foreach ($choiceList->getChoicesForValues($data) as $index => $choice) {
151-
$value = $data[$index];
152-
$knownValues[] = $value;
153-
unset($unknownValues[$value]);
150+
foreach ($choiceList->getChoicesForValues($data) as $key => $choice) {
151+
$knownValues[] = $data[$key];
152+
unset($unknownValues[$data[$key]]);
154153
}
155154
}
156155

0 commit comments

Comments
 (0)