From 43c32abfe806aa08f649e7e1ee715758c6632b79 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 26 Nov 2016 13:02:44 +0100 Subject: [PATCH] Various code cleanup. --- app/Console/Commands/VerifyDatabase.php | 10 +++------- app/Http/Middleware/Range.php | 6 +++--- resources/views/reminders/index.twig | 7 ------- resources/views/reminders/show.twig | 5 ----- 4 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 resources/views/reminders/index.twig delete mode 100644 resources/views/reminders/show.twig diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 61c27a48bd..d2ca7a3454 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -72,8 +72,6 @@ class VerifyDatabase extends Command $this->reportObject('category'); $this->reportObject('tag'); - return; - // accounts with no transactions. $this->reportAccounts(); // budgets with no limits @@ -269,8 +267,7 @@ class VerifyDatabase extends Command $plural = str_plural($name); $class = sprintf('FireflyIII\Models\%s', ucfirst($name)); $field = $name == 'tag' ? 'tag' : 'name'; - $set = $class - ::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id') + $set = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id') ->leftJoin('users', $plural . '.user_id', '=', 'users.id') ->distinct() ->whereNull($name . '_transaction_journal.' . $name . '_id') @@ -284,7 +281,7 @@ class VerifyDatabase extends Command try { $objName = Crypt::decrypt($objName); } catch (DecryptException $e) { - + // it probably was not encrypted. } $line = sprintf( @@ -317,8 +314,7 @@ class VerifyDatabase extends Command */ private function reportTransactions() { - $set = Transaction - ::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + $set = Transaction::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->whereNotNull('transactions.deleted_at') ->whereNull('transaction_journals.deleted_at') ->get( diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 05240cb62c..a01e0578ce 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -57,13 +57,13 @@ class Range * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param Closure $theNext + * @param Closure $next * @param string|null $guard * * @return mixed * @internal param Closure $next */ - public function handle(Request $request, Closure $theNext, $guard = null) + public function handle(Request $request, Closure $next, $guard = null) { if (!Auth::guard($guard)->guest()) { @@ -80,7 +80,7 @@ class Range $this->configureList(); } - return $theNext($request); + return $next($request); } diff --git a/resources/views/reminders/index.twig b/resources/views/reminders/index.twig deleted file mode 100644 index 13816030ab..0000000000 --- a/resources/views/reminders/index.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "./layout/default" %} - -

- No longer used. -

- -{% endblock %} diff --git a/resources/views/reminders/show.twig b/resources/views/reminders/show.twig deleted file mode 100644 index ef9fbe8ebe..0000000000 --- a/resources/views/reminders/show.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "./layout/default" %} -

- No longer used. -

-{% endblock %}