Merge branch '6.4' into 7.2

* 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

Author: nicolas-grekas

.php-cs-fixer.dist.php

@@ -30,6 +30,7 @@
         '@PHPUnit75Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        'phpdoc_var_annotation_correct_order' => true,
         'protected_to_private' => false,
         'header_comment' => ['header' => $fileHeaderComment],
     ])

src/Symfony/Bridge/Twig/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;
         }

src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php

@@ -182,7 +182,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
             }
 
             $file = (new \ReflectionObject($this))->getFileName();
-            /* @var ContainerPhpFileLoader $kernelLoader */
+            /** @var ContainerPhpFileLoader $kernelLoader */
             $kernelLoader = $loader->getResolver()->resolve($file);
             $kernelLoader->setCurrentDir(\dirname($file));
             $instanceof = &\Closure::bind(fn &() => $this->instanceof, $kernelLoader, $kernelLoader)();
@@ -208,7 +208,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
     public function loadRoutes(LoaderInterface $loader): RouteCollection
     {
         $file = (new \ReflectionObject($this))->getFileName();
-        /* @var RoutingPhpFileLoader $kernelLoader */
+        /** @var RoutingPhpFileLoader $kernelLoader */
         $kernelLoader = $loader->getResolver()->resolve($file, 'php');
         $kernelLoader->setCurrentDir(\dirname($file));
         $collection = new RouteCollection();

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php

@@ -233,7 +233,7 @@ public function testFile()
         $controller = $this->createController();
         $controller->setContainer($container);
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $response = $controller->file(new File(__FILE__));
         $this->assertInstanceOf(BinaryFileResponse::class, $response);
         $this->assertSame(200, $response->getStatusCode());
@@ -248,7 +248,7 @@ public function testFileAsInline()
     {
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $response = $controller->file(new File(__FILE__), null, ResponseHeaderBag::DISPOSITION_INLINE);
 
         $this->assertInstanceOf(BinaryFileResponse::class, $response);
@@ -264,7 +264,7 @@ public function testFileWithOwnFileName()
     {
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $fileName = 'test.php';
         $response = $controller->file(new File(__FILE__), $fileName);
 
@@ -281,7 +281,7 @@ public function testFileWithOwnFileNameAsInline()
     {
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $fileName = 'test.php';
         $response = $controller->file(new File(__FILE__), $fileName, ResponseHeaderBag::DISPOSITION_INLINE);
 
@@ -298,7 +298,7 @@ public function testFileFromPath()
     {
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $response = $controller->file(__FILE__);
 
         $this->assertInstanceOf(BinaryFileResponse::class, $response);
@@ -314,7 +314,7 @@ public function testFileFromPathWithCustomizedFileName()
     {
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $response = $controller->file(__FILE__, 'test.php');
 
         $this->assertInstanceOf(BinaryFileResponse::class, $response);

src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php

@@ -196,7 +196,7 @@ public function downloadPackages(array $importMapEntries, ?callable $progressCal
 
             $dependencies = [];
             $extraFiles = [];
-            /* @var ImportMapEntry $entry */
+            /** @var ImportMapEntry $entry */
             $contents[$package] = [
                 'content' => $this->makeImportsBare($response->getContent(), $dependencies, $extraFiles, $entry->type, $entry->getPackagePathString()),
                 'dependencies' => $dependencies,

src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php

@@ -248,7 +248,7 @@ public function testUpdateAll()
             ->method('resolvePackages')
             ->with($this->callback(function ($packages) {
                 $this->assertInstanceOf(PackageRequireOptions::class, $packages[0]);
-                /* @var PackageRequireOptions[] $packages */
+                /** @var PackageRequireOptions[] $packages */
                 $this->assertCount(2, $packages);
 
                 $this->assertSame('lodash', $packages[0]->packageModuleSpecifier);

src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php

@@ -177,7 +177,7 @@ public function testInlineStyleOptions(string $tag, ?string $expected = null, ?s
             $expected = $tag.$input.'</'.$styleString.'>';
             $this->assertSame($expected, $formatter->format($expected));
         } else {
-            /* @var OutputFormatterStyle $result */
+            /** @var OutputFormatterStyle $result */
             $this->assertInstanceOf(OutputFormatterStyle::class, $result);
             $this->assertSame($expected, $formatter->format($tag.$input.'</>'));
             $this->assertSame($expected, $formatter->format($tag.$input.'</'.$styleString.'>'));

src/Symfony/Component/DependencyInjection/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);

src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php

@@ -39,7 +39,7 @@ public function validate(mixed $form, Constraint $formConstraint): void
             return;
         }
 
-        /* @var FormInterface $form */
+        /** @var FormInterface $form */
         $config = $form->getConfig();
 
         $validator = $this->context->getValidator()->inContext($this->context);

src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php

@@ -40,7 +40,7 @@ public function __construct(
         // the DIC, where the XML file is loaded automatically. Thus the following
         // code must be kept synchronized with validation.xml
 
-        /* @var ClassMetadata $metadata */
+        /** @var ClassMetadata $metadata */
         $metadata->addConstraint(new Form());
         $metadata->addConstraint(new Traverse(false));
     }