kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Various code fixes

Browse Source
This commit is contained in:
James Cole
2022-12-31 13:32:42 +01:00
parent 5878b2c427
commit 7722ca2bf0
34 changed files with 106 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Middleware/Authenticate.php
View File

@@ -93,14 +93,14 @@ class Authenticate
if ($this->auth->check()) {
// do an extra check on user object.
/** @var User $user */
$user = $this->auth->authenticate();
$user = $this->auth->authenticate(); // @phpstan-ignore-line (thinks function returns void)
if (1 === (int)$user->blocked) {
$message = (string)trans('firefly.block_account_logout');
if ('email_changed' === $user->blocked_code) {
$message = (string)trans('firefly.email_changed_logout');
}
app('session')->flash('logoutMessage', $message);
$this->auth->logout();
$this->auth->logout(); // @phpstan-ignore-line (thinks function is undefined)
throw new AuthenticationException('Blocked account.', $guards);
}
@@ -116,7 +116,7 @@ class Authenticate
);
}
return $this->auth->authenticate();
return $this->auth->authenticate(); // @phpstan-ignore-line (thinks function returns void)
}