Merge branch '4.4' into 5.2

* 4.4:
  do not mock the Request class
  do not mock event classes
  recover from failed deserializations
  [ErrorHandle] Remove a link from the exception page
  [Validator] Added Ukrainian translations
  [GHA] Clarify some bits in the deps=high script

Tests/Firewall/AbstractPreAuthenticatedListenerTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -62,14 +63,7 @@ public function testHandleWithValidValues()
             ->method('getPreAuthenticatedData')
             ->willReturn($userCredentials);
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testHandleWhenAuthenticationFails()
@@ -109,14 +103,7 @@ public function testHandleWhenAuthenticationFails()
             ->method('getPreAuthenticatedData')
             ->willReturn($userCredentials);
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testHandleWhenAuthenticationFailsWithDifferentToken()
@@ -158,12 +145,7 @@ public function testHandleWhenAuthenticationFailsWithDifferentToken()
             ->method('getPreAuthenticatedData')
             ->willReturn($userCredentials);
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $listener($event);
     }
@@ -200,14 +182,7 @@ public function testHandleWithASimilarAuthenticatedToken()
             ->method('getPreAuthenticatedData')
             ->willReturn($userCredentials);
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testHandleWithAnInvalidSimilarToken()
@@ -250,13 +225,6 @@ public function testHandleWithAnInvalidSimilarToken()
             ->method('getPreAuthenticatedData')
             ->willReturn($userCredentials);
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 }

Tests/Firewall/BasicAuthenticationListenerTest.php

@@ -15,6 +15,7 @@
 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\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
 use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
@@ -64,14 +65,7 @@ public function testHandleWithValidUsernameAndPasswordServerParameters()
             $this->createMock(AuthenticationEntryPointInterface::class)
         );
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testHandleWhenAuthenticationFails()
@@ -109,19 +103,11 @@ public function testHandleWhenAuthenticationFails()
             $authenticationEntryPoint
         );
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-        $event
-            ->expects($this->once())
-            ->method('setResponse')
-            ->with($this->equalTo($response))
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $listener($event);
+
+        $this->assertSame($response, $event->getResponse());
     }
 
     public function testHandleWithNoUsernameServerParameter()
@@ -141,14 +127,7 @@ public function testHandleWithNoUsernameServerParameter()
             $this->createMock(AuthenticationEntryPointInterface::class)
         );
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testHandleWithASimilarAuthenticatedToken()
@@ -177,14 +156,7 @@ public function testHandleWithASimilarAuthenticatedToken()
             $this->createMock(AuthenticationEntryPointInterface::class)
         );
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testItRequiresProviderKey()
@@ -236,18 +208,10 @@ public function testHandleWithADifferentAuthenticatedToken()
             $authenticationEntryPoint
         );
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-        $event
-            ->expects($this->once())
-            ->method('setResponse')
-            ->with($this->equalTo($response))
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $listener($event);
+
+        $this->assertSame($response, $event->getResponse());
     }
 }

Tests/Firewall/ChannelListenerTest.php

@@ -15,6 +15,7 @@
 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\AccessMapInterface;
 use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\Security\Http\Firewall\ChannelListener;
@@ -44,19 +45,12 @@ public function testHandleWithNotSecuredRequestAndHttpChannel()
             ->method('start')
         ;
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-        $event
-            ->expects($this->never())
-            ->method('setResponse')
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $listener = new ChannelListener($accessMap, $entryPoint);
         $listener($event);
+
+        $this->assertNull($event->getResponse());
     }
 
     public function testHandleWithSecuredRequestAndHttpsChannel()
@@ -82,19 +76,12 @@ public function testHandleWithSecuredRequestAndHttpsChannel()
             ->method('start')
         ;
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-        $event
-            ->expects($this->never())
-            ->method('setResponse')
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $listener = new ChannelListener($accessMap, $entryPoint);
         $listener($event);
+
+        $this->assertNull($event->getResponse());
     }
 
     public function testHandleWithNotSecuredRequestAndHttpsChannel()
@@ -124,20 +111,12 @@ public function testHandleWithNotSecuredRequestAndHttpsChannel()
             ->willReturn($response)
         ;
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-        $event
-            ->expects($this->once())
-            ->method('setResponse')
-            ->with($this->equalTo($response))
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $listener = new ChannelListener($accessMap, $entryPoint);
         $listener($event);
+
+        $this->assertSame($response, $event->getResponse());
     }
 
     public function testHandleWithSecuredRequestAndHttpChannel()
@@ -167,19 +146,11 @@ public function testHandleWithSecuredRequestAndHttpChannel()
             ->willReturn($response)
         ;
 
-        $event = $this->createMock(RequestEvent::class);
-        $event
-            ->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request)
-        ;
-        $event
-            ->expects($this->once())
-            ->method('setResponse')
-            ->with($this->equalTo($response))
-        ;
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $listener = new ChannelListener($accessMap, $entryPoint);
         $listener($event);
+
+        $this->assertSame($response, $event->getResponse());
     }
 }

Tests/Firewall/ContextListenerTest.php

@@ -146,13 +146,9 @@ public function testOnKernelResponseWithoutSessionNorToken()
     public function testInvalidTokenInSession($token)
     {
         $tokenStorage = $this->createMock(TokenStorageInterface::class);
-        $event = $this->createMock(RequestEvent::class);
         $request = $this->createMock(Request::class);
         $session = $this->createMock(SessionInterface::class);
 
-        $event->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($request);
         $request->expects($this->any())
             ->method('hasPreviousSession')
             ->willReturn(true);
@@ -168,7 +164,7 @@ public function testInvalidTokenInSession($token)
             ->with(null);
 
         $listener = new ContextListener($tokenStorage, [], 'key123');
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function provideInvalidToken()
@@ -186,22 +182,13 @@ public function testHandleAddsKernelResponseListener()
     {
         $tokenStorage = $this->createMock(TokenStorageInterface::class);
         $dispatcher = $this->createMock(EventDispatcherInterface::class);
-        $event = $this->createMock(RequestEvent::class);
-
         $listener = new ContextListener($tokenStorage, [], 'key123', null, $dispatcher);
 
-        $event->expects($this->any())
-            ->method('isMasterRequest')
-            ->willReturn(true);
-        $event->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($this->createMock(Request::class));
-
         $dispatcher->expects($this->once())
             ->method('addListener')
             ->with(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
 
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testOnKernelResponseListenerRemovesItself()
@@ -234,14 +221,11 @@ public function testHandleRemovesTokenIfNoPreviousSessionWasFound()
         $request = $this->createMock(Request::class);
         $request->expects($this->any())->method('hasPreviousSession')->willReturn(false);
 
-        $event = $this->createMock(RequestEvent::class);
-        $event->expects($this->any())->method('getRequest')->willReturn($request);
-
         $tokenStorage = $this->createMock(TokenStorageInterface::class);
         $tokenStorage->expects($this->once())->method('setToken')->with(null);
 
         $listener = new ContextListener($tokenStorage, [], 'key123');
-        $listener($event);
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testIfTokenIsDeauthenticated()