Merge branch '5.2' into 5.3

* 5.2:
  clean up remaining event mocks

Author: xabbuh

Tests/Firewall/RememberMeListenerTest.php

@@ -48,7 +48,7 @@ public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
             ->method('setToken')
         ;
 
-        $this->assertNull($listener($this->getRequestEvent()));
+        $this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST)));
     }
 
     public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
@@ -67,9 +67,7 @@ public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
             ->willReturn(null)
         ;
 
-        $event = $this->getRequestEvent();
-
-        $this->assertNull($listener($event));
+        $this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST)));
     }
 
     public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation()
@@ -102,9 +100,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
             ->willThrowException($exception)
         ;
 
-        $event = $this->getRequestEvent($request);
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()
@@ -137,9 +133,7 @@ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExcepti
             ->willThrowException($exception)
         ;
 
-        $event = $this->getRequestEvent();
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggersLoginFail()
@@ -169,9 +163,7 @@ public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggers
             ->method('authenticate')
         ;
 
-        $event = $this->getRequestEvent();
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testOnCoreSecurity()
@@ -203,9 +195,7 @@ public function testOnCoreSecurity()
             ->willReturn($token)
         ;
 
-        $event = $this->getRequestEvent();
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testSessionStrategy()
@@ -247,15 +237,13 @@ public function testSessionStrategy()
         $request = new Request();
         $request->setSession($session);
 
-        $event = $this->getRequestEvent($request);
-
         $sessionStrategy
             ->expects($this->once())
             ->method('onAuthentication')
             ->willReturn(null)
         ;
 
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testSessionIsMigratedByDefault()
@@ -301,9 +289,7 @@ public function testSessionIsMigratedByDefault()
         $request = new Request();
         $request->setSession($session);
 
-        $event = $this->getRequestEvent($request);
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherIsPresent()
@@ -335,8 +321,6 @@ public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherI
             ->willReturn($token)
         ;
 
-        $event = $this->getRequestEvent();
-
         $dispatcher
             ->expects($this->once())
             ->method('dispatch')
@@ -346,23 +330,7 @@ public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherI
             )
         ;
 
-        $listener($event);
-    }
-
-    protected function getRequestEvent(Request $request = null): RequestEvent
-    {
-        $request = $request ?? new Request();
-
-        $event = $this->getMockBuilder(RequestEvent::class)
-            ->setConstructorArgs([$this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST])
-            ->getMock();
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        return $event;
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
     }
 
     protected function getListener($withDispatcher = false, $catchExceptions = true, $withSessionStrategy = false)

Tests/FirewallTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Http\Firewall;
@@ -68,20 +69,8 @@ public function testOnKernelRequestStopsWhenThereIsAResponse()
             ->willReturn([[$first, $second], null, null])
         ;
 
-        $event = $this->getMockBuilder(RequestEvent::class)
-            ->setMethods(['hasResponse'])
-            ->setConstructorArgs([
-                $this->createMock(HttpKernelInterface::class),
-                $this->createMock(Request::class),
-                HttpKernelInterface::MAIN_REQUEST,
-            ])
-            ->getMock()
-        ;
-        $event
-            ->expects($this->once())
-            ->method('hasResponse')
-            ->willReturn(true)
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST);
+        $event->setResponse(new Response());
 
         $firewall = new Firewall($map, $this->createMock(EventDispatcherInterface::class));
         $firewall->onKernelRequest($event);