Merge branch '4.4' into 5.1

* 4.4:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/AccessMapTest.php

@@ -12,13 +12,15 @@
 namespace Symfony\Component\Security\Http\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 use Symfony\Component\Security\Http\AccessMap;
 
 class AccessMapTest extends TestCase
 {
     public function testReturnsFirstMatchedPattern()
     {
-        $request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->getMock();
+        $request = $this->createMock(Request::class);
         $requestMatcher1 = $this->getRequestMatcher($request, false);
         $requestMatcher2 = $this->getRequestMatcher($request, true);
 
@@ -31,7 +33,7 @@ public function testReturnsFirstMatchedPattern()
 
     public function testReturnsEmptyPatternIfNoneMatched()
     {
-        $request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->getMock();
+        $request = $this->createMock(Request::class);
         $requestMatcher = $this->getRequestMatcher($request, false);
 
         $map = new AccessMap();
@@ -42,7 +44,7 @@ public function testReturnsEmptyPatternIfNoneMatched()
 
     private function getRequestMatcher($request, $matches)
     {
-        $requestMatcher = $this->getMockBuilder(\Symfony\Component\HttpFoundation\RequestMatcherInterface::class)->getMock();
+        $requestMatcher = $this->createMock(RequestMatcherInterface::class);
         $requestMatcher->expects($this->once())
             ->method('matches')->with($request)
             ->willReturn($matches);

Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php

@@ -12,11 +12,17 @@
 namespace Symfony\Component\Security\Http\Tests\Authentication;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler;
+use Symfony\Component\Security\Http\HttpUtils;
 
 class DefaultAuthenticationFailureHandlerTest extends TestCase
 {
@@ -29,14 +35,14 @@ class DefaultAuthenticationFailureHandlerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->httpKernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
-        $this->httpUtils = $this->getMockBuilder(\Symfony\Component\Security\Http\HttpUtils::class)->getMock();
-        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+        $this->httpKernel = $this->createMock(HttpKernelInterface::class);
+        $this->httpUtils = $this->createMock(HttpUtils::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
 
-        $this->session = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Session\SessionInterface::class)->getMock();
-        $this->request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->getMock();
+        $this->session = $this->createMock(SessionInterface::class);
+        $this->request = $this->createMock(Request::class);
         $this->request->expects($this->any())->method('getSession')->willReturn($this->session);
-        $this->exception = $this->getMockBuilder(\Symfony\Component\Security\Core\Exception\AuthenticationException::class)->setMethods(['getMessage'])->getMock();
+        $this->exception = $this->getMockBuilder(AuthenticationException::class)->setMethods(['getMessage'])->getMock();
     }
 
     public function testForward()
@@ -183,8 +189,8 @@ public function testFailurePathParameterCanBeOverwritten()
 
     private function getRequest()
     {
-        $request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->getMock();
-        $request->attributes = $this->getMockBuilder(\Symfony\Component\HttpFoundation\ParameterBag::class)->getMock();
+        $request = $this->createMock(Request::class);
+        $request->attributes = $this->createMock(ParameterBag::class);
 
         return $request;
     }

Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php

@@ -13,6 +13,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler;
 use Symfony\Component\Security\Http\HttpUtils;
 
@@ -23,10 +26,10 @@ class DefaultAuthenticationSuccessHandlerTest extends TestCase
      */
     public function testRequestRedirections(Request $request, $options, $redirectedUrl)
     {
-        $urlGenerator = $this->getMockBuilder(\Symfony\Component\Routing\Generator\UrlGeneratorInterface::class)->getMock();
+        $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $urlGenerator->expects($this->any())->method('generate')->willReturn('http://localhost/login');
         $httpUtils = new HttpUtils($urlGenerator);
-        $token = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class)->getMock();
+        $token = $this->createMock(TokenInterface::class);
         $handler = new DefaultAuthenticationSuccessHandler($httpUtils, $options);
         if ($request->hasSession()) {
             $handler->setProviderKey('admin');
@@ -36,7 +39,7 @@ public function testRequestRedirections(Request $request, $options, $redirectedU
 
     public function getRequestRedirections()
     {
-        $session = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Session\SessionInterface::class)->getMock();
+        $session = $this->createMock(SessionInterface::class);
         $session->expects($this->once())->method('get')->with('_security.admin.target_path')->willReturn('/admin/dashboard');
         $session->expects($this->once())->method('remove')->with('_security.admin.target_path');
         $requestWithSession = Request::create('/');

Tests/Controller/UserValueResolverTest.php

@@ -34,7 +34,7 @@ public function testResolveNoToken()
 
     public function testResolveNoUser()
     {
-        $mock = $this->getMockBuilder(UserInterface::class)->getMock();
+        $mock = $this->createMock(UserInterface::class);
         $token = new UsernamePasswordToken('username', 'password', 'provider');
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
@@ -56,7 +56,7 @@ public function testResolveWrongType()
 
     public function testResolve()
     {
-        $user = $this->getMockBuilder(UserInterface::class)->getMock();
+        $user = $this->createMock(UserInterface::class);
         $token = new UsernamePasswordToken($user, 'password', 'provider');
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
@@ -70,7 +70,7 @@ public function testResolve()
 
     public function testIntegration()
     {
-        $user = $this->getMockBuilder(UserInterface::class)->getMock();
+        $user = $this->createMock(UserInterface::class);
         $token = new UsernamePasswordToken($user, 'password', 'provider');
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);

Tests/EntryPoint/BasicAuthenticationEntryPointTest.php

@@ -12,14 +12,15 @@
 namespace Symfony\Component\Security\Http\Tests\EntryPoint;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\EntryPoint\BasicAuthenticationEntryPoint;
 
 class BasicAuthenticationEntryPointTest extends TestCase
 {
     public function testStart()
     {
-        $request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->getMock();
+        $request = $this->createMock(Request::class);
 
         $authException = new AuthenticationException('The exception message');
 
@@ -32,7 +33,7 @@ public function testStart()
 
     public function testStartWithoutAuthException()
     {
-        $request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->getMock();
+        $request = $this->createMock(Request::class);
 
         $entryPoint = new BasicAuthenticationEntryPoint('TheRealmName');
 

Tests/EntryPoint/FormAuthenticationEntryPointTest.php

@@ -13,19 +13,21 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint;
+use Symfony\Component\Security\Http\HttpUtils;
 
 class FormAuthenticationEntryPointTest extends TestCase
 {
     public function testStart()
     {
-        $request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->disableOriginalConstructor()->disableOriginalClone()->getMock();
+        $request = $this->createMock(Request::class);
         $response = new RedirectResponse('/the/login/path');
 
-        $httpKernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
-        $httpUtils = $this->getMockBuilder(\Symfony\Component\Security\Http\HttpUtils::class)->getMock();
+        $httpKernel = $this->createMock(HttpKernelInterface::class);
+        $httpUtils = $this->createMock(HttpUtils::class);
         $httpUtils
             ->expects($this->once())
             ->method('createRedirectResponse')
@@ -40,19 +42,19 @@ public function testStart()
 
     public function testStartWithUseForward()
     {
-        $request = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->disableOriginalConstructor()->disableOriginalClone()->getMock();
-        $subRequest = $this->getMockBuilder(\Symfony\Component\HttpFoundation\Request::class)->disableOriginalConstructor()->disableOriginalClone()->getMock();
+        $request = $this->createMock(Request::class);
+        $subRequest = $this->createMock(Request::class);
         $response = new Response('', 200);
 
-        $httpUtils = $this->getMockBuilder(\Symfony\Component\Security\Http\HttpUtils::class)->getMock();
+        $httpUtils = $this->createMock(HttpUtils::class);
         $httpUtils
             ->expects($this->once())
             ->method('createRequest')
             ->with($this->equalTo($request), $this->equalTo('/the/login/path'))
             ->willReturn($subRequest)
         ;
 
-        $httpKernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
+        $httpKernel = $this->createMock(HttpKernelInterface::class);
         $httpKernel
             ->expects($this->once())
             ->method('handle')

Tests/EntryPoint/RetryAuthenticationEntryPointTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Http\Tests\EntryPoint;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint;
 
@@ -25,7 +26,7 @@ public function testStart($httpPort, $httpsPort, $request, $expectedUrl)
         $entryPoint = new RetryAuthenticationEntryPoint($httpPort, $httpsPort);
         $response = $entryPoint->start($request);
 
-        $this->assertInstanceOf(\Symfony\Component\HttpFoundation\RedirectResponse::class, $response);
+        $this->assertInstanceOf(RedirectResponse::class, $response);
         $this->assertEquals($expectedUrl, $response->headers->get('Location'));
     }