Various code cleanup.

This commit is contained in:
James Cole
2021-09-18 10:20:19 +02:00
parent 481a6bdd5f
commit 3589c9f60f
137 changed files with 369 additions and 282 deletions

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth;
use Adldap;
use Cookie;
use DB;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Providers\RouteServiceProvider;
use Illuminate\Contracts\View\Factory;
@@ -33,6 +34,7 @@ use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Validation\ValidationException;
use Illuminate\View\View;
use Log;
@@ -83,7 +85,7 @@ class LoginController extends Controller
public function login(Request $request)
{
Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get('email')));
Log::info(sprintf('User is trying to login.'));
Log::info('User is trying to login.');
$guard = config('auth.defaults.guard');
@@ -134,7 +136,7 @@ class LoginController extends Controller
*
* @param Request $request
*
* @return \Illuminate\Http\Response
* @return Response
*/
public function logout(Request $request)
{
@@ -162,7 +164,7 @@ class LoginController extends Controller
}
return $request->wantsJson()
? new \Illuminate\Http\Response('', 204)
? new Response('', 204)
: redirect('/');
}
@@ -192,8 +194,8 @@ class LoginController extends Controller
*
* @param Request $request
*
* @return Factory|\Illuminate\Http\Response|View
* @throws \FireflyIII\Exceptions\FireflyException
* @return Factory|Response|View
* @throws FireflyException
*/
public function showLoginForm(Request $request)
{

View File

@@ -32,6 +32,7 @@ use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Validation\ValidationException;
use Illuminate\View\View;
use Log;
@@ -79,7 +80,7 @@ class RegisterController extends Controller
*
* @return Factory|RedirectResponse|Redirector|View
* @throws FireflyException
* @throws \Illuminate\Validation\ValidationException
* @throws ValidationException
*/
public function register(Request $request)
{

View File

@@ -24,6 +24,8 @@ namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
@@ -38,7 +40,7 @@ class TwoFactorController extends Controller
/**
* What to do if 2FA lost?
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
* @return Factory|View
*/
public function lostTwoFactor()
{