kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-04-07 07:28:43 +02:00
parent 4ddcb0c965
commit f12744ad8c
180 changed files with 714 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -72,14 +72,14 @@ class ForgotPasswordController extends Controller
{
Log::info('Start of sendResetLinkEmail()');
$loginProvider = config('firefly.login_provider');
// @codeCoverageIgnoreStart
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
Log::error($message);
return prefixView('error', compact('message'));
}
// @codeCoverageIgnoreEnd
$this->validateEmail($request);
@@ -102,7 +102,7 @@ class ForgotPasswordController extends Controller
return back()->with('status', trans($response));
}
return back()->withErrors(['email' => trans($response)]); // @codeCoverageIgnore
return back()->withErrors(['email' => trans($response)]);
}
/**

6
app/Http/Controllers/Auth/LoginController.php
View File

@@ -83,7 +83,7 @@ class LoginController extends Controller
Log::info(sprintf('User is trying to login.'));
if ('ldap' === config('auth.providers.users.driver')) {
/** @var Adldap\Connections\Provider $provider */
Adldap::getProvider('default');
Adldap::getProvider('default'); // @phpstan-ignore-line
}
$this->validateLogin($request);
@@ -96,7 +96,7 @@ class LoginController extends Controller
Log::channel('audit')->info(sprintf('Login for user "%s" was locked out.', $request->get('email')));
$this->fireLockoutEvent($request);
return $this->sendLockoutResponse($request);
$this->sendLockoutResponse($request);
}
/** Copied directly from AuthenticatesUsers, but with logging added: */
@@ -190,7 +190,7 @@ class LoginController extends Controller
$loginProvider = config('firefly.login_provider');
$title = (string)trans('firefly.login_page_title');
if (0 === $count && 'eloquent' === $loginProvider) {
return redirect(route('register')); // @codeCoverageIgnore
return redirect(route('register'));
}
// is allowed to?