Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 68cdc60d8e81 · 2025-07-15T13:30:57.000+02:00
* 6.4: [Routing] Add test to validate that default value is allowed to not match requirement fix handling required options Fix @var phpdoc [Lock] [MongoDB] Enforce readPreference=primary and writeConcern=majority [FrameworkBundle] fix phpdoc in `MicroKernelTrait` Fixed validator translations for Albanian
diff --git a/Extension/FormExtension.php b/Extension/FormExtension.php
@@ -155,7 +155,7 @@ private function createFieldChoicesList(iterable $choices, string|false|null $tr
                 continue;
             }
 
-            /* @var ChoiceView $choice */
+            /** @var ChoiceView $choice */
             $translatableLabel = $this->createFieldTranslation($choice->label, $choice->labelTranslationParameters, $translationDomain);
             yield $translatableLabel => $choice->value;
         }

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private function createFieldChoicesList(iterable $choices, string\|false\|null $tr`
`155`	`155`	`continue;`
`156`	`156`	`}`
`157`	`157`
`158`		`- /* @var ChoiceView $choice */`
	`158`	`+ /** @var ChoiceView $choice */`
`159`	`159`	`$translatableLabel = $this->createFieldTranslation($choice->label, $choice->labelTranslationParameters, $translationDomain);`
`160`	`160`	`yield $translatableLabel => $choice->value;`
`161`	`161`	`}`