Improve code quality.

This commit is contained in:
James Cole
2018-07-09 19:24:08 +02:00
parent 76386dad7d
commit 5665f127aa
55 changed files with 278 additions and 100 deletions

View File

@@ -85,7 +85,7 @@ class ForgotPasswordController extends Controller
$request->only('email')
);
if ($response == Password::RESET_LINK_SENT) {
if ($response === Password::RESET_LINK_SENT) {
return back()->with('status', trans($response));
}

View File

@@ -60,12 +60,9 @@ class LoginController extends Controller
}
/**
* Handle a login request to the application.
*
* @param Request $request
*
* @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
*
* @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response|void
* @throws \Illuminate\Validation\ValidationException
*/
public function login(Request $request)
@@ -78,6 +75,8 @@ class LoginController extends Controller
if ($this->hasTooManyLoginAttempts($request)) {
$this->fireLockoutEvent($request);
/** @noinspection PhpInconsistentReturnPointsInspection */
/** @noinspection PhpVoidFunctionResultUsedInspection */
return $this->sendLockoutResponse($request);
}
@@ -85,6 +84,8 @@ class LoginController extends Controller
// user is logged in. Save in session if the user requested session to be remembered:
$request->session()->put('remember_login', $request->filled('remember'));
/** @noinspection PhpInconsistentReturnPointsInspection */
/** @noinspection PhpVoidFunctionResultUsedInspection */
return $this->sendLoginResponse($request);
}
@@ -93,6 +94,8 @@ class LoginController extends Controller
// user surpasses their maximum number of attempts they will get locked out.
$this->incrementLoginAttempts($request);
/** @noinspection PhpInconsistentReturnPointsInspection */
/** @noinspection PhpVoidFunctionResultUsedInspection */
return $this->sendFailedLoginResponse($request);
}

View File

@@ -77,6 +77,7 @@ class RegisterController extends Controller
return view('error', compact('message'));
}
/** @noinspection PhpUndefinedMethodInspection */
$this->validator($request->all())->validate();
event(new Registered($user = $this->create($request->all())));

View File

@@ -77,6 +77,7 @@ class ResetPasswordController extends Controller
$allowRegistration = false;
}
/** @noinspection PhpUndefinedFieldInspection */
return view('auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration]
);

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\TokenFormRequest;
use FireflyIII\User;
use Illuminate\Cookie\CookieJar;
use Illuminate\Http\Request;
use Log;
@@ -71,6 +72,7 @@ class TwoFactorController extends Controller
*/
public function lostTwoFactor()
{
/** @var User $user */
$user = auth()->user();
$siteOwner = env('SITE_OWNER', '');
$title = (string)trans('firefly.two_factor_forgot_title');