Merge branch '7.3' into 7.4

* 7.3:
  [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

Author: nicolas-grekas

.php-cs-fixer.dist.php

@@ -35,6 +35,7 @@
         '@PHPUnit75Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        'phpdoc_var_annotation_correct_order' => true,
         'protected_to_private' => false,
         'header_comment' => [
             'header' => implode('', $fileHeaderParts),

src/Symfony/Bridge/Doctrine/Middleware/IdleConnection/Listener.php

@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 final class Listener implements EventSubscriberInterface
@@ -29,6 +30,9 @@ public function __construct(
 
     public function onKernelRequest(RequestEvent $event): void
     {
+        if (HttpKernelInterface::MAIN_REQUEST !== $event->getRequestType()) {
+            return;
+        }
         $timestamp = time();
 
         foreach ($this->connectionExpiries as $name => $expiry) {

src/Symfony/Bridge/Doctrine/Tests/Middleware/IdleConnection/ListenerTest.php

@@ -9,13 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Middleware\IdleConnection;
+namespace Symfony\Bridge\Doctrine\Tests\Middleware\IdleConnection;
 
 use Doctrine\DBAL\Connection as ConnectionInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Middleware\IdleConnection\Listener;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class ListenerTest extends TestCase
 {
@@ -34,10 +35,24 @@ public function testOnKernelRequest()
             ->willReturn($connectionOneMock);
 
         $listener = new Listener($connectionExpiries, $containerMock);
+        $event = $this->createMock(RequestEvent::class);
+        $event->method('getRequestType')->willReturn(HttpKernelInterface::MAIN_REQUEST);
 
-        $listener->onKernelRequest($this->createMock(RequestEvent::class));
+        $listener->onKernelRequest($event);
 
         $this->assertArrayNotHasKey('connectionone', (array) $connectionExpiries);
         $this->assertArrayHasKey('connectiontwo', (array) $connectionExpiries);
     }
+
+    public function testOnKernelRequestShouldSkipSubrequests()
+    {
+        self::expectNotToPerformAssertions();
+        $arrayObj = $this->createMock(\ArrayObject::class);
+        $arrayObj->method('getIterator')->willThrowException(new \Exception('Invalid behavior'));
+        $listener = new Listener($arrayObj, $this->createMock(ContainerInterface::class));
+
+        $event = $this->createMock(RequestEvent::class);
+        $event->method('getRequestType')->willReturn(HttpKernelInterface::SUB_REQUEST);
+        $listener->onKernelRequest($event);
+    }
 }

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

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

@@ -236,7 +236,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());
@@ -251,7 +251,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);
@@ -267,7 +267,7 @@ public function testFileWithOwnFileName()
     {
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $fileName = 'test.php';
         $response = $controller->file(new File(__FILE__), $fileName);
 
@@ -284,7 +284,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);
 
@@ -301,7 +301,7 @@ public function testFileFromPath()
     {
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
+        /** @var BinaryFileResponse $response */
         $response = $controller->file(__FILE__);
 
         $this->assertInstanceOf(BinaryFileResponse::class, $response);
@@ -317,7 +317,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

@@ -1205,7 +1205,7 @@ public function testAddObjectResource()
 
         $this->assertCount(1, $resources);
 
-        /* @var FileResource $resource */
+        /** @var FileResource $resource */
         $resource = end($resources);
 
         $this->assertInstanceOf(FileResource::class, $resource);