From 732b7b0aa4c5a95e1f3d3c38acb52a5e2d4ed047 Mon Sep 17 00:00:00 2001
From: Leo Feyer <github@contao.org>
Date: Mon, 23 Dec 2019 17:43:33 +0100
Subject: [PATCH] Revert "Renamed method after changing its signature (see
 #1131)"

This reverts commit df231e77d9d6a990fdfe0efe6cf35c523d7a807c.
---
 .../TwoFactorFrontendListenerTest.php         | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core-bundle/tests/EventListener/TwoFactorFrontendListenerTest.php b/core-bundle/tests/EventListener/TwoFactorFrontendListenerTest.php
index 35ff092a75d..e5e303094c6 100644
--- a/core-bundle/tests/EventListener/TwoFactorFrontendListenerTest.php
+++ b/core-bundle/tests/EventListener/TwoFactorFrontendListenerTest.php
@@ -37,7 +37,7 @@ class TwoFactorFrontendListenerTest extends ContaoTestCase
 {
     public function testReturnsIfTheRequestIsNotAFrontendRequest(): void
     {
-        $event = $this->getRequestEvent($this->getRequest());
+        $event = $this->getResponseEvent($this->getRequest());
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework(),
@@ -53,7 +53,7 @@ public function testReturnsIfTheRequestIsNotAFrontendRequest(): void
 
     public function testReturnsIfTheTokenIsNotATwoFactorToken(): void
     {
-        $event = $this->getRequestEvent($this->getRequest());
+        $event = $this->getResponseEvent($this->getRequest());
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework(),
@@ -70,7 +70,7 @@ public function testReturnsIfTheTokenIsNotATwoFactorToken(): void
     public function testReturnsIfTheTokenIsNotSupported(): void
     {
         $token = $this->createMock(AnonymousToken::class);
-        $event = $this->getRequestEvent($this->getRequest());
+        $event = $this->getResponseEvent($this->getRequest());
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework(),
@@ -87,7 +87,7 @@ public function testReturnsIfTheTokenIsNotSupported(): void
     public function testReturnsIfTheRequestHasNoPageModel(): void
     {
         $token = $this->mockToken(TwoFactorToken::class);
-        $event = $this->getRequestEvent($this->getRequest());
+        $event = $this->getResponseEvent($this->getRequest());
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework(),
@@ -104,7 +104,7 @@ public function testReturnsIfTheRequestHasNoPageModel(): void
     public function testReturnsIfTheUserIsNotAFrontendUser(): void
     {
         $token = $this->mockToken(TwoFactorToken::class);
-        $event = $this->getRequestEvent($this->getRequest(true));
+        $event = $this->getResponseEvent($this->getRequest(true));
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework(),
@@ -137,7 +137,7 @@ public function testThrowsAPageNotFoundExceptionIfThereIsNoTwoFactorPage(): void
         ;
 
         $token = $this->mockToken(TwoFactorToken::class, true, $user);
-        $event = $this->getRequestEvent($this->getRequest(true, $pageModel));
+        $event = $this->getResponseEvent($this->getRequest(true, $pageModel));
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -172,7 +172,7 @@ public function testReturnsIfTwoFactorAuthenticationIsEnforcedAndThePageIsTheTwo
         ;
 
         $token = $this->mockToken(TwoFactorToken::class, true, $user);
-        $event = $this->getRequestEvent($this->getRequest(true, $pageModel));
+        $event = $this->getResponseEvent($this->getRequest(true, $pageModel));
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -217,7 +217,7 @@ public function testRedirectsToTheTwoFactorPageIfTwoFactorAuthenticationIsEnforc
 
         $response = new RedirectResponse('http://localhost/two_factor');
         $token = $this->mockToken(TwoFactorToken::class, true, $user);
-        $event = $this->getRequestEvent($this->getRequest(true, $pageModel), $response);
+        $event = $this->getResponseEvent($this->getRequest(true, $pageModel), $response);
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -252,7 +252,7 @@ public function testReturnsIfTheUserIsAlreadyAuthenticated(): void
 
         $response = new RedirectResponse('http://localhost/two_factor');
         $token = $this->mockToken(UsernamePasswordToken::class, true, $user);
-        $event = $this->getRequestEvent($this->getRequest(true, $pageModel), $response);
+        $event = $this->getResponseEvent($this->getRequest(true, $pageModel), $response);
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -302,7 +302,7 @@ public function testRedirectsToTheTargetPathIfThe401PageHasNoRedirect(): void
         $request = $this->getRequest(true, $pageModel);
         $request->setSession($session);
 
-        $event = $this->getRequestEvent($request, $response);
+        $event = $this->getResponseEvent($request, $response);
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -346,7 +346,7 @@ public function testReturnsIfTheCurrentPageIsThe401AutoforwardTarget(): void
 
         $response = new RedirectResponse('http://localhost/two_factor');
         $token = $this->mockToken(TwoFactorToken::class, true, $user);
-        $event = $this->getRequestEvent($this->getRequest(true, $pageModel), $response);
+        $event = $this->getResponseEvent($this->getRequest(true, $pageModel), $response);
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -380,7 +380,7 @@ public function testThrowsAnUnauthorizedHttpException(): void
 
         $response = new RedirectResponse('http://localhost/two_factor');
         $token = $this->mockToken(TwoFactorToken::class, true, $user);
-        $event = $this->getRequestEvent($this->getRequest(true, $pageModel), $response);
+        $event = $this->getResponseEvent($this->getRequest(true, $pageModel), $response);
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -425,7 +425,7 @@ public function testReturnsIfTheCurrentPageIsTheTargetPath(): void
         $request = $this->getRequest(true, $pageModel);
         $request->setSession($session);
 
-        $event = $this->getRequestEvent($request, $response);
+        $event = $this->getResponseEvent($request, $response);
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -470,7 +470,7 @@ public function testRedirectsToTheTargetPath(): void
         $request = $this->getRequest(true, $pageModel);
         $request->setSession($session);
 
-        $event = $this->getRequestEvent($request, $response);
+        $event = $this->getResponseEvent($request, $response);
 
         $listener = new TwoFactorFrontendListener(
             $this->mockContaoFramework([PageModel::class => $adapter]),
@@ -566,7 +566,7 @@ private function mockScopeMatcher(bool $hasFrontendUser, RequestEvent $event): S
         return $scopeMatcher;
     }
 
-    private function getRequestEvent(Request $request = null, Response $response = null): RequestEvent
+    private function getResponseEvent(Request $request = null, Response $response = null): RequestEvent
     {
         $kernel = $this->createMock(Kernel::class);