Merge branch '5.2' into 5.x

* 5.2:
  fix merge

Author: nicolas-grekas

src/Symfony/Component/HttpKernel/EventListener/SessionListener.php

@@ -14,7 +14,7 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 
 /**
  * Sets the session in the request.
@@ -34,7 +34,7 @@ public function __construct(ContainerInterface $container, bool $debug = false)
         parent::__construct($container, $debug);
     }
 
-    public function onKernelRequest(GetResponseEvent $event)
+    public function onKernelRequest(RequestEvent $event)
     {
         parent::onKernelRequest($event);
 

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

@@ -36,7 +36,7 @@ public function testHandleUnmatchedPath()
         $dispatcher = $this->getEventDispatcher();
         [$listener, , $httpUtils, $options] = $this->getListener($dispatcher);
 
-        [$event, $request] = $this->getGetResponseEvent();
+        [$event, $request] = $this->getRequestEvent();
 
         $logoutEventDispatched = false;
         $dispatcher->addListener(LogoutEvent::class, function (LogoutEvent $event) use (&$logoutEventDispatched) {
@@ -60,7 +60,7 @@ public function testHandleMatchedPathWithCsrfValidation()
 
         [$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher, $tokenManager);
 
-        [$event, $request] = $this->getGetResponseEvent();
+        [$event, $request] = $this->getRequestEvent();
 
         $request->query->set('_csrf_token', 'token');
 
@@ -98,7 +98,7 @@ public function testHandleMatchedPathWithoutCsrfValidation()
         $dispatcher = $this->getEventDispatcher();
         [$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher);
 
-        [$event, $request] = $this->getGetResponseEvent();
+        [$event, $request] = $this->getRequestEvent();
 
         $httpUtils->expects($this->once())
             ->method('checkRequestPath')
@@ -131,7 +131,7 @@ public function testNoResponseSet()
 
         [$listener, , $httpUtils, $options] = $this->getListener();
 
-        [$event, $request] = $this->getGetResponseEvent();
+        [$event, $request] = $this->getRequestEvent();
 
         $httpUtils->expects($this->once())
             ->method('checkRequestPath')
@@ -148,7 +148,7 @@ public function testCsrfValidationFails()
 
         [$listener, , $httpUtils, $options] = $this->getListener(null, $tokenManager);
 
-        [$event, $request] = $this->getGetResponseEvent();
+        [$event, $request] = $this->getRequestEvent();
 
         $request->query->set('_csrf_token', 'token');
 
@@ -179,7 +179,7 @@ public function testLegacyLogoutHandlers()
         $token = $this->getToken();
         $tokenStorage->expects($this->any())->method('getToken')->willReturn($token);
 
-        [$event, $request] = $this->getGetResponseEvent();
+        [$event, $request] = $this->getRequestEvent();
 
         $httpUtils->expects($this->once())
             ->method('checkRequestPath')
@@ -208,7 +208,7 @@ private function getTokenStorage()
         return $this->createMock(TokenStorageInterface::class);
     }
 
-    private function getGetResponseEvent()
+    private function getRequestEvent()
     {
         $event = $this->createMock(RequestEvent::class);
 

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

@@ -46,7 +46,7 @@ public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
             ->method('setToken')
         ;
 
-        $this->assertNull($listener($this->getGetResponseEvent()));
+        $this->assertNull($listener($this->getRequestEvent()));
     }
 
     public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
@@ -65,7 +65,7 @@ public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
             ->willReturn(null)
         ;
 
-        $event = $this->getGetResponseEvent();
+        $event = $this->getRequestEvent();
 
         $this->assertNull($listener($event));
     }
@@ -100,7 +100,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
             ->willThrowException($exception)
         ;
 
-        $event = $this->getGetResponseEvent($request);
+        $event = $this->getRequestEvent($request);
 
         $listener($event);
     }
@@ -135,7 +135,7 @@ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExcepti
             ->willThrowException($exception)
         ;
 
-        $event = $this->getGetResponseEvent();
+        $event = $this->getRequestEvent();
 
         $listener($event);
     }
@@ -167,7 +167,7 @@ public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggers
             ->method('authenticate')
         ;
 
-        $event = $this->getGetResponseEvent();
+        $event = $this->getRequestEvent();
 
         $listener($event);
     }
@@ -201,7 +201,7 @@ public function testOnCoreSecurity()
             ->willReturn($token)
         ;
 
-        $event = $this->getGetResponseEvent();
+        $event = $this->getRequestEvent();
 
         $listener($event);
     }
@@ -245,7 +245,7 @@ public function testSessionStrategy()
         $request = new Request();
         $request->setSession($session);
 
-        $event = $this->getGetResponseEvent($request);
+        $event = $this->getRequestEvent($request);
 
         $sessionStrategy
             ->expects($this->once())
@@ -299,7 +299,7 @@ public function testSessionIsMigratedByDefault()
         $request = new Request();
         $request->setSession($session);
 
-        $event = $this->getGetResponseEvent($request);
+        $event = $this->getRequestEvent($request);
 
         $listener($event);
     }
@@ -333,7 +333,7 @@ public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherI
             ->willReturn($token)
         ;
 
-        $event = $this->getGetResponseEvent();
+        $event = $this->getRequestEvent();
 
         $dispatcher
             ->expects($this->once())
@@ -347,7 +347,7 @@ public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherI
         $listener($event);
     }
 
-    protected function getGetResponseEvent(Request $request = null): RequestEvent
+    protected function getRequestEvent(Request $request = null): RequestEvent
     {
         $request = $request ?? new Request();