Merge branch '5.4' into 6.0

* 5.4:
  fix merge
  [HttpClient] mark test transient
  [Mime] Fix test
  [Translation] Fix TranslationPullCommand with ICU translations
  [PropertyInfo] Fix phpstan extractor issues
  Allow package-versions-deprecated plugin
  Update security.lb.xlf
  [Notifier] Use correct factory for the msteams transport
  Fix SessionListener without session in request
  Remove direct dependency on composer/package-versions-deprecated
  Remove the unused dependency on composer/package-versions-deprecated
  [Security/Http] Fix cookie clearing on logout
  [HttpClient] fix checking for recent curl consts

Author: nicolas-grekas

EventListener/AbstractSessionListener.php

@@ -88,7 +88,7 @@ public function onKernelRequest(RequestEvent $event)
 
     public function onKernelResponse(ResponseEvent $event)
     {
-        if (!$event->isMainRequest()) {
+        if (!$event->isMainRequest() || (!$this->container->has('initialized_session') && !$event->getRequest()->hasSession())) {
             return;
         }
 

Tests/EventListener/SessionListenerTest.php

@@ -326,6 +326,24 @@ public function testUninitializedSession()
         $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
     }
 
+    public function testUninitializedSessionWithoutInitializedSession()
+    {
+        $kernel = $this->createMock(HttpKernelInterface::class);
+        $response = new Response();
+        $response->setSharedMaxAge(60);
+        $response->headers->set(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER, 'true');
+
+        $container = new ServiceLocator([]);
+
+        $listener = new SessionListener($container);
+        $listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response));
+        $this->assertFalse($response->headers->has('Expires'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('public'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage'));
+    }
+
     public function testSurrogateMainRequestIsPublic()
     {
         $session = $this->createMock(Session::class);