Merge branch '4.4' into 5.4

* 4.4:
  [DoctrineBridge] Treat firstResult === 0 like null
  [HttpKernel] Fix SessionListener without session in request #46268

Author: nicolas-grekas

EventListener/AbstractSessionListener.php

@@ -104,7 +104,7 @@ public function onKernelResponse(ResponseEvent $event)
         // Always remove the internal header if present
         $response->headers->remove(self::NO_AUTO_CACHE_CONTROL_HEADER);
 
-        if (!$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : $event->getRequest()->getSession()) {
+        if (!$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : ($event->getRequest()->hasSession() ? $event->getRequest()->getSession() : null)) {
             return;
         }
 

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'));

Tests/EventListener/SessionListenerTest.php

@@ -523,7 +523,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'));