Use createMock() and use import instead of FQCN

OskarStark · nicolas-grekas · commit b2cd6ea94f82 · 2021-01-27T10:09:26.000+01:00
diff --git a/Tests/DataCollector/SecurityDataCollectorTest.php b/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -220,7 +220,7 @@ public function testGetFirewallReturnsNull()
     public function testGetListeners()
     {
         $request = new Request();
-        $event = new RequestEvent($this->getMockBuilder(HttpKernelInterface::class)->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
         $event->setResponse($response = new Response());
         $listener = function ($e) use ($event, &$listenerCalled) {
             $listenerCalled += $e === $event;
diff --git a/Tests/Debug/TraceableFirewallListenerTest.php b/Tests/Debug/TraceableFirewallListenerTest.php
@@ -29,15 +29,12 @@ class TraceableFirewallListenerTest extends TestCase
     public function testOnKernelRequestRecordsListeners()
     {
         $request = new Request();
-        $event = new RequestEvent($this->getMockBuilder(HttpKernelInterface::class)->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
         $event->setResponse($response = new Response());
         $listener = function ($e) use ($event, &$listenerCalled) {
             $listenerCalled += $e === $event;
         };
-        $firewallMap = $this
-            ->getMockBuilder(FirewallMap::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $firewallMap = $this->createMock(FirewallMap::class);
         $firewallMap
             ->expects($this->once())
             ->method('getFirewallConfig')
diff --git a/Tests/DependencyInjection/CompleteConfigurationTest.php b/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -610,7 +611,7 @@ public function testCustomAccessDecisionManagerService()
 
     public function testAccessDecisionManagerServiceAndStrategyCannotBeUsedAtTheSameTime()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('Invalid configuration for path "security.access_decision_manager": "strategy" and "service" cannot be used together.');
         $this->getContainer('access_decision_manager_service_and_strategy');
     }
@@ -628,14 +629,14 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate
 
     public function testFirewallUndefinedUserProvider()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');
         $this->getContainer('firewall_undefined_provider');
     }
 
     public function testFirewallListenerUndefinedProvider()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');
         $this->getContainer('listener_undefined_provider');
     }
diff --git a/Tests/DependencyInjection/MainConfigurationTest.php b/Tests/DependencyInjection/MainConfigurationTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\MainConfiguration;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 
 class MainConfigurationTest extends TestCase
@@ -34,7 +35,7 @@ class MainConfigurationTest extends TestCase
 
     public function testNoConfigForProvider()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $config = [
             'providers' => [
                 'stub' => [],
@@ -48,7 +49,7 @@ public function testNoConfigForProvider()
 
     public function testManyConfigForProvider()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $config = [
             'providers' => [
                 'stub' => [
diff --git a/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Security\Factory;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -127,7 +128,7 @@ public function getSuccessHandlers()
 
     protected function callFactory($id, $config, $userProviderId, $defaultEntryPointId)
     {
-        $factory = $this->getMockForAbstractClass(\Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory::class, []);
+        $factory = $this->getMockForAbstractClass(AbstractFactory::class);
 
         $factory
             ->expects($this->once())
diff --git a/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php b/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\GuardAuthenticationFactory;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -41,7 +42,7 @@ public function testAddValidConfiguration(array $inputConfig, array $expectedCon
      */
     public function testAddInvalidConfiguration(array $inputConfig)
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $factory = new GuardAuthenticationFactory();
         $nodeDefinition = new ArrayNodeDefinition('guard');
         $factory->addConfiguration($nodeDefinition);
diff --git a/Tests/DependencyInjection/SecurityExtensionTest.php b/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -16,6 +16,7 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Fixtures\UserProvider\DummyProvider;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -26,7 +27,7 @@ class SecurityExtensionTest extends TestCase
 {
     public function testInvalidCheckPath()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('The check_path "/some_area/login_check" for login method "form_login" is not matched by the firewall pattern "/secured_area/.*".');
         $container = $this->getRawContainer();
 
@@ -50,7 +51,7 @@ public function testInvalidCheckPath()
 
     public function testFirewallWithoutAuthenticationListener()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('No authentication listener registered for firewall "some_firewall"');
         $container = $this->getRawContainer();
 
@@ -71,7 +72,7 @@ public function testFirewallWithoutAuthenticationListener()
 
     public function testFirewallWithInvalidUserProvider()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('Unable to create definition for "security.user.provider.concrete.my_foo" user provider');
         $container = $this->getRawContainer();
 
@@ -190,7 +191,7 @@ public function testPerListenerProvider()
 
     public function testMissingProviderForListener()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('Not configuring explicitly the provider for the "http_basic" listener on "ambiguous" firewall is ambiguous as there is more than one registered provider.');
         $container = $this->getRawContainer();
         $container->loadFromExtension('security', [
diff --git a/Tests/Functional/UserPasswordEncoderCommandTest.php b/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -301,7 +301,7 @@ public function testThrowsExceptionOnNoConfiguredEncoders()
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('There are no configured encoders for the "security" extension.');
         $application = new ConsoleApplication();
-        $application->add(new UserPasswordEncoderCommand($this->getMockBuilder(EncoderFactoryInterface::class)->getMock(), []));
+        $application->add(new UserPasswordEncoderCommand($this->createMock(EncoderFactoryInterface::class), []));
 
         $passwordEncoderCommand = $application->find('security:encode-password');
 
diff --git a/Tests/Security/FirewallMapTest.php b/Tests/Security/FirewallMapTest.php
@@ -30,7 +30,7 @@ public function testGetListenersWithEmptyMap()
         $request = new Request();
 
         $map = [];
-        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container = $this->createMock(Container::class);
         $container->expects($this->never())->method('get');
 
         $firewallMap = new FirewallMap($container, $map);
@@ -46,7 +46,7 @@ public function testGetListenersWithInvalidParameter()
         $request->attributes->set(self::ATTRIBUTE_FIREWALL_CONTEXT, 'foo');
 
         $map = [];
-        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container = $this->createMock(Container::class);
         $container->expects($this->never())->method('get');
 
         $firewallMap = new FirewallMap($container, $map);
@@ -60,27 +60,27 @@ public function testGetListeners()
     {
         $request = new Request();
 
-        $firewallContext = $this->getMockBuilder(FirewallContext::class)->disableOriginalConstructor()->getMock();
+        $firewallContext = $this->createMock(FirewallContext::class);
 
         $firewallConfig = new FirewallConfig('main', 'user_checker');
         $firewallContext->expects($this->once())->method('getConfig')->willReturn($firewallConfig);
 
         $listener = function () {};
         $firewallContext->expects($this->once())->method('getListeners')->willReturn([$listener]);
 
-        $exceptionListener = $this->getMockBuilder(ExceptionListener::class)->disableOriginalConstructor()->getMock();
+        $exceptionListener = $this->createMock(ExceptionListener::class);
         $firewallContext->expects($this->once())->method('getExceptionListener')->willReturn($exceptionListener);
 
-        $logoutListener = $this->getMockBuilder(LogoutListener::class)->disableOriginalConstructor()->getMock();
+        $logoutListener = $this->createMock(LogoutListener::class);
         $firewallContext->expects($this->once())->method('getLogoutListener')->willReturn($logoutListener);
 
-        $matcher = $this->getMockBuilder(RequestMatcherInterface::class)->getMock();
+        $matcher = $this->createMock(RequestMatcherInterface::class);
         $matcher->expects($this->once())
             ->method('matches')
             ->with($request)
             ->willReturn(true);
 
-        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container = $this->createMock(Container::class);
         $container->expects($this->exactly(2))->method('get')->willReturn($firewallContext);
 
         $firewallMap = new FirewallMap($container, ['security.firewall.map.context.foo' => $matcher]);
diff --git a/Tests/SecurityUserValueResolverTest.php b/Tests/SecurityUserValueResolverTest.php
@@ -37,8 +37,8 @@ public function testResolveNoToken()
 
     public function testResolveNoUser()
     {
-        $mock = $this->getMockBuilder(UserInterface::class)->getMock();
-        $token = $this->getMockBuilder(TokenInterface::class)->getMock();
+        $mock = $this->createMock(UserInterface::class);
+        $token = $this->createMock(TokenInterface::class);
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
 
@@ -59,8 +59,8 @@ public function testResolveWrongType()
 
     public function testResolve()
     {
-        $user = $this->getMockBuilder(UserInterface::class)->getMock();
-        $token = $this->getMockBuilder(TokenInterface::class)->getMock();
+        $user = $this->createMock(UserInterface::class);
+        $token = $this->createMock(TokenInterface::class);
         $token->expects($this->any())->method('getUser')->willReturn($user);
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
@@ -74,8 +74,8 @@ public function testResolve()
 
     public function testIntegration()
     {
-        $user = $this->getMockBuilder(UserInterface::class)->getMock();
-        $token = $this->getMockBuilder(TokenInterface::class)->getMock();
+        $user = $this->createMock(UserInterface::class);
+        $token = $this->createMock(TokenInterface::class);
         $token->expects($this->any())->method('getUser')->willReturn($user);
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
@@ -86,7 +86,7 @@ public function testIntegration()
 
     public function testIntegrationNoUser()
     {
-        $token = $this->getMockBuilder(TokenInterface::class)->getMock();
+        $token = $this->createMock(TokenInterface::class);
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
 

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public function testGetFirewallReturnsNull()`
`220`	`220`	`public function testGetListeners()`
`221`	`221`	`{`
`222`	`222`	`$request = new Request();`
`223`		`- $event = new RequestEvent($this->getMockBuilder(HttpKernelInterface::class)->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);`
	`223`	`+ $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);`
`224`	`224`	`$event->setResponse($response = new Response());`
`225`	`225`	`$listener = function ($e) use ($event, &$listenerCalled) {`
`226`	`226`	`$listenerCalled += $e === $event;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;`
`16`	`16`	`use Symfony\Bundle\SecurityBundle\SecurityBundle;`
	`17`	`+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;`
`17`	`18`	`use Symfony\Component\DependencyInjection\Argument\IteratorArgument;`
`18`	`19`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`19`	`20`	`use Symfony\Component\DependencyInjection\Reference;`
`@@ -610,7 +611,7 @@ public function testCustomAccessDecisionManagerService()`
`610`	`611`
`611`	`612`	`public function testAccessDecisionManagerServiceAndStrategyCannotBeUsedAtTheSameTime()`
`612`	`613`	`{`
`613`		`- $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
	`614`	`+ $this->expectException(InvalidConfigurationException::class);`
`614`	`615`	`$this->expectExceptionMessage('Invalid configuration for path "security.access_decision_manager": "strategy" and "service" cannot be used together.');`
`615`	`616`	`$this->getContainer('access_decision_manager_service_and_strategy');`
`616`	`617`	`}`
`@@ -628,14 +629,14 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate`
`628`	`629`
`629`	`630`	`public function testFirewallUndefinedUserProvider()`
`630`	`631`	`{`
`631`		`- $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
	`632`	`+ $this->expectException(InvalidConfigurationException::class);`
`632`	`633`	`$this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');`
`633`	`634`	`$this->getContainer('firewall_undefined_provider');`
`634`	`635`	`}`
`635`	`636`
`636`	`637`	`public function testFirewallListenerUndefinedProvider()`
`637`	`638`	`{`
`638`		`- $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
	`639`	`+ $this->expectException(InvalidConfigurationException::class);`
`639`	`640`	`$this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');`
`640`	`641`	`$this->getContainer('listener_undefined_provider');`
`641`	`642`	`}`