Merge branch '5.4' into 6.0

* 5.4:
  [Lock] fix transient test
  [HttpKernel] fix tests

Author: nicolas-grekas

Tests/EventListener/SessionListenerTest.php

@@ -770,10 +770,7 @@ private function createListener(Request $request, SessionStorageFactoryInterface
         $request = new Request();
         $requestStack->push($request);
 
-        $sessionFactory = new SessionFactory(
-            $requestStack,
-            $sessionFactory,
-        );
+        $sessionFactory = new SessionFactory($requestStack, $sessionFactory);
 
         $container = new Container();
         $container->set('request_stack', $requestStack);