Merge branch '7.2' into 7.3

nicolas-grekas · nicolas-grekas · commit dfa5e05f61aa · 2025-07-15T13:36:08.000+02:00
* 7.2: [DoctrineBridge] Prevent idle connection listener from running on subrequests [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
@@ -161,7 +161,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
`@@ -161,7 +161,7 @@ private function createFieldChoicesList(iterable $choices, string\|false\|null $tr`
`161`	`161`	`continue;`
`162`	`162`	`}`
`163`	`163`
`164`		`- /* @var ChoiceView $choice */`
	`164`	`+ /** @var ChoiceView $choice */`
`165`	`165`	`$translatableLabel = $this->createFieldTranslation($choice->label, $choice->labelTranslationParameters, $translationDomain);`
`166`	`166`	`yield $translatableLabel => $choice->value;`
`167`	`167`	`}`