Fixed CS

wouterj · wouterj · commit 8cced53e5cd1 · 2021-08-08T17:36:54.000+02:00
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -100,7 +100,7 @@ public function setUser($user)
         }
 
         if (!$user instanceof UserInterface) {
-            trigger_deprecation('symfony/security-core', '5.4', 'Using an object that is not an instance of "%s" as $user in "%s" is deprecated.', UserInterface::class, \get_class($this));
+            trigger_deprecation('symfony/security-core', '5.4', 'Using an object that is not an instance of "%s" as $user in "%s" is deprecated.', UserInterface::class, static::class);
         }
 
         // @deprecated since Symfony 5.4, remove the whole block if/elseif/else block in 6.0
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
@@ -35,7 +35,7 @@ public function __construct($user, /*string*/ $firewallName, /*array*/ $roles =
 
             $credentials = $firewallName;
             $firewallName = $roles;
-            $roles = \func_num_args() > 3 ? \func_get_arg(3) : [];
+            $roles = \func_num_args() > 3 ? func_get_arg(3) : [];
         }
 
         parent::__construct($roles);
@@ -44,7 +44,6 @@ public function __construct($user, /*string*/ $firewallName, /*array*/ $roles =
             throw new \InvalidArgumentException('$firewallName must not be empty.');
         }
 
-
         $this->setUser($user);
         $this->credentials = $credentials ?? null;
         $this->firewallName = $firewallName;
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/SwitchUserToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/SwitchUserToken.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Security\Core\User\UserInterface;
 
-
 /**
  * Token representing a user who temporarily impersonates another one.
  *
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
@@ -32,7 +32,7 @@ class UsernamePasswordToken extends AbstractToken
     public function __construct($user, /*string*/ $firewallName, /*array*/ $roles = [])
     {
         if (\is_string($roles)) {
-            trigger_deprecation('symfony/security-core', '5.4', 'The $credentials argument of "%s" is deprecated.', \get_class($this).'::__construct');
+            trigger_deprecation('symfony/security-core', '5.4', 'The $credentials argument of "%s" is deprecated.', static::class.'::__construct');
 
             $credentials = $firewallName;
             $firewallName = $roles;
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.php
@@ -56,7 +56,7 @@ public function testEraseCredentials()
     {
         $token = new PreAuthenticatedToken('foo', 'bar', 'key');
         $token->eraseCredentials();
-        $this->assertEquals(null, $token->getCredentials());
+        $this->assertNull($token->getCredentials());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function setUser($user)`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (!$user instanceof UserInterface) {`
`103`		`- trigger_deprecation('symfony/security-core', '5.4', 'Using an object that is not an instance of "%s" as $user in "%s" is deprecated.', UserInterface::class, \get_class($this));`
	`103`	`+ trigger_deprecation('symfony/security-core', '5.4', 'Using an object that is not an instance of "%s" as $user in "%s" is deprecated.', UserInterface::class, static::class);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// @deprecated since Symfony 5.4, remove the whole block if/elseif/else block in 6.0`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct($user, /string/ $firewallName, /array/ $roles =`
`35`	`35`
`36`	`36`	`$credentials = $firewallName;`
`37`	`37`	`$firewallName = $roles;`
`38`		`- $roles = \func_num_args() > 3 ? \func_get_arg(3) : [];`
	`38`	`+ $roles = \func_num_args() > 3 ? func_get_arg(3) : [];`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`parent::__construct($roles);`
`@@ -44,7 +44,6 @@ public function __construct($user, /string/ $firewallName, /array/ $roles =`
`44`	`44`	`throw new \InvalidArgumentException('$firewallName must not be empty.');`
`45`	`45`	`}`
`46`	`46`
`47`		`-`
`48`	`47`	`$this->setUser($user);`
`49`	`48`	`$this->credentials = $credentials ?? null;`
`50`	`49`	`$this->firewallName = $firewallName;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Security\Core\User\UserInterface;`
`15`	`15`
`16`		`-`
`17`	`16`	`/**`
`18`	`17`	`* Token representing a user who temporarily impersonates another one.`
`19`	`18`	`*`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class UsernamePasswordToken extends AbstractToken`
`32`	`32`	`public function __construct($user, /string/ $firewallName, /array/ $roles = [])`
`33`	`33`	`{`
`34`	`34`	`if (\is_string($roles)) {`
`35`		`- trigger_deprecation('symfony/security-core', '5.4', 'The $credentials argument of "%s" is deprecated.', \get_class($this).'::__construct');`
	`35`	`+ trigger_deprecation('symfony/security-core', '5.4', 'The $credentials argument of "%s" is deprecated.', static::class.'::__construct');`
`36`	`36`
`37`	`37`	`$credentials = $firewallName;`
`38`	`38`	`$firewallName = $roles;`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function testEraseCredentials()`
`56`	`56`	`{`
`57`	`57`	`$token = new PreAuthenticatedToken('foo', 'bar', 'key');`
`58`	`58`	`$token->eraseCredentials();`
`59`		`- $this->assertEquals(null, $token->getCredentials());`
	`59`	`+ $this->assertNull($token->getCredentials());`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`