Merge branch '5.4' into 6.0

* 5.4:
  Fix KernelBrowser::loginUser() causing deprecation
  use $sessionId instead of $sessionCookiePath on SessionUtils::popSessionCookie call
  [Translation][Loco] Make http requests synchronous when reading the Loco API

Author: chalasr

EventListener/AbstractSessionListener.php

@@ -141,7 +141,7 @@ public function onKernelResponse(ResponseEvent $event)
             $sessionCookieHttpOnly = $this->sessionOptions['cookie_httponly'] ?? true;
             $sessionCookieSameSite = $this->sessionOptions['cookie_samesite'] ?? Cookie::SAMESITE_LAX;
 
-            SessionUtils::popSessionCookie($sessionName, $sessionCookiePath);
+            SessionUtils::popSessionCookie($sessionName, $sessionId);
 
             $request = $event->getRequest();
             $requestSessionCookieId = $request->cookies->get($sessionName);

Tests/EventListener/SessionListenerTest.php

@@ -358,6 +358,7 @@ public function testSessionUsageLogIfStatelessAndSessionUsed()
     public function testSessionIsSavedWhenUnexpectedSessionExceptionThrown()
     {
         $session = $this->createMock(Session::class);
+        $session->expects($this->exactly(1))->method('getId')->willReturn('123456');
         $session->expects($this->exactly(1))->method('getName')->willReturn('PHPSESSID');
         $session->method('isStarted')->willReturn(true);
         $session->expects($this->once())->method('getUsageIndex')->willReturn(1);