summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2019-11-29 15:43:53 +0100
committerIgor Scheller <igor.scheller@igorshp.de>2019-11-29 16:56:44 +0100
commitd203071de0798802c0024debd793ce89f180cc16 (patch)
tree25b4593019ed6fd7aa88a12c34bb4578932149eb
parent14f8d208b817d8d7dccebdb5f7a6ada2bcb9d5f4 (diff)
First step to PHP 7.4 compatibility...
-rw-r--r--src/Helpers/Authenticator.php16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/Helpers/Authenticator.php b/src/Helpers/Authenticator.php
index db33339b..28e48500 100644
--- a/src/Helpers/Authenticator.php
+++ b/src/Helpers/Authenticator.php
@@ -25,7 +25,7 @@ class Authenticator
/** @var string[] */
protected $permissions;
- /** @var int */
+ /** @var int|string|null */
protected $passwordAlgorithm = PASSWORD_DEFAULT;
/**
@@ -163,13 +163,11 @@ class Authenticator
*/
public function verifyPassword(User $user, string $password)
{
- $algorithm = $this->passwordAlgorithm;
-
if (!password_verify($password, $user->password)) {
return false;
}
- if (password_needs_rehash($user->password, $algorithm)) {
+ if (password_needs_rehash($user->password, $this->passwordAlgorithm)) {
$this->setPassword($user, $password);
}
@@ -182,14 +180,12 @@ class Authenticator
*/
public function setPassword(User $user, string $password)
{
- $algorithm = $this->passwordAlgorithm;
-
- $user->password = password_hash($password, $algorithm);
+ $user->password = password_hash($password, $this->passwordAlgorithm);
$user->save();
}
/**
- * @return int
+ * @return int|string|null
*/
public function getPasswordAlgorithm()
{
@@ -197,9 +193,9 @@ class Authenticator
}
/**
- * @param int $passwordAlgorithm
+ * @param int|string|null $passwordAlgorithm
*/
- public function setPasswordAlgorithm(int $passwordAlgorithm)
+ public function setPasswordAlgorithm($passwordAlgorithm)
{
$this->passwordAlgorithm = $passwordAlgorithm;
}