Use ::class keyword when possible

fabpot · fabpot · commit 84b40f29fa86 · 2021-01-11T09:57:50.000+01:00
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -115,7 +115,7 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('security_debug.xml');
         }
 
-        if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
+        if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {
             $container->removeDefinition('security.expression_language');
             $container->removeDefinition('security.access.expression_voter');
         }
@@ -707,7 +707,7 @@ private function createExpression(ContainerBuilder $container, string $expressio
             return $this->expressions[$id];
         }
 
-        if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
+        if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {
             throw new \RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
         }
 
diff --git a/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php b/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php
@@ -24,7 +24,7 @@ class AddSecurityVotersPassTest extends TestCase
 {
     public function testNoVoters()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No security voters found. You need to tag at least one with "security.voter".');
         $container = new ContainerBuilder();
         $container
diff --git a/Tests/DependencyInjection/CompleteConfigurationTest.php b/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -610,7 +610,7 @@ public function testCustomAccessDecisionManagerService()
 
     public function testAccessDecisionManagerServiceAndStrategyCannotBeUsedAtTheSameTime()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\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 +628,14 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate
 
     public function testFirewallUndefinedUserProvider()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\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');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\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
@@ -34,7 +34,7 @@ class MainConfigurationTest extends TestCase
 
     public function testNoConfigForProvider()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
         $config = [
             'providers' => [
                 'stub' => [],
@@ -48,7 +48,7 @@ public function testNoConfigForProvider()
 
     public function testManyConfigForProvider()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
         $config = [
             'providers' => [
                 'stub' => [
diff --git a/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
@@ -127,7 +127,7 @@ public function getSuccessHandlers()
 
     protected function callFactory($id, $config, $userProviderId, $defaultEntryPointId)
     {
-        $factory = $this->getMockForAbstractClass('Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory', []);
+        $factory = $this->getMockForAbstractClass(\Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory::class, []);
 
         $factory
             ->expects($this->once())
diff --git a/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php b/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php
@@ -41,7 +41,7 @@ public function testAddValidConfiguration(array $inputConfig, array $expectedCon
      */
     public function testAddInvalidConfiguration(array $inputConfig)
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
         $factory = new GuardAuthenticationFactory();
         $nodeDefinition = new ArrayNodeDefinition('guard');
         $factory->addConfiguration($nodeDefinition);
@@ -132,7 +132,7 @@ public function testExistingDefaultEntryPointUsed()
 
     public function testCannotOverrideDefaultEntryPoint()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         // any existing default entry point is used
         $config = [
             'authenticators' => ['authenticator123'],
@@ -143,7 +143,7 @@ public function testCannotOverrideDefaultEntryPoint()
 
     public function testMultipleAuthenticatorsRequiresEntryPoint()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         // any existing default entry point is used
         $config = [
             'authenticators' => ['authenticator123', 'authenticatorABC'],
diff --git a/Tests/DependencyInjection/SecurityExtensionTest.php b/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -26,7 +26,7 @@ class SecurityExtensionTest extends TestCase
 {
     public function testInvalidCheckPath()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\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 +50,7 @@ public function testInvalidCheckPath()
 
     public function testFirewallWithoutAuthenticationListener()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
         $this->expectExceptionMessage('No authentication listener registered for firewall "some_firewall"');
         $container = $this->getRawContainer();
 
@@ -71,7 +71,7 @@ public function testFirewallWithoutAuthenticationListener()
 
     public function testFirewallWithInvalidUserProvider()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
         $this->expectExceptionMessage('Unable to create definition for "security.user.provider.concrete.my_foo" user provider');
         $container = $this->getRawContainer();
 
@@ -190,7 +190,7 @@ public function testPerListenerProvider()
 
     public function testMissingProviderForListener()
     {
-        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectException(\Symfony\Component\Config\Definition\Exception\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
@@ -298,7 +298,7 @@ public function testNonInteractiveEncodePasswordUsesFirstUserClass()
 
     public function testThrowsExceptionOnNoConfiguredEncoders()
     {
-        $this->expectException('RuntimeException');
+        $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(), []));

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function load(array $configs, ContainerBuilder $container)`
`115`	`115`	`$loader->load('security_debug.xml');`
`116`	`116`	`}`
`117`	`117`
`118`		`- if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {`
	`118`	`+ if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {`
`119`	`119`	`$container->removeDefinition('security.expression_language');`
`120`	`120`	`$container->removeDefinition('security.access.expression_voter');`
`121`	`121`	`}`
`@@ -707,7 +707,7 @@ private function createExpression(ContainerBuilder $container, string $expressio`
`707`	`707`	`return $this->expressions[$id];`
`708`	`708`	`}`
`709`	`709`
`710`		`- if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {`
	`710`	`+ if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {`
`711`	`711`	`throw new \RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');`
`712`	`712`	`}`
`713`	`713`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class AddSecurityVotersPassTest extends TestCase`
`24`	`24`	`{`
`25`	`25`	`public function testNoVoters()`
`26`	`26`	`{`
`27`		`- $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');`
	`27`	`+ $this->expectException(LogicException::class);`
`28`	`28`	`$this->expectExceptionMessage('No security voters found. You need to tag at least one with "security.voter".');`
`29`	`29`	`$container = new ContainerBuilder();`
`30`	`30`	`$container`
Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ public function testCustomAccessDecisionManagerService()`
`610`	`610`
`611`	`611`	`public function testAccessDecisionManagerServiceAndStrategyCannotBeUsedAtTheSameTime()`
`612`	`612`	`{`
`613`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`613`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`614`	`614`	`$this->expectExceptionMessage('Invalid configuration for path "security.access_decision_manager": "strategy" and "service" cannot be used together.');`
`615`	`615`	`$this->getContainer('access_decision_manager_service_and_strategy');`
`616`	`616`	`}`
`@@ -628,14 +628,14 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate`
`628`	`628`
`629`	`629`	`public function testFirewallUndefinedUserProvider()`
`630`	`630`	`{`
`631`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`631`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`632`	`632`	`$this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');`
`633`	`633`	`$this->getContainer('firewall_undefined_provider');`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`public function testFirewallListenerUndefinedProvider()`
`637`	`637`	`{`
`638`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`638`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`639`	`639`	`$this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');`
`640`	`640`	`$this->getContainer('listener_undefined_provider');`
`641`	`641`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function getSuccessHandlers()`
`127`	`127`
`128`	`128`	`protected function callFactory($id, $config, $userProviderId, $defaultEntryPointId)`
`129`	`129`	`{`
`130`		`- $factory = $this->getMockForAbstractClass('Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory', []);`
	`130`	`+ $factory = $this->getMockForAbstractClass(\Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory::class, []);`
`131`	`131`
`132`	`132`	`$factory`
`133`	`133`	`->expects($this->once())`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class SecurityExtensionTest extends TestCase`
`26`	`26`	`{`
`27`	`27`	`public function testInvalidCheckPath()`
`28`	`28`	`{`
`29`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`29`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`30`	`30`	`$this->expectExceptionMessage('The check_path "/some_area/login_check" for login method "form_login" is not matched by the firewall pattern "/secured_area/.*".');`
`31`	`31`	`$container = $this->getRawContainer();`
`32`	`32`
`@@ -50,7 +50,7 @@ public function testInvalidCheckPath()`
`50`	`50`
`51`	`51`	`public function testFirewallWithoutAuthenticationListener()`
`52`	`52`	`{`
`53`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`53`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`54`	`54`	`$this->expectExceptionMessage('No authentication listener registered for firewall "some_firewall"');`
`55`	`55`	`$container = $this->getRawContainer();`
`56`	`56`
`@@ -71,7 +71,7 @@ public function testFirewallWithoutAuthenticationListener()`
`71`	`71`
`72`	`72`	`public function testFirewallWithInvalidUserProvider()`
`73`	`73`	`{`
`74`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`74`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`75`	`75`	`$this->expectExceptionMessage('Unable to create definition for "security.user.provider.concrete.my_foo" user provider');`
`76`	`76`	`$container = $this->getRawContainer();`
`77`	`77`
`@@ -190,7 +190,7 @@ public function testPerListenerProvider()`
`190`	`190`
`191`	`191`	`public function testMissingProviderForListener()`
`192`	`192`	`{`
`193`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`193`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`194`	`194`	`$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.');`
`195`	`195`	`$container = $this->getRawContainer();`
`196`	`196`	`$container->loadFromExtension('security', [`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ public function testNonInteractiveEncodePasswordUsesFirstUserClass()`
`298`	`298`
`299`	`299`	`public function testThrowsExceptionOnNoConfiguredEncoders()`
`300`	`300`	`{`
`301`		`- $this->expectException('RuntimeException');`
	`301`	`+ $this->expectException(\RuntimeException::class);`
`302`	`302`	`$this->expectExceptionMessage('There are no configured encoders for the "security" extension.');`
`303`	`303`	`$application = new ConsoleApplication();`
`304`	`304`	`$application->add(new UserPasswordEncoderCommand($this->getMockBuilder(EncoderFactoryInterface::class)->getMock(), []));`