Skip to content

Commit 4566703

Browse files
committed
Merge branch '4.2' into 4.3
* 4.2: fixed CS fixed CS [HttpKernel] Remove TestEventDispatcher.
2 parents 7c1fc94 + 310f580 commit 4566703

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Encoder/Argon2iPasswordEncoder.php

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

54-
if (\class_exists('ParagonIE_Sodium_Compat') && \method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
54+
if (class_exists('ParagonIE_Sodium_Compat') && method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
5555
return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();
5656
}
5757

@@ -91,8 +91,8 @@ public function isPasswordValid($encoded, $raw, $salt)
9191
return !$this->isPasswordTooLong($raw) && password_verify($raw, $encoded);
9292
}
9393
if (\function_exists('sodium_crypto_pwhash_str_verify')) {
94-
$valid = !$this->isPasswordTooLong($raw) && \sodium_crypto_pwhash_str_verify($encoded, $raw);
95-
\sodium_memzero($raw);
94+
$valid = !$this->isPasswordTooLong($raw) && sodium_crypto_pwhash_str_verify($encoded, $raw);
95+
sodium_memzero($raw);
9696

9797
return $valid;
9898
}
@@ -113,12 +113,12 @@ private function encodePasswordNative($raw)
113113

114114
private function encodePasswordSodiumFunction($raw)
115115
{
116-
$hash = \sodium_crypto_pwhash_str(
116+
$hash = sodium_crypto_pwhash_str(
117117
$raw,
118118
\SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
119119
\SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
120120
);
121-
\sodium_memzero($raw);
121+
sodium_memzero($raw);
122122

123123
return $hash;
124124
}

0 commit comments

Comments
 (0)