Merge branch '5.1' into 5.2

fabpot · fabpot · commit 370f09482211 · 2021-01-11T10:51:46.000+01:00
* 5.1:
  Use ::class keyword when possible
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -138,7 +138,7 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('security_debug.php');
         }
 
-        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');
         }
@@ -849,7 +849,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
@@ -597,7 +597,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');
     }
@@ -615,14 +615,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
@@ -42,7 +42,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);
@@ -133,7 +133,7 @@ public function testExistingDefaultEntryPointUsed()
 
     public function testCannotOverrideDefaultEntryPoint()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         // any existing default entry point is used
         $config = [
             'authenticators' => ['authenticator123'],
@@ -144,7 +144,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
@@ -44,7 +44,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();
 
@@ -68,7 +68,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();
 
@@ -89,7 +89,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();
 
@@ -208,7 +208,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
`@@ -138,7 +138,7 @@ public function load(array $configs, ContainerBuilder $container)`
`138`	`138`	`$loader->load('security_debug.php');`
`139`	`139`	`}`
`140`	`140`
`141`		`- if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {`
	`141`	`+ if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {`
`142`	`142`	`$container->removeDefinition('security.expression_language');`
`143`	`143`	`$container->removeDefinition('security.access.expression_voter');`
`144`	`144`	`}`
`@@ -849,7 +849,7 @@ private function createExpression(ContainerBuilder $container, string $expressio`
`849`	`849`	`return $this->expressions[$id];`
`850`	`850`	`}`
`851`	`851`
`852`		`- if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {`
	`852`	`+ if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {`
`853`	`853`	`throw new \RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');`
`854`	`854`	`}`
`855`	`855`
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
`@@ -597,7 +597,7 @@ public function testCustomAccessDecisionManagerService()`
`597`	`597`
`598`	`598`	`public function testAccessDecisionManagerServiceAndStrategyCannotBeUsedAtTheSameTime()`
`599`	`599`	`{`
`600`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`600`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`601`	`601`	`$this->expectExceptionMessage('Invalid configuration for path "security.access_decision_manager": "strategy" and "service" cannot be used together.');`
`602`	`602`	`$this->getContainer('access_decision_manager_service_and_strategy');`
`603`	`603`	`}`
`@@ -615,14 +615,14 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate`
`615`	`615`
`616`	`616`	`public function testFirewallUndefinedUserProvider()`
`617`	`617`	`{`
`618`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`618`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`619`	`619`	`$this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');`
`620`	`620`	`$this->getContainer('firewall_undefined_provider');`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`public function testFirewallListenerUndefinedProvider()`
`624`	`624`	`{`
`625`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`625`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`626`	`626`	`$this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');`
`627`	`627`	`$this->getContainer('listener_undefined_provider');`
`628`	`628`	`}`
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
`@@ -44,7 +44,7 @@ class SecurityExtensionTest extends TestCase`
`44`	`44`	`{`
`45`	`45`	`public function testInvalidCheckPath()`
`46`	`46`	`{`
`47`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`47`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`48`	`48`	`$this->expectExceptionMessage('The check_path "/some_area/login_check" for login method "form_login" is not matched by the firewall pattern "/secured_area/.*".');`
`49`	`49`	`$container = $this->getRawContainer();`
`50`	`50`
`@@ -68,7 +68,7 @@ public function testInvalidCheckPath()`
`68`	`68`
`69`	`69`	`public function testFirewallWithoutAuthenticationListener()`
`70`	`70`	`{`
`71`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`71`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`72`	`72`	`$this->expectExceptionMessage('No authentication listener registered for firewall "some_firewall"');`
`73`	`73`	`$container = $this->getRawContainer();`
`74`	`74`
`@@ -89,7 +89,7 @@ public function testFirewallWithoutAuthenticationListener()`
`89`	`89`
`90`	`90`	`public function testFirewallWithInvalidUserProvider()`
`91`	`91`	`{`
`92`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`92`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`93`	`93`	`$this->expectExceptionMessage('Unable to create definition for "security.user.provider.concrete.my_foo" user provider');`
`94`	`94`	`$container = $this->getRawContainer();`
`95`	`95`
`@@ -208,7 +208,7 @@ public function testPerListenerProvider()`
`208`	`208`
`209`	`209`	`public function testMissingProviderForListener()`
`210`	`210`	`{`
`211`		`- $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');`
	`211`	`+ $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);`
`212`	`212`	`$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.');`
`213`	`213`	`$container = $this->getRawContainer();`
`214`	`214`	`$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(), []));`