Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 2505c62870ce · 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/Tests/ContainerBuilderTest.php b/Tests/ContainerBuilderTest.php
@@ -1136,7 +1136,7 @@ public function testAddObjectResource()
 
         $this->assertCount(1, $resources);
 
-        /* @var FileResource $resource */
+        /** @var FileResource $resource */
         $resource = end($resources);
 
         $this->assertInstanceOf(FileResource::class, $resource);
