Code cleanup.

This commit is contained in:
James Cole
2017-11-22 21:12:27 +01:00
parent 4e6b782204
commit 781ca052d8
142 changed files with 213 additions and 859 deletions

View File

@@ -70,11 +70,12 @@ class ReconcileController extends Controller
* @param Carbon $end
*
* @return \Illuminate\Http\JsonResponse
*
* @throws FireflyException
*/
public function overview(Request $request, Account $account, Carbon $start, Carbon $end)
{
if ($account->accountType->type !== AccountType::ASSET) {
if (AccountType::ASSET !== $account->accountType->type) {
throw new FireflyException(sprintf('Account %s is not an asset account.', $account->name));
}
$startBalance = $request->get('startBalance');
@@ -102,7 +103,7 @@ class ReconcileController extends Controller
foreach ($cleared as $transaction) {
if ($transaction->transactionJournal->date <= $end) {
$clearedAmount = bcadd($clearedAmount, $transaction->amount);
$countCleared++;
++$countCleared;
}
}
@@ -120,7 +121,7 @@ class ReconcileController extends Controller
'accounts.reconcile.overview',
compact(
'account', 'start', 'diffCompare', 'difference', 'end', 'clearedIds', 'transactionIds', 'clearedAmount', 'startBalance', 'endBalance', 'amount',
'route','countCleared'
'route', 'countCleared'
)
)->render();
@@ -212,7 +213,7 @@ class ReconcileController extends Controller
}
// create reconciliation transaction (if necessary):
if ($request->get('reconcile') === 'create') {
if ('create' === $request->get('reconcile')) {
/** @var AccountRepositoryInterface $accountRepos */
$accountRepos = app(AccountRepositoryInterface::class);
$reconciliation = $accountRepos->getReconciliation($account);
@@ -243,8 +244,6 @@ class ReconcileController extends Controller
Session::flash('success', trans('firefly.reconciliation_stored'));
return redirect(route('accounts.show', [$account->id]));
}
/**

View File

@@ -74,7 +74,7 @@ class LoginController extends Controller
/**
* Handle a login request to the application.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*/
@@ -92,7 +92,6 @@ class LoginController extends Controller
}
if ($this->attemptLogin($request)) {
// user is logged in. Save in session if the user requested session to be remembered:
$request->session()->put('remember_login', $request->filled('remember'));
@@ -110,7 +109,8 @@ class LoginController extends Controller
/**
* Log the user out of the application.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function logout(Request $request, CookieJar $cookieJar)
@@ -166,7 +166,6 @@ class LoginController extends Controller
$email = $request->old('email');
$remember = $request->old('remember');
return view('auth.login', compact('allowRegistration', 'email', 'remember'));//->withCookie($cookie);
return view('auth.login', compact('allowRegistration', 'email', 'remember')); //->withCookie($cookie);
}
}

View File

@@ -74,9 +74,9 @@ class TwoFactorController extends Controller
*/
public function lostTwoFactor()
{
$user = auth()->user();
$user = auth()->user();
$siteOwner = env('SITE_OWNER', '');
$title = strval(trans('firefly.two_factor_forgot_title'));
$title = strval(trans('firefly.two_factor_forgot_title'));
Log::info(
'To reset the two factor authentication for user #' . $user->id .
@@ -99,10 +99,8 @@ class TwoFactorController extends Controller
// wants to remember session?
$remember = $request->session()->get('remember_login') ?? false;
$minutes = config('session.lifetime');
if ($remember === true) {
$minutes = config('session.lifetime');
if (true === $remember) {
// set cookie with a long lifetime (30 days)
$minutes = 43200;
}

View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use Cookie;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Log;

View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use Cookie;
use Illuminate\Support\Facades\Auth;
use Preferences;