Merge branch '5.4' into 6.0

* 5.4:
  [DoctrineBridge] Treat firstResult === 0 like null
  [Translation] Refresh local translations if the provider has domains
  [HttpKernel] Fix SessionListener without session in request symfony#46268
  [Notifier] Allow symfony/mercure 0.6 in Mercure bridge

Author: nicolas-grekas

src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

@@ -51,7 +51,7 @@ public function getEntities(): array
      */
     public function getEntitiesByIds(string $identifier, array $values): array
     {
-        if (null !== $this->queryBuilder->getMaxResults() || null !== $this->queryBuilder->getFirstResult()) {
+        if (null !== $this->queryBuilder->getMaxResults() || 0 < (int) $this->queryBuilder->getFirstResult()) {
             // an offset or a limit would apply on results including the where clause with submitted id values
             // that could make invalid choices valid
             $choices = [];

src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php

@@ -102,7 +102,7 @@ public function testSetContentLanguageHeaderWhenEmptyAndAtLeast2EnabledLocalesAr
         $request = Request::create('/');
         $request->setLocale('fr');
 
-        $event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response);
         $this->dispatcher->dispatch($event, KernelEvents::RESPONSE);
 
         $this->assertEquals('fr', $response->headers->get('Content-Language'));
@@ -118,7 +118,7 @@ public function testNotOverrideContentLanguageHeaderWhenNotEmpty()
         $request = Request::create('/');
         $request->setLocale('de');
 
-        $event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response);
         $this->dispatcher->dispatch($event, KernelEvents::RESPONSE);
 
         $this->assertEquals('mi, en', $response->headers->get('Content-Language'));
@@ -133,7 +133,7 @@ public function testNotSetContentLanguageHeaderWhenDisabled()
         $request = Request::create('/');
         $request->setLocale('fr');
 
-        $event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response);
         $this->dispatcher->dispatch($event, KernelEvents::RESPONSE);
 
         $this->assertNull($response->headers->get('Content-Language'));

src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php

@@ -548,7 +548,7 @@ public function testUninitializedSessionWithoutInitializedSession()
         $container = new ServiceLocator([]);
 
         $listener = new SessionListener($container);
-        $listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response));
+        $listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MAIN_REQUEST, $response));
         $this->assertFalse($response->headers->has('Expires'));
         $this->assertTrue($response->headers->hasCacheControlDirective('public'));
         $this->assertFalse($response->headers->hasCacheControlDirective('private'));

src/Symfony/Component/Notifier/Bridge/Mercure/composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.0.2",
         "ext-json": "*",
-        "symfony/mercure": "^0.5.2",
+        "symfony/mercure": "^0.5.2|^0.6",
         "symfony/notifier": "^5.4|^6.0",
         "symfony/service-contracts": "^1.10|^2|^3"
     },

src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php

@@ -339,10 +339,10 @@ public function testOnKernelResponseRemoveListener()
         $listener = new ContextListener($tokenStorage, [], 'session', null, $dispatcher, null, \Closure::fromCallable([$tokenStorage, 'getToken']));
         $this->assertEmpty($dispatcher->getListeners());
 
-        $listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
         $this->assertNotEmpty($dispatcher->getListeners());
 
-        $listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST, new Response()));
+        $listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST, new Response()));
         $this->assertEmpty($dispatcher->getListeners());
     }
 

src/Symfony/Component/Translation/Command/TranslationPushCommand.php

@@ -130,16 +130,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $force = $input->getOption('force');
         $deleteMissing = $input->getOption('delete-missing');
 
+        if (!$domains && $provider instanceof FilteringProvider) {
+            $domains = $provider->getDomains();
+        }
+
+        // Reading local translations must be done after retrieving the domains from the provider
+        // in order to manage only translations from configured domains
         $localTranslations = $this->readLocalTranslations($locales, $domains, $this->transPaths);
 
         if (!$domains) {
-            if ($provider instanceof FilteringProvider) {
-                $domains = $provider->getDomains();
-            }
-
-            if (!$domains) {
-                $domains = $this->getDomainsFromTranslatorBag($localTranslations);
-            }
+            $domains = $this->getDomainsFromTranslatorBag($localTranslations);
         }
 
         if (!$deleteMissing && $force) {