fixed CS

fabpot · fabpot · commit d8d20499a954 · 2019-06-13T12:34:15.000+02:00
diff --git a/Authentication/Token/AbstractToken.php b/Authentication/Token/AbstractToken.php
@@ -139,7 +139,7 @@ public function serialize()
     {
         $serialized = [$this->user, $this->authenticated, $this->roles, $this->attributes];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Authentication/Token/AnonymousToken.php b/Authentication/Token/AnonymousToken.php
@@ -61,7 +61,7 @@ public function serialize()
     {
         $serialized = [$this->secret, parent::serialize(true)];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Authentication/Token/PreAuthenticatedToken.php b/Authentication/Token/PreAuthenticatedToken.php
@@ -81,7 +81,7 @@ public function serialize()
     {
         $serialized = [$this->credentials, $this->providerKey, parent::serialize(true)];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Authentication/Token/RememberMeToken.php b/Authentication/Token/RememberMeToken.php
@@ -96,7 +96,7 @@ public function serialize()
     {
         $serialized = [$this->secret, $this->providerKey, parent::serialize(true)];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Authentication/Token/UsernamePasswordToken.php b/Authentication/Token/UsernamePasswordToken.php
@@ -93,7 +93,7 @@ public function serialize()
     {
         $serialized = [$this->credentials, $this->providerKey, parent::serialize(true)];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Encoder/Argon2iPasswordEncoder.php b/Encoder/Argon2iPasswordEncoder.php
@@ -26,7 +26,7 @@ public static function isSupported()
             return true;
         }
 
-        if (\class_exists('ParagonIE_Sodium_Compat') && \method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
+        if (class_exists('ParagonIE_Sodium_Compat') && method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
             return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();
         }
 
@@ -66,8 +66,8 @@ public function isPasswordValid($encoded, $raw, $salt)
             return !$this->isPasswordTooLong($raw) && password_verify($raw, $encoded);
         }
         if (\function_exists('sodium_crypto_pwhash_str_verify')) {
-            $valid = !$this->isPasswordTooLong($raw) && \sodium_crypto_pwhash_str_verify($encoded, $raw);
-            \sodium_memzero($raw);
+            $valid = !$this->isPasswordTooLong($raw) && sodium_crypto_pwhash_str_verify($encoded, $raw);
+            sodium_memzero($raw);
 
             return $valid;
         }
@@ -88,12 +88,12 @@ private function encodePasswordNative($raw)
 
     private function encodePasswordSodiumFunction($raw)
     {
-        $hash = \sodium_crypto_pwhash_str(
+        $hash = sodium_crypto_pwhash_str(
             $raw,
             \SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
             \SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
         );
-        \sodium_memzero($raw);
+        sodium_memzero($raw);
 
         return $hash;
     }
diff --git a/Exception/AccountStatusException.php b/Exception/AccountStatusException.php
@@ -46,7 +46,7 @@ public function serialize()
     {
         $serialized = [$this->user, parent::serialize(true)];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Exception/AuthenticationException.php b/Exception/AuthenticationException.php
@@ -51,7 +51,7 @@ public function serialize()
             $this->line,
         ];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Exception/CustomUserMessageAuthenticationException.php b/Exception/CustomUserMessageAuthenticationException.php
@@ -62,7 +62,7 @@ public function serialize()
     {
         $serialized = [parent::serialize(true), $this->messageKey, $this->messageData];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Exception/UsernameNotFoundException.php b/Exception/UsernameNotFoundException.php
@@ -56,7 +56,7 @@ public function serialize()
     {
         $serialized = [$this->username, parent::serialize(true)];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
diff --git a/Tests/Authentication/Token/AbstractTokenTest.php b/Tests/Authentication/Token/AbstractTokenTest.php
@@ -50,7 +50,7 @@ public function serialize()
     {
         $serialized = [$this->credentials, parent::serialize(true)];
 
-        return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     public function unserialize($serialized)

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function serialize()`
`139`	`139`	`{`
`140`	`140`	`$serialized = [$this->user, $this->authenticated, $this->roles, $this->attributes];`
`141`	`141`
`142`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`142`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function serialize()`
`61`	`61`	`{`
`62`	`62`	`$serialized = [$this->secret, parent::serialize(true)];`
`63`	`63`
`64`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`64`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function serialize()`
`81`	`81`	`{`
`82`	`82`	`$serialized = [$this->credentials, $this->providerKey, parent::serialize(true)];`
`83`	`83`
`84`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`84`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function serialize()`
`96`	`96`	`{`
`97`	`97`	`$serialized = [$this->secret, $this->providerKey, parent::serialize(true)];`
`98`	`98`
`99`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`99`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function serialize()`
`93`	`93`	`{`
`94`	`94`	`$serialized = [$this->credentials, $this->providerKey, parent::serialize(true)];`
`95`	`95`
`96`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`96`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static function isSupported()`
`26`	`26`	`return true;`
`27`	`27`	`}`
`28`	`28`
`29`		`- if (\class_exists('ParagonIE_Sodium_Compat') && \method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {`
	`29`	`+ if (class_exists('ParagonIE_Sodium_Compat') && method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {`
`30`	`30`	`return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();`
`31`	`31`	`}`
`32`	`32`
`@@ -66,8 +66,8 @@ public function isPasswordValid($encoded, $raw, $salt)`
`66`	`66`	`return !$this->isPasswordTooLong($raw) && password_verify($raw, $encoded);`
`67`	`67`	`}`
`68`	`68`	`if (\function_exists('sodium_crypto_pwhash_str_verify')) {`
`69`		`- $valid = !$this->isPasswordTooLong($raw) && \sodium_crypto_pwhash_str_verify($encoded, $raw);`
`70`		`- \sodium_memzero($raw);`
	`69`	`+ $valid = !$this->isPasswordTooLong($raw) && sodium_crypto_pwhash_str_verify($encoded, $raw);`
	`70`	`+ sodium_memzero($raw);`
`71`	`71`
`72`	`72`	`return $valid;`
`73`	`73`	`}`
`@@ -88,12 +88,12 @@ private function encodePasswordNative($raw)`
`88`	`88`
`89`	`89`	`private function encodePasswordSodiumFunction($raw)`
`90`	`90`	`{`
`91`		`- $hash = \sodium_crypto_pwhash_str(`
	`91`	`+ $hash = sodium_crypto_pwhash_str(`
`92`	`92`	`$raw,`
`93`	`93`	`\SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,`
`94`	`94`	`\SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE`
`95`	`95`	`);`
`96`		`- \sodium_memzero($raw);`
	`96`	`+ sodium_memzero($raw);`
`97`	`97`
`98`	`98`	`return $hash;`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function serialize()`
`46`	`46`	`{`
`47`	`47`	`$serialized = [$this->user, parent::serialize(true)];`
`48`	`48`
`49`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`49`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function serialize()`
`51`	`51`	`$this->line,`
`52`	`52`	`];`
`53`	`53`
`54`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`54`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function serialize()`
`62`	`62`	`{`
`63`	`63`	`$serialized = [parent::serialize(true), $this->messageKey, $this->messageData];`
`64`	`64`
`65`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`65`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function serialize()`
`56`	`56`	`{`
`57`	`57`	`$serialized = [$this->username, parent::serialize(true)];`
`58`	`58`
`59`		`- return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);`
	`59`	`+ return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`