Skip to content

Commit a863f16

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix CS
2 parents f8c6850 + e33b709 commit a863f16

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Authentication/Token/AbstractToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public function setAttribute($name, $value)
288288
*/
289289
public function __toString()
290290
{
291-
$class = \get_class($this);
291+
$class = static::class;
292292
$class = substr($class, strrpos($class, '\\') + 1);
293293

294294
$roles = [];

Encoder/Argon2iPasswordEncoder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function isSupported()
5151
return true;
5252
}
5353

54-
return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');
54+
return version_compare(\extension_loaded('sodium') ? SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');
5555
}
5656

5757
/**
@@ -104,15 +104,15 @@ public function isPasswordValid($encoded, $raw, $salt)
104104

105105
private function encodePasswordNative(string $raw): string
106106
{
107-
return password_hash($raw, \PASSWORD_ARGON2I, $this->config);
107+
return password_hash($raw, PASSWORD_ARGON2I, $this->config);
108108
}
109109

110110
private function encodePasswordSodiumFunction(string $raw): string
111111
{
112112
$hash = sodium_crypto_pwhash_str(
113113
$raw,
114-
\SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
115-
\SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
114+
SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
115+
SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
116116
);
117117
sodium_memzero($raw);
118118

0 commit comments

Comments
 (0)