iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

First step to PHP 7.4 compatibility...

This commit is contained in:
Igor Scheller 2019-11-29 15:43:53 +01:00
parent 14f8d208b8
commit d203071de0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Helpers/Authenticator.php
View File

@ -25,7 +25,7 @@ class Authenticator
/** @var string[] */ /** @var string[] */
protected $permissions; protected $permissions;
/** @var int */ /** @var int|string|null */
protected $passwordAlgorithm = PASSWORD_DEFAULT; protected $passwordAlgorithm = PASSWORD_DEFAULT;
/** /**
@ -163,13 +163,11 @@ class Authenticator
*/ */
public function verifyPassword(User $user, string $password) public function verifyPassword(User $user, string $password)
{ {
$algorithm = $this->passwordAlgorithm;
if (!password_verify($password, $user->password)) { if (!password_verify($password, $user->password)) {
return false; return false;
} }
if (password_needs_rehash($user->password, $algorithm)) { if (password_needs_rehash($user->password, $this->passwordAlgorithm)) {
$this->setPassword($user, $password); $this->setPassword($user, $password);
} }
@ -182,14 +180,12 @@ class Authenticator
*/ */
public function setPassword(User $user, string $password) public function setPassword(User $user, string $password)
{ {
$algorithm = $this->passwordAlgorithm; $user->password = password_hash($password, $this->passwordAlgorithm);
$user->password = password_hash($password, $algorithm);
$user->save(); $user->save();
} }
/** /**
* @return int * @return int|string|null
*/ */
public function getPasswordAlgorithm() 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; $this->passwordAlgorithm = $passwordAlgorithm;
} }