Skip to content

Commit 644052c

Browse files
Merge branch '6.1' into 6.2
* 6.1: (26 commits) Exclude from baseline generation deprecations triggered in legacy test [HttpFoundation] Update "[Session] Overwrite invalid session id" to only validate when files session storage is used [HttpClient] Fix Copy as curl with base uri [DoctrineBridge] Add missing break [PropertyInfo] CS fix [Serializer] Try all possible denormalization route with union types when ALLOW_EXTRA_ATTRIBUTES=false CS fix [Cache] Respect $save option in ChainAdapter [ExpressionLanguage] fix tests (bis) [ExpressionLanguage] fix tests Allow passing null in twig_is_selected_choice [Cache] Respect $save option in ArrayAdapter [HttpKernel] Disable session tracking while collecting profiler data [MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler Fix HttpClientTrait::jsonEncode flags usage [DoctrineBridge] Extend type guessing on enum fields [FrameworkBundle] Lower JsonSerializableNormalizer priority [WebProfilerBundle] Bump http-kernel requirement to ^6.1 [Messenger] move resetting services at worker stopped into ResetServicesListener [PropertyInfo] Fix multi phpdoc covered promoted properties ...
2 parents fb162ac + 320b9ec commit 644052c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Extension/FormExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private function createFieldTranslation(?string $value, array $parameters, strin
191191
*
192192
* @see ChoiceView::isSelected()
193193
*/
194-
function twig_is_selected_choice(ChoiceView $choice, string|array $selectedValue): bool
194+
function twig_is_selected_choice(ChoiceView $choice, string|array|null $selectedValue): bool
195195
{
196196
if (\is_array($selectedValue)) {
197197
return \in_array($choice->value, $selectedValue, true);

0 commit comments

Comments
 (0)