Enable "native_constant_invocation" CS rule

nicolas-grekas · nicolas-grekas · commit 5e95789dd3f8 · 2020-09-02T18:06:40.000+02:00
diff --git a/Command/InitAclCommand.php b/Command/InitAclCommand.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Security\Acl\Dbal\Schema;
 
-@trigger_error(sprintf('Class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\InitAclCommand instead.', InitAclCommand::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('Class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\InitAclCommand instead.', InitAclCommand::class), \E_USER_DEPRECATED);
 
 /**
  * Installs the tables required by the ACL system.
diff --git a/Command/SetAclCommand.php b/Command/SetAclCommand.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Command;
 
-@trigger_error(sprintf('Class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\SetAclCommand instead.', SetAclCommand::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('Class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\Command\SetAclCommand instead.', SetAclCommand::class), \E_USER_DEPRECATED);
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
diff --git a/Command/UserPasswordEncoderCommand.php b/Command/UserPasswordEncoderCommand.php
@@ -42,7 +42,7 @@ class UserPasswordEncoderCommand extends ContainerAwareCommand
     public function __construct(EncoderFactoryInterface $encoderFactory = null, array $userClasses = [])
     {
         if (null === $encoderFactory) {
-            @trigger_error(sprintf('Passing null as the first argument of "%s()" is deprecated since Symfony 3.3 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing null as the first argument of "%s()" is deprecated since Symfony 3.3 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), \E_USER_DEPRECATED);
         }
 
         $this->encoderFactory = $encoderFactory;
@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($input->isInteractive() && !$emptySalt) {
             $emptySalt = true;
 
-            $errorIo->note('The command will take care of generating a salt for you. Be aware that some encoders advise to let them generate their own salt. If you\'re using one of those encoders, please answer \'no\' to the question below. '.PHP_EOL.'Provide the \'empty-salt\' option in order to let the encoder handle the generation itself.');
+            $errorIo->note('The command will take care of generating a salt for you. Be aware that some encoders advise to let them generate their own salt. If you\'re using one of those encoders, please answer \'no\' to the question below. '.\PHP_EOL.'Provide the \'empty-salt\' option in order to let the encoder handle the generation itself.');
 
             if ($errorIo->confirm('Confirm salt generation ?')) {
                 $salt = $this->generateSalt();
diff --git a/DependencyInjection/Compiler/AddSecurityVotersPass.php b/DependencyInjection/Compiler/AddSecurityVotersPass.php
@@ -46,7 +46,7 @@ public function process(ContainerBuilder $container)
             $class = $container->getParameterBag()->resolveValue($definition->getClass());
 
             if (!is_a($class, VoterInterface::class, true)) {
-                @trigger_error(sprintf('Using a "security.voter" tag on a class without implementing the "%s" is deprecated as of 3.4 and will throw an exception in 4.0. Implement the interface instead.', VoterInterface::class), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Using a "security.voter" tag on a class without implementing the "%s" is deprecated as of 3.4 and will throw an exception in 4.0. Implement the interface instead.', VoterInterface::class), \E_USER_DEPRECATED);
             }
 
             if (!method_exists($class, 'vote')) {
diff --git a/DependencyInjection/Security/Factory/HttpDigestFactory.php b/DependencyInjection/Security/Factory/HttpDigestFactory.php
@@ -28,7 +28,7 @@ class HttpDigestFactory implements SecurityFactoryInterface
     public function __construct($triggerDeprecation = true)
     {
         if ($triggerDeprecation) {
-            @trigger_error(sprintf('The "%s" class and the whole HTTP digest authentication system is deprecated since Symfony 3.4 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s" class and the whole HTTP digest authentication system is deprecated since Symfony 3.4 and will be removed in 4.0.', __CLASS__), \E_USER_DEPRECATED);
         }
     }
 
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -383,7 +383,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
             }
 
             if (!$logoutOnUserChange = $firewall['logout_on_user_change']) {
-                @trigger_error(sprintf('Not setting "logout_on_user_change" to true on firewall "%s" is deprecated as of 3.4, it will always be true in 4.0.', $id), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Not setting "logout_on_user_change" to true on firewall "%s" is deprecated as of 3.4, it will always be true in 4.0.', $id), \E_USER_DEPRECATED);
             }
 
             if (isset($this->logoutOnUserChangeByContextKey[$contextKey]) && $this->logoutOnUserChangeByContextKey[$contextKey][1] !== $logoutOnUserChange) {
@@ -733,7 +733,7 @@ private function createSwitchUserListener($container, $id, $config, $defaultProv
 
         // in 4.0, ignore the `switch_user.stateless` key if $stateless is `true`
         if ($stateless && false === $config['stateless']) {
-            @trigger_error(sprintf('Firewall "%s" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall\'s "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.', $id), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Firewall "%s" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall\'s "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.', $id), \E_USER_DEPRECATED);
         }
 
         $switchUserListenerId = 'security.authentication.switchuser_listener.'.$id;
@@ -837,7 +837,7 @@ private function getExpressionLanguage()
      */
     private function getFirstProvider($firewallName, $listenerName, array $providerIds)
     {
-        @trigger_error(sprintf('Listener "%s" on firewall "%s" has no "provider" set but multiple providers exist. Using the first configured provider (%s) is deprecated since Symfony 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.', $listenerName, $firewallName, $first = array_keys($providerIds)[0]), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Listener "%s" on firewall "%s" has no "provider" set but multiple providers exist. Using the first configured provider (%s) is deprecated since Symfony 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.', $listenerName, $firewallName, $first = array_keys($providerIds)[0]), \E_USER_DEPRECATED);
 
         return $providerIds[$first];
     }
diff --git a/EventListener/AclSchemaListener.php b/EventListener/AclSchemaListener.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\EventListener;
 
-@trigger_error(sprintf('Class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\EventListener\AclSchemaListener instead.', AclSchemaListener::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('Class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use Symfony\Bundle\AclBundle\EventListener\AclSchemaListener instead.', AclSchemaListener::class), \E_USER_DEPRECATED);
 
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use Symfony\Component\Security\Acl\Dbal\Schema;
diff --git a/Security/FirewallContext.php b/Security/FirewallContext.php
@@ -55,7 +55,7 @@ public function getConfig()
      */
     public function getContext()
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use %s::getListeners/getExceptionListener() instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use %s::getListeners/getExceptionListener() instead.', __METHOD__, __CLASS__), \E_USER_DEPRECATED);
 
         return [$this->getListeners(), $this->getExceptionListener(), $this->getLogoutListener()];
     }
diff --git a/Security/FirewallMap.php b/Security/FirewallMap.php
@@ -47,7 +47,7 @@ public function __construct(ContainerInterface $container, $map)
     public function __get($name)
     {
         if ('map' === $name || 'container' === $name) {
-            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);
 
             if ('map' === $name && $this->map instanceof \Traversable) {
                 $this->map = iterator_to_array($this->map);
@@ -63,7 +63,7 @@ public function __get($name)
     public function __set($name, $value)
     {
         if ('map' === $name || 'container' === $name) {
-            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);
 
             $set = \Closure::bind(function ($name, $value) { $this->$name = $value; }, $this, parent::class);
             $set($name, $value);
@@ -78,7 +78,7 @@ public function __set($name, $value)
     public function __isset($name)
     {
         if ('map' === $name || 'container' === $name) {
-            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);
         }
 
         return isset($this->$name);
@@ -90,7 +90,7 @@ public function __isset($name)
     public function __unset($name)
     {
         if ('map' === $name || 'container' === $name) {
-            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);
 
             $unset = \Closure::bind(function ($name) { unset($this->$name); }, $this, parent::class);
             $unset($name);
diff --git a/Tests/Functional/UserPasswordEncoderCommandTest.php b/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -38,7 +38,7 @@ public function testEncodePasswordEmptySalt()
             'user-class' => 'Symfony\Component\Security\Core\User\User',
             '--empty-salt' => true,
         ], ['decorated' => false]);
-        $expected = str_replace("\n", PHP_EOL, file_get_contents(__DIR__.'/app/PasswordEncode/emptysalt.txt'));
+        $expected = str_replace("\n", \PHP_EOL, file_get_contents(__DIR__.'/app/PasswordEncode/emptysalt.txt'));
 
         $this->assertEquals($expected, $this->passwordEncoderCommandTester->getDisplay());
     }
@@ -245,7 +245,7 @@ public function testLegacy()
 
     protected function setUp()
     {
-        putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode']);
         $kernel->boot();
 
@@ -263,7 +263,7 @@ protected function tearDown()
 
     private function setupArgon2i()
     {
-        putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2i.yml']);
         $kernel->boot();
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class UserPasswordEncoderCommand extends ContainerAwareCommand`
`42`	`42`	`public function __construct(EncoderFactoryInterface $encoderFactory = null, array $userClasses = [])`
`43`	`43`	`{`
`44`	`44`	`if (null === $encoderFactory) {`
`45`		`- @trigger_error(sprintf('Passing null as the first argument of "%s()" is deprecated since Symfony 3.3 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`45`	`+ @trigger_error(sprintf('Passing null as the first argument of "%s()" is deprecated since Symfony 3.3 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), \E_USER_DEPRECATED);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$this->encoderFactory = $encoderFactory;`
`@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`140`	`140`	`if ($input->isInteractive() && !$emptySalt) {`
`141`	`141`	`$emptySalt = true;`
`142`	`142`
`143`		`- $errorIo->note('The command will take care of generating a salt for you. Be aware that some encoders advise to let them generate their own salt. If you\'re using one of those encoders, please answer \'no\' to the question below. '.PHP_EOL.'Provide the \'empty-salt\' option in order to let the encoder handle the generation itself.');`
	`143`	`+ $errorIo->note('The command will take care of generating a salt for you. Be aware that some encoders advise to let them generate their own salt. If you\'re using one of those encoders, please answer \'no\' to the question below. '.\PHP_EOL.'Provide the \'empty-salt\' option in order to let the encoder handle the generation itself.');`
`144`	`144`
`145`	`145`	`if ($errorIo->confirm('Confirm salt generation ?')) {`
`146`	`146`	`$salt = $this->generateSalt();`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function process(ContainerBuilder $container)`
`46`	`46`	`$class = $container->getParameterBag()->resolveValue($definition->getClass());`
`47`	`47`
`48`	`48`	`if (!is_a($class, VoterInterface::class, true)) {`
`49`		`- @trigger_error(sprintf('Using a "security.voter" tag on a class without implementing the "%s" is deprecated as of 3.4 and will throw an exception in 4.0. Implement the interface instead.', VoterInterface::class), E_USER_DEPRECATED);`
	`49`	`+ @trigger_error(sprintf('Using a "security.voter" tag on a class without implementing the "%s" is deprecated as of 3.4 and will throw an exception in 4.0. Implement the interface instead.', VoterInterface::class), \E_USER_DEPRECATED);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (!method_exists($class, 'vote')) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class HttpDigestFactory implements SecurityFactoryInterface`
`28`	`28`	`public function __construct($triggerDeprecation = true)`
`29`	`29`	`{`
`30`	`30`	`if ($triggerDeprecation) {`
`31`		`- @trigger_error(sprintf('The "%s" class and the whole HTTP digest authentication system is deprecated since Symfony 3.4 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);`
	`31`	`+ @trigger_error(sprintf('The "%s" class and the whole HTTP digest authentication system is deprecated since Symfony 3.4 and will be removed in 4.0.', __CLASS__), \E_USER_DEPRECATED);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`if (!$logoutOnUserChange = $firewall['logout_on_user_change']) {`
`386`		`- @trigger_error(sprintf('Not setting "logout_on_user_change" to true on firewall "%s" is deprecated as of 3.4, it will always be true in 4.0.', $id), E_USER_DEPRECATED);`
	`386`	`+ @trigger_error(sprintf('Not setting "logout_on_user_change" to true on firewall "%s" is deprecated as of 3.4, it will always be true in 4.0.', $id), \E_USER_DEPRECATED);`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`if (isset($this->logoutOnUserChangeByContextKey[$contextKey]) && $this->logoutOnUserChangeByContextKey[$contextKey][1] !== $logoutOnUserChange) {`
`@@ -733,7 +733,7 @@ private function createSwitchUserListener($container, $id, $config, $defaultProv`
`733`	`733`
`734`	`734`	// in 4.0, ignore the `switch_user.stateless` key if $stateless is `true`
`735`	`735`	`if ($stateless && false === $config['stateless']) {`
`736`		`- @trigger_error(sprintf('Firewall "%s" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall\'s "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.', $id), E_USER_DEPRECATED);`
	`736`	`+ @trigger_error(sprintf('Firewall "%s" is configured as "stateless" but the "switch_user.stateless" key is set to false. Both should have the same value, the firewall\'s "stateless" value will be used as default value for the "switch_user.stateless" key in 4.0.', $id), \E_USER_DEPRECATED);`
`737`	`737`	`}`
`738`	`738`
`739`	`739`	`$switchUserListenerId = 'security.authentication.switchuser_listener.'.$id;`
`@@ -837,7 +837,7 @@ private function getExpressionLanguage()`
`837`	`837`	`*/`
`838`	`838`	`private function getFirstProvider($firewallName, $listenerName, array $providerIds)`
`839`	`839`	`{`
`840`		`- @trigger_error(sprintf('Listener "%s" on firewall "%s" has no "provider" set but multiple providers exist. Using the first configured provider (%s) is deprecated since Symfony 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.', $listenerName, $firewallName, $first = array_keys($providerIds)[0]), E_USER_DEPRECATED);`
	`840`	`+ @trigger_error(sprintf('Listener "%s" on firewall "%s" has no "provider" set but multiple providers exist. Using the first configured provider (%s) is deprecated since Symfony 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.', $listenerName, $firewallName, $first = array_keys($providerIds)[0]), \E_USER_DEPRECATED);`
`841`	`841`
`842`	`842`	`return $providerIds[$first];`
`843`	`843`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function getConfig()`
`55`	`55`	`*/`
`56`	`56`	`public function getContext()`
`57`	`57`	`{`
`58`		`- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use %s::getListeners/getExceptionListener() instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);`
	`58`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use %s::getListeners/getExceptionListener() instead.', __METHOD__, __CLASS__), \E_USER_DEPRECATED);`
`59`	`59`
`60`	`60`	`return [$this->getListeners(), $this->getExceptionListener(), $this->getLogoutListener()];`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(ContainerInterface $container, $map)`
`47`	`47`	`public function __get($name)`
`48`	`48`	`{`
`49`	`49`	`if ('map' === $name \|\| 'container' === $name) {`
`50`		`- @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);`
	`50`	`+ @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);`
`51`	`51`
`52`	`52`	`if ('map' === $name && $this->map instanceof \Traversable) {`
`53`	`53`	`$this->map = iterator_to_array($this->map);`
`@@ -63,7 +63,7 @@ public function __get($name)`
`63`	`63`	`public function __set($name, $value)`
`64`	`64`	`{`
`65`	`65`	`if ('map' === $name \|\| 'container' === $name) {`
`66`		`- @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);`
	`66`	`+ @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);`
`67`	`67`
`68`	`68`	`$set = \Closure::bind(function ($name, $value) { $this->$name = $value; }, $this, parent::class);`
`69`	`69`	`$set($name, $value);`
`@@ -78,7 +78,7 @@ public function __set($name, $value)`
`78`	`78`	`public function __isset($name)`
`79`	`79`	`{`
`80`	`80`	`if ('map' === $name \|\| 'container' === $name) {`
`81`		`- @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);`
	`81`	`+ @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`return isset($this->$name);`
`@@ -90,7 +90,7 @@ public function __isset($name)`
`90`	`90`	`public function __unset($name)`
`91`	`91`	`{`
`92`	`92`	`if ('map' === $name \|\| 'container' === $name) {`
`93`		`- @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);`
	`93`	`+ @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), \E_USER_DEPRECATED);`
`94`	`94`
`95`	`95`	`$unset = \Closure::bind(function ($name) { unset($this->$name); }, $this, parent::class);`
`96`	`96`	`$unset($name);`