Merge branch '5.1' into 5.2

* 5.1:
  More cleanups and fixes

Author: nicolas-grekas

Tests/Authenticator/FormLoginAuthenticatorTest.php

@@ -118,7 +118,7 @@ public function testHandleNonStringUsernameWithObject($postOnly)
      */
     public function testHandleNonStringUsernameWithToString($postOnly)
     {
-        $usernameObject = $this->getMockBuilder(DummyUserClass::class)->getMock();
+        $usernameObject = $this->createMock(DummyUserClass::class);
         $usernameObject->expects($this->once())->method('__toString')->willReturn('someUsername');
 
         $request = Request::create('/login_check', 'POST', ['_username' => $usernameObject, '_password' => 's$cr$t']);

Tests/Authenticator/HttpBasicAuthenticatorTest.php

@@ -22,9 +22,9 @@ class HttpBasicAuthenticatorTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->userProvider = $this->getMockBuilder(UserProviderInterface::class)->getMock();
-        $this->encoderFactory = $this->getMockBuilder(EncoderFactoryInterface::class)->getMock();
-        $this->encoder = $this->getMockBuilder(PasswordEncoderInterface::class)->getMock();
+        $this->userProvider = $this->createMock(UserProviderInterface::class);
+        $this->encoderFactory = $this->createMock(EncoderFactoryInterface::class);
+        $this->encoder = $this->createMock(PasswordEncoderInterface::class);
         $this->encoderFactory
             ->expects($this->any())
             ->method('getEncoder')

Tests/EventListener/RememberMeListenerTest.php

@@ -39,7 +39,7 @@ protected function setUp(): void
     {
         $this->rememberMeServices = $this->createMock(RememberMeServicesInterface::class);
         $this->listener = new RememberMeListener($this->rememberMeServices);
-        $this->request = $this->getMockBuilder(Request::class)->disableOriginalConstructor()->getMock();
+        $this->request = $this->createMock(Request::class);
         $this->response = $this->createMock(Response::class);
         $this->token = $this->createMock(TokenInterface::class);
     }

Tests/EventListener/SessionStrategyListenerTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
@@ -68,7 +69,7 @@ private function createEvent($firewallName)
 
     private function configurePreviousSession()
     {
-        $session = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Session\SessionInterface::class)->getMock();
+        $session = $this->createMock(SessionInterface::class);
         $session->expects($this->any())
             ->method('getName')
             ->willReturn('test_session_name');

Tests/Firewall/AccessListenerTest.php

@@ -259,7 +259,7 @@ public function testHandleWhenTheSecurityTokenStorageHasNoTokenAndExceptionOnTok
             $tokenStorage,
             $accessDecisionManager,
             $accessMap,
-            $this->getMockBuilder(AuthenticationManagerInterface::class)->getMock(),
+            $this->createMock(AuthenticationManagerInterface::class),
             false
         );
 
@@ -288,7 +288,7 @@ public function testHandleWhenPublicAccessIsAllowedAndExceptionOnTokenIsFalse()
             $tokenStorage,
             $accessDecisionManager,
             $accessMap,
-            $this->getMockBuilder(AuthenticationManagerInterface::class)->getMock(),
+            $this->createMock(AuthenticationManagerInterface::class),
             false
         );
 
@@ -319,7 +319,7 @@ public function testHandleWhenPublicAccessWhileAuthenticated()
             $tokenStorage,
             $accessDecisionManager,
             $accessMap,
-            $this->getMockBuilder(AuthenticationManagerInterface::class)->getMock(),
+            $this->createMock(AuthenticationManagerInterface::class),
             false
         );
 

Tests/Firewall/ContextListenerTest.php

@@ -369,7 +369,7 @@ public function testSessionIsNotReported()
         $tokenStorage = new TokenStorage();
 
         $listener = new ContextListener($tokenStorage, [], 'context_key', null, null, null, [$tokenStorage, 'getToken']);
-        $listener(new RequestEvent($this->getMockBuilder(HttpKernelInterface::class)->getMock(), $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
     }
 
     protected function runSessionOnKernelResponse($newToken, $original = null)