Code clean up.

app/Helpers/Chart/MetaPieChart.php

@@ -133,7 +133,6 @@ class MetaPieChart implements MetaPieChartInterface
         }
 
         return $chartData;
-
     }
 
     /**
@@ -342,7 +341,6 @@ class MetaPieChart implements MetaPieChartInterface
         }
 
         return $chartData;
-
     }
 
     /**

app/Helpers/Chart/MetaPieChartInterface.php

@@ -97,5 +97,4 @@ interface MetaPieChartInterface
      * @return MetaPieChartInterface
      */
     public function setUser(User $user): MetaPieChartInterface;
-
 }

app/Helpers/Collection/Balance.php

@@ -87,6 +87,4 @@ class Balance
     {
         $this->balanceLines = $balanceLines;
     }
-
-
 }

app/Helpers/Collection/BalanceEntry.php

@@ -89,6 +89,4 @@ class BalanceEntry
     {
         $this->spent = $spent;
     }
-
-
 }

app/Helpers/Collection/BalanceHeader.php

@@ -61,6 +61,4 @@ class BalanceHeader
     {
         return $this->accounts;
     }
-
-
 }

app/Helpers/Collection/BalanceLine.php

@@ -36,7 +36,6 @@ use Illuminate\Support\Collection;
  */
 class BalanceLine
 {
-
     const ROLE_DEFAULTROLE = 1;
     const ROLE_TAGROLE     = 2;
     const ROLE_DIFFROLE    = 3;
@@ -57,7 +56,6 @@ class BalanceLine
     public function __construct()
     {
         $this->balanceEntries = new Collection;
-
     }
 
     /**

app/Helpers/Collection/Bill.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collection;
 
-
 use Carbon\Carbon;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Support\Collection;
@@ -132,5 +131,4 @@ class Bill
     {
         $this->startDate = $startDate;
     }
-
 }

app/Helpers/Collection/BillLine.php

@@ -177,6 +177,4 @@ class BillLine
     {
         $this->hit = $hit;
     }
-
-
 }

app/Helpers/Collection/Category.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Helpers\Collection;
 use FireflyIII\Models\Category as CategoryModel;
 use Illuminate\Support\Collection;
 
-
 /**
  *
  * Class Category
@@ -91,6 +90,4 @@ class Category
     {
         return $this->total;
     }
-
-
 }

app/Helpers/Collector/JournalCollector.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collector;
 
-
 use Carbon\Carbon;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
@@ -265,8 +264,6 @@ class JournalCollector implements JournalCollectorInterface
                 $transaction->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name);
                 $transaction->account_iban          = app('steam')->tryDecrypt($transaction->account_iban);
                 $transaction->opposing_account_iban = app('steam')->tryDecrypt($transaction->opposing_account_iban);
-
-
             }
         );
 
@@ -390,7 +387,6 @@ class JournalCollector implements JournalCollectorInterface
         }
 
         return $this;
-
     }
 
     /**
@@ -630,7 +626,6 @@ class JournalCollector implements JournalCollectorInterface
                             ->orderBy('transactions.amount', 'DESC');
 
         $this->query = $query;
-
     }
 
     /**
@@ -648,7 +643,6 @@ class JournalCollector implements JournalCollectorInterface
      */
     public function withCategoryInformation(): JournalCollectorInterface
     {
-
         $this->joinCategoryTables();
 
         return $this;
@@ -760,7 +754,10 @@ class JournalCollector implements JournalCollectorInterface
             $this->joinedCategory = true;
             $this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
             $this->query->leftJoin(
-                'categories as transaction_journal_categories', 'transaction_journal_categories.id', '=', 'category_transaction_journal.category_id'
+                'categories as transaction_journal_categories',
+                'transaction_journal_categories.id',
+                '=',
+                'category_transaction_journal.category_id'
             );
 
             $this->query->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id');
@@ -785,11 +782,12 @@ class JournalCollector implements JournalCollectorInterface
             Log::debug('joinedOpposing is false');
             // join opposing transaction (hard):
             $this->query->leftJoin(
-                'transactions as opposing', function (JoinClause $join) {
+                'transactions as opposing',
-                $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
+                function (JoinClause $join) {
+                    $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
                      ->where('opposing.identifier', '=', DB::raw('transactions.identifier'))
                      ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'));
-            }
+                }
             );
             $this->query->leftJoin('accounts as opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id');
             $this->query->leftJoin('account_types as opposing_account_types', 'opposing_accounts.account_type_id', '=', 'opposing_account_types.id');

app/Helpers/Filter/FilterInterface.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
 
-
 use Illuminate\Support\Collection;
 
 interface FilterInterface
@@ -34,5 +33,4 @@ interface FilterInterface
      * @return Collection
      */
     public function filter(Collection $set): Collection;
-
 }

app/Helpers/Filter/InternalTransferFilter.php

@@ -68,18 +68,18 @@ class InternalTransferFilter implements FilterInterface
                     Log::debug(
                         sprintf(
                             'Transaction #%d has #%d and #%d in set, so removed',
-                            $transaction->id, $transaction->account_id, $transaction->opposing_account_id
+                            $transaction->id,
-                        ), $this->accounts
+                            $transaction->account_id,
+                            $transaction->opposing_account_id
+                        ),
+                        $this->accounts
                     );
 
                     return false;
                 }
 
                 return $transaction;
-
             }
         );
-
-
     }
 }

app/Helpers/Filter/OpposingAccountFilter.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
 
-
 use FireflyIII\Models\Transaction;
 use Illuminate\Support\Collection;
 use Log;

app/Helpers/Help/Help.php

@@ -62,7 +62,6 @@ class Help implements HelpInterface
      */
     public function getFromGithub(string $route, string $language): string
     {
-
         $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/master/%s/%s.md', $language, $route);
         Log::debug(sprintf('Trying to get %s...', $uri));
         $opt     = ['useragent' => $this->userAgent];
@@ -119,7 +118,6 @@ class Help implements HelpInterface
         }
 
         return $result;
-
     }
 
     /**

app/Helpers/Report/BalanceReportHelper.php

@@ -114,7 +114,10 @@ class BalanceReportHelper implements BalanceReportHelperInterface
             $balanceEntry = new BalanceEntry;
             $balanceEntry->setAccount($account);
             $spent = $this->budgetRepository->spentInPeriod(
-                new Collection([$budgetLimit->budget]), new Collection([$account]), $budgetLimit->start_date, $budgetLimit->end_date
+                new Collection([$budgetLimit->budget]),
+                new Collection([$account]),
+                $budgetLimit->start_date,
+                $budgetLimit->end_date
             );
             $balanceEntry->setSpent($spent);
             $line->addBalanceEntry($balanceEntry);
@@ -142,7 +145,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
             $budgetEntry->setAccount($account);
             $budgetEntry->setSpent($spent);
             $empty->addBalanceEntry($budgetEntry);
-
         }
 
         return $empty;
@@ -176,7 +178,5 @@ class BalanceReportHelper implements BalanceReportHelperInterface
         $balance->setBalanceLines($newSet);
 
         return $balance;
-
     }
-
 }

app/Helpers/Report/BalanceReportHelperInterface.php

@@ -27,7 +27,6 @@ use Carbon\Carbon;
 use FireflyIII\Helpers\Collection\Balance;
 use Illuminate\Support\Collection;
 
-
 /**
  * Interface BalanceReportHelperInterface
  *

app/Helpers/Report/BudgetReportHelper.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Report;
 
-
 use Carbon\Carbon;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
@@ -163,6 +162,5 @@ class BudgetReportHelper implements BudgetReportHelperInterface
         $array['expenses']  = $expenses;
 
         return $array;
-
     }
 }

app/Helpers/Report/BudgetReportHelperInterface.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Report;
 
-
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
@@ -52,5 +51,4 @@ interface BudgetReportHelperInterface
      * @return Collection
      */
     public function getBudgetsWithExpenses(Carbon $start, Carbon $end, Collection $accounts): Collection;
-
 }

app/Helpers/Report/ReportHelper.php

@@ -153,5 +153,4 @@ class ReportHelper implements ReportHelperInterface
 
         return $months;
     }
-
 }

app/Helpers/Report/ReportHelperInterface.php

@@ -57,5 +57,4 @@ interface ReportHelperInterface
      * @return array
      */
     public function listOfMonths(Carbon $date): array;
-
 }

app/Http/Controllers/Account/ReconcileController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
-
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -84,7 +83,6 @@ class ReconcileController extends Controller
         $return['html'] = view('accounts.reconcile.overview', compact('account', 'start', 'end'))->render();
 
         return Response::json($return);
-
     }
 
     /**
@@ -132,9 +130,21 @@ class ReconcileController extends Controller
         $indexUri        = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
 
         return view(
-            'accounts.reconcile.index', compact(
+            'accounts.reconcile.index',
-                                          'account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri',
+            compact(
-                                          'selectionStart', 'selectionEnd', 'overviewUri', 'indexUri'
+                                          'account',
+                'currency',
+                'subTitleIcon',
+                'start',
+                'end',
+                'subTitle',
+                'startBalance',
+                'endBalance',
+                'transactionsUri',
+                                          'selectionStart',
+                'selectionEnd',
+                'overviewUri',
+                'indexUri'
                                       )
         );
     }
@@ -169,5 +179,4 @@ class ReconcileController extends Controller
 
         return Response::json(['html' => $html]);
     }
-
+}
-}

app/Http/Controllers/AccountController.php

@@ -103,7 +103,6 @@ class AccountController extends Controller
         $request->session()->flash('gaEventAction', 'create-' . $what);
 
         return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'currencySelectList', 'allCurrencies', 'roles'));
-
     }
 
     /**
@@ -208,8 +207,17 @@ class AccountController extends Controller
         $request->session()->flash('gaEventAction', 'edit-' . $what);
 
         return view(
-            'accounts.edit', compact(
+            'accounts.edit',
-                               'allCurrencies', 'currencySelectList', 'account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles', 'preFilled'
+            compact(
+                               'allCurrencies',
+                'currencySelectList',
+                'account',
+                'currency',
+                'subTitle',
+                'subTitleIcon',
+                'what',
+                'roles',
+                'preFilled'
                            )
         );
     }
@@ -386,7 +394,6 @@ class AccountController extends Controller
 
         // redirect to previous URL.
         return redirect($this->getPreviousUri('accounts.edit.uri'));
-
     }
 
 

app/Http/Controllers/Admin/ConfigurationController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
-
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\ConfigurationRequest;
 use FireflyIII\Support\Facades\FireflyConfig;
@@ -55,7 +54,6 @@ class ConfigurationController extends Controller
                 return $next($request);
             }
         );
-
     }
 
     /**
@@ -76,7 +74,6 @@ class ConfigurationController extends Controller
             'admin.configuration.index',
             compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
         );
-
     }
 
     /**
@@ -99,5 +96,4 @@ class ConfigurationController extends Controller
 
         return Redirect::route('admin.configuration.index');
     }
-
 }

app/Http/Controllers/Admin/HomeController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
-
 use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Http\Request;
@@ -62,5 +61,4 @@ class HomeController extends Controller
 
         return redirect(route('admin.index'));
     }
-
 }

app/Http/Controllers/Admin/LinkController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
-
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\LinkTypeFormRequest;
 use FireflyIII\Models\LinkType;
@@ -236,5 +235,4 @@ class LinkController extends Controller
         // redirect to previous URL.
         return redirect($this->getPreviousUri('link_types.edit.uri'));
     }
-
 }

app/Http/Controllers/Admin/UserController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
-
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\UserFormRequest;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -107,7 +106,6 @@ class UserController extends Controller
         ];
 
         return view('admin.users.edit', compact('user', 'subTitle', 'subTitleIcon', 'codes'));
-
     }
 
     /**
@@ -136,7 +134,6 @@ class UserController extends Controller
 
 
         return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
-
     }
 
     /**
@@ -156,7 +153,12 @@ class UserController extends Controller
         return view(
             'admin.users.show',
             compact(
-                'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user'
+                'title',
+                'mainTitleIcon',
+                'subTitle',
+                'subTitleIcon',
+                'information',
+                'user'
             )
         );
     }
@@ -195,8 +197,5 @@ class UserController extends Controller
 
         // redirect to previous URL.
         return redirect($this->getPreviousUri('users.edit.uri'));
-
     }
-
-
 }

app/Http/Controllers/AttachmentController.php

@@ -108,7 +108,6 @@ class AttachmentController extends Controller
      */
     public function download(AttachmentRepositoryInterface $repository, Attachment $attachment)
     {
-
         if ($repository->exists($attachment)) {
             $content = $repository->getContent($attachment);
             $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
@@ -198,7 +197,5 @@ class AttachmentController extends Controller
 
         // redirect to previous URL.
         return redirect($this->getPreviousUri('attachments.edit.uri'));
-
     }
-
 }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -59,6 +59,5 @@ class ForgotPasswordController extends Controller
     {
         parent::__construct();
         $this->middleware('guest');
-
     }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -42,7 +42,6 @@ use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Schema;
 
-
 class LoginController extends Controller
 {
     /*
@@ -85,16 +84,16 @@ class LoginController extends Controller
         // check for presence of tables:
         $hasTable = Schema::hasTable('users');
 
-        if(!$hasTable) {
+        if (!$hasTable) {
             $message = 'Firefly III could not find the "users" table. This is a strong indication your database credentials are wrong or the database has not been initialized. Did you follow the installation instructions correctly?';
-            return view('error',compact('message'));
+            return view('error', compact('message'));
         }
 
         // check for presence of currency:
-        $currency = TransactionCurrency::where('code','EUR')->first();
+        $currency = TransactionCurrency::where('code', 'EUR')->first();
-        if(is_null($currency)) {
+        if (is_null($currency)) {
             $message = 'Firefly III could not find the EURO currency. This is a strong indication the database has not been initialized correctly. Did you follow the installation instructions?';
-            return view('error',compact('message'));
+            return view('error', compact('message'));
         }
 
         // forget 2fa cookie:

app/Http/Controllers/Auth/RegisterController.php

@@ -158,7 +158,8 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make(
-            $data, [
+            $data,
+            [
                      'email'    => 'required|string|email|max:255|unique:users',
                      'password' => 'required|string|secure_password|confirmed',
                  ]

app/Http/Controllers/Auth/TwoFactorController.php

@@ -49,7 +49,6 @@ class TwoFactorController extends Controller
      */
     public function index(Request $request)
     {
-
         $user = auth()->user();
 
         // to make sure the validator in the next step gets the secret, we push it in session
@@ -105,5 +104,4 @@ class TwoFactorController extends Controller
 
         return redirect(route('home'))->withCookie($cookie);
     }
-
 }

app/Http/Controllers/BillController.php

@@ -264,7 +264,6 @@ class BillController extends Controller
 
         // redirect to previous URL.
         return redirect($this->getPreviousUri('bills.create.uri'));
-
     }
 
     /**
@@ -291,7 +290,5 @@ class BillController extends Controller
         }
 
         return redirect($this->getPreviousUri('bills.edit.uri'));
-
     }
-
 }

app/Http/Controllers/BudgetController.php

@@ -94,7 +94,6 @@ class BudgetController extends Controller
         Preferences::mark();
 
         return Response::json(['name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount]);
-
     }
 
     /**
@@ -142,7 +141,6 @@ class BudgetController extends Controller
      */
     public function destroy(Request $request, Budget $budget)
     {
-
         $name = $budget->name;
         $this->repository->destroy($budget);
         $request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => $name])));
@@ -170,7 +168,6 @@ class BudgetController extends Controller
         $request->session()->flash('gaEventAction', 'edit');
 
         return view('budgets.edit', compact('budget', 'subTitle'));
-
     }
 
     /**
@@ -246,9 +243,23 @@ class BudgetController extends Controller
         return view(
             'budgets.index',
             compact(
-                'available', 'currentMonth', 'next', 'nextText', 'prev', 'prevText',
+                'available',
-                'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets',
+                'currentMonth',
-                'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end'
+                'next',
+                'nextText',
+                'prev',
+                'prevText',
+                'periodStart',
+                'periodEnd',
+                'budgetInformation',
+                'inactive',
+                'budgets',
+                'spent',
+                'budgeted',
+                'previousLoop',
+                'nextLoop',
+                'start',
+                'end'
             )
         );
     }
@@ -442,7 +453,8 @@ class BudgetController extends Controller
         $page     = intval($request->get('page'));
         $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
         $subTitle = trans(
-            'firefly.budget_in_period', [
+            'firefly.budget_in_period',
+            [
                                           'name'  => $budget->name,
                                           'start' => $budgetLimit->start_date->formatLocalized($this->monthAndDayFormat),
                                           'end'   => $budgetLimit->end_date->formatLocalized($this->monthAndDayFormat),
@@ -461,7 +473,6 @@ class BudgetController extends Controller
         $limits = $this->getLimits($budget, $start, $end);
 
         return view('budgets.show', compact('limits', 'budget', 'budgetLimit', 'transactions', 'subTitle'));
-
     }
 
     /**
@@ -601,5 +612,4 @@ class BudgetController extends Controller
 
         return $entries;
     }
-
 }

app/Http/Controllers/CategoryController.php

@@ -114,7 +114,6 @@ class CategoryController extends Controller
      */
     public function destroy(Request $request, CategoryRepositoryInterface $repository, Category $category)
     {
-
         $name = $category->name;
         $repository->destroy($category);
 
@@ -143,7 +142,6 @@ class CategoryController extends Controller
         $request->session()->flash('gaEventAction', 'edit');
 
         return view('categories.edit', compact('category', 'subTitle'));
-
     }
 
     /**
@@ -487,5 +485,4 @@ class CategoryController extends Controller
 
         return $entries;
     }
-
 }

app/Http/Controllers/Chart/AccountController.php

@@ -243,7 +243,6 @@ class AccountController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -326,7 +325,6 @@ class AccountController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -580,5 +578,4 @@ class AccountController extends Controller
 
         return $return;
     }
-
 }

app/Http/Controllers/Chart/BudgetController.php

@@ -208,7 +208,6 @@ class BudgetController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -255,7 +254,6 @@ class BudgetController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -301,7 +299,6 @@ class BudgetController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**

app/Http/Controllers/Chart/BudgetReportController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Chart\MetaPieChartInterface;
@@ -95,7 +94,6 @@ class BudgetReportController extends Controller
         $data      = $this->generator->pieChart($chartData);
 
         return Response::json($data);
-
     }
 
     /**
@@ -277,5 +275,4 @@ class BudgetReportController extends Controller
 
         return $grouped;
     }
-
 }

app/Http/Controllers/Chart/CategoryController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -120,7 +119,6 @@ class CategoryController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -269,7 +267,6 @@ class CategoryController extends Controller
             $chartData[0]['entries'][$label] = bcmul($spent, '-1');
             $chartData[1]['entries'][$label] = $earned;
             $chartData[2]['entries'][$label] = $sum;
-
         }
         $data = $this->generator->multiSet($chartData);
         $cache->store($data);
@@ -358,7 +355,5 @@ class CategoryController extends Controller
         $cache->store($data);
 
         return $data;
-
     }
-
 }

app/Http/Controllers/Chart/CategoryReportController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Chart\MetaPieChartInterface;
@@ -41,7 +40,6 @@ use Illuminate\Support\Collection;
 use Navigation;
 use Response;
 
-
 /**
  * Separate controller because many helper functions are shared.
  *

app/Http/Controllers/Chart/PiggyBankController.php

@@ -31,7 +31,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Response;
 
-
 /**
  * Class PiggyBankController
  *
@@ -86,6 +85,5 @@ class PiggyBankController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 }

app/Http/Controllers/Chart/ReportController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -149,7 +148,6 @@ class ReportController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -224,7 +222,6 @@ class ReportController extends Controller
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -270,14 +267,14 @@ class ReportController extends Controller
         $tasker = app(AccountTaskerInterface::class);
 
         while ($currentStart <= $end) {
-
             $currentEnd = Navigation::endOfPeriod($currentStart, '1M');
             $earned     = strval(
                 array_sum(
                     array_map(
                         function ($item) {
                             return $item['sum'];
-                        }, $tasker->getIncomeReport($currentStart, $currentEnd, $accounts)
+                        },
+                        $tasker->getIncomeReport($currentStart, $currentEnd, $accounts)
                     )
                 )
             );
@@ -287,7 +284,8 @@ class ReportController extends Controller
                     array_map(
                         function ($item) {
                             return $item['sum'];
-                        }, $tasker->getExpenseReport($currentStart, $currentEnd, $accounts)
+                        },
+                        $tasker->getExpenseReport($currentStart, $currentEnd, $accounts)
                     )
                 )
             );

app/Http/Controllers/Chart/TagReportController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Chart\MetaPieChartInterface;
@@ -375,5 +374,4 @@ class TagReportController extends Controller
 
         return $grouped;
     }
-
 }

app/Http/Controllers/Controller.php

@@ -110,7 +110,6 @@ class Controller extends BaseController
                 return $next($request);
             }
         );
-
     }
 
     /**
@@ -162,7 +161,6 @@ class Controller extends BaseController
             if (in_array($account->accountType->type, $valid)) {
                 return redirect(route('accounts.show', [$account->id]));
             }
-
         }
         // @codeCoverageIgnoreStart
         Session::flash('error', strval(trans('firefly.cannot_redirect_to_account')));
@@ -178,5 +176,4 @@ class Controller extends BaseController
     {
         Session::put($identifier, URL::previous());
     }
-
 }

app/Http/Controllers/CurrencyController.php

@@ -102,7 +102,6 @@ class CurrencyController extends Controller
      */
     public function defaultCurrency(Request $request, TransactionCurrency $currency)
     {
-
         Preferences::set('currencyPreference', $currency->code);
         Preferences::mark();
 
@@ -111,7 +110,6 @@ class CurrencyController extends Controller
         Cache::forget('FFCURRENCYCODE');
 
         return redirect(route('currencies.index'));
-
     }
 
 
@@ -205,7 +203,6 @@ class CurrencyController extends Controller
         $request->session()->flash('gaEventAction', 'edit');
 
         return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
-
     }
 
     /**

app/Http/Controllers/ExportController.php

@@ -98,7 +98,6 @@ class ExportController extends Controller
             ->header('Content-Length', strlen($content));
 
         return $response;
-
     }
 
     /**
@@ -134,7 +133,6 @@ class ExportController extends Controller
         $today         = Carbon::create()->format('Y-m-d');
 
         return view('export.index', compact('job', 'checked', 'accountList', 'formats', 'defaultFormat', 'first', 'today'));
-
     }
 
     /**

app/Http/Controllers/HelpController.php

@@ -66,7 +66,6 @@ class HelpController extends Controller
         $html     = $this->getHelpText($route, $language);
 
         return Response::json(['html' => $html]);
-
     }
 
     /**
@@ -112,7 +111,6 @@ class HelpController extends Controller
             }
 
             $content = $this->help->getFromGithub($route, $language);
-
         }
 
         // help still empty?
@@ -120,11 +118,8 @@ class HelpController extends Controller
             $this->help->putInCache($route, $language, $content);
 
             return $content;
-
         }
 
         return '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
     }
-
-
 }

app/Http/Controllers/HomeController.php

@@ -63,7 +63,6 @@ class HomeController extends Controller
      */
     public function dateRange(Request $request)
     {
-
         $start         = new Carbon($request->get('start'));
         $end           = new Carbon($request->get('end'));
         $label         = $request->get('label');
@@ -122,11 +121,23 @@ class HomeController extends Controller
         $logContent = 'Truncated from this point <----|' . substr($logContent, -4096);
 
         return view(
-            'debug', compact(
+            'debug',
-            'phpVersion', 'extensions', 'carbon', 'now', 'drivers', 'currentDriver', 'userAgent', 'phpOs', 'interface', 'logContent', 'isDocker', 'isSandstorm','trustedProxies'
+            compact(
+            'phpVersion',
+                'extensions',
+                'carbon',
+                'now',
+                'drivers',
+                'currentDriver',
+                'userAgent',
+                'phpOs',
+                'interface',
+                'logContent',
+                'isDocker',
+                'isSandstorm',
+                'trustedProxies'
         )
         );
-
     }
 
     /**
@@ -176,7 +187,8 @@ class HomeController extends Controller
         $subTitle     = trans('firefly.welcomeBack');
         $transactions = [];
         $frontPage    = Preferences::get(
-            'frontPageAccounts', $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray()
+            'frontPageAccounts',
+            $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray()
         );
         /** @var Carbon $start */
         $start = session('start', Carbon::now()->startOfMonth());
@@ -199,7 +211,8 @@ class HomeController extends Controller
         }
 
         return view(
-            'index', compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount')
+            'index',
+            compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount')
         );
     }
 
@@ -228,7 +241,6 @@ class HomeController extends Controller
                 if (!$found) {
                     echo 'touch ' . $route->getName() . '.md;';
                 }
-
             }
         }
 
@@ -247,5 +259,4 @@ class HomeController extends Controller
 
         return redirect(route('home'));
     }
-
 }

app/Http/Controllers/Import/BankController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Import;
 
-
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\Import\Information\InformationInterface;
 use FireflyIII\Support\Import\Prerequisites\PrerequisitesInterface;
@@ -60,7 +59,6 @@ class BankController extends Controller
         $remoteAccounts = $object->getAccounts();
 
         return view('import.bank.form', compact('remoteAccounts', 'bank'));
-
     }
 
     /**
@@ -75,7 +73,6 @@ class BankController extends Controller
      */
     public function postForm(Request $request, string $bank)
     {
-
         $class = config(sprintf('firefly.import_pre.%s', $bank));
         /** @var PrerequisitesInterface $object */
         $object = app($class);
@@ -95,8 +92,6 @@ class BankController extends Controller
         // get import file
 
         // get import config
-
-
     }
 
     /**
@@ -161,5 +156,4 @@ class BankController extends Controller
 
         return redirect(route('import.bank.form', [$bank]));
     }
-
 }

app/Http/Controllers/Import/FileController.php

@@ -39,7 +39,6 @@ use Response;
 use Session;
 use View;
 
-
 /**
  * Class FileController.
  *
@@ -128,8 +127,6 @@ class FileController extends Controller
                  ->header('Content-Length', strlen($result));
 
         return $response;
-
-
     }
 
     /**

app/Http/Controllers/ImportController.php

@@ -72,5 +72,4 @@ class ImportController extends Controller
 
         return view('import.index', compact('subTitle', 'subTitleIcon', 'importFileTypes', 'defaultImportType'));
     }
-
 }

app/Http/Controllers/JavascriptController.php

@@ -182,6 +182,5 @@ class JavascriptController extends Controller
 
 
         return $return;
-
     }
 }

app/Http/Controllers/Json/AutoCompleteController.php

@@ -58,7 +58,6 @@ class AutoCompleteController extends Controller
         sort($return);
 
         return Response::json($return);
-
     }
 
     /**
@@ -111,7 +110,6 @@ class AutoCompleteController extends Controller
      */
     public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except)
     {
-
         $cache = new CacheProperties;
         $cache->addProperty('recent-journals-id');
 
@@ -178,5 +176,4 @@ class AutoCompleteController extends Controller
 
         return Response::json($return);
     }
-
 }

app/Http/Controllers/Json/BoxController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Json;
 
-
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -214,5 +213,4 @@ class BoxController extends Controller
 
         return Response::json($return);
     }
-
 }

app/Http/Controllers/Json/ExchangeController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Json;
 
-
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionCurrency;
@@ -73,5 +72,4 @@ class ExchangeController extends Controller
 
         return Response::json($return);
     }
-
 }

app/Http/Controllers/Json/FrontpageController.php

@@ -61,7 +61,6 @@ class FrontpageController extends Controller
 
                 $info[] = $entry;
             }
-
         }
         $html = '';
         if (count($info) > 0) {
@@ -70,5 +69,4 @@ class FrontpageController extends Controller
 
         return Response::json(['html' => $html]);
     }
-
 }

app/Http/Controllers/Json/IntroController.php

@@ -56,7 +56,6 @@ class IntroController
             // merge arrays and add last step again
             $steps   = array_merge($steps, $specificSteps);
             $steps[] = $lastStep;
-
         }
         if (!$this->hasOutroStep($route)) {
             $steps = array_merge($steps, $specificSteps);
@@ -174,5 +173,4 @@ class IntroController
 
         return $steps;
     }
-
 }

app/Http/Controllers/Json/TransactionController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Json;
 
-
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@@ -89,5 +88,4 @@ class TransactionController extends Controller
 
         return Response::json($result);
     }
-
 }

app/Http/Controllers/JsonController.php

@@ -105,7 +105,6 @@ class JsonController extends Controller
         sort($return);
 
         return Response::json($return);
-
     }
 
     /**
@@ -143,5 +142,4 @@ class JsonController extends Controller
 
         return Response::json(['html' => $view]);
     }
-
 }

app/Http/Controllers/NewUserController.php

@@ -47,7 +47,6 @@ class NewUserController extends Controller
 
         $this->middleware(
             function ($request, $next) {
-
                 return $next($request);
             }
         );
@@ -61,7 +60,6 @@ class NewUserController extends Controller
      */
     public function index(AccountRepositoryInterface $repository)
     {
-
         View::share('title', trans('firefly.welcome'));
         View::share('mainTitleIcon', 'fa-fire');
 
@@ -70,7 +68,6 @@ class NewUserController extends Controller
 
         if ($count > 0) {
             return redirect(route('index'));
-
         }
 
         return view('new-user.index');
@@ -154,5 +151,4 @@ class NewUserController extends Controller
 
         return true;
     }
-
 }

app/Http/Controllers/PiggyBankController.php

@@ -174,7 +174,6 @@ class PiggyBankController extends Controller
      */
     public function edit(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
     {
-
         $accounts     = ExpandedForm::makeSelectList($repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
         $subTitle     = trans('firefly.update_piggy_title', ['name' => $piggyBank->name]);
         $subTitleIcon = 'fa-pencil';
@@ -290,7 +289,8 @@ class PiggyBankController extends Controller
         if ($repository->canAddAmount($piggyBank, $amount)) {
             $repository->addAmount($piggyBank, $amount);
             Session::flash(
-                'success', strval(
+                'success',
+                strval(
                              trans(
                                  'firefly.added_amount_to_piggy',
                                  ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
@@ -304,7 +304,8 @@ class PiggyBankController extends Controller
 
         Log::error('Cannot add ' . $amount . ' because canAddAmount returned false.');
         Session::flash(
-            'error', strval(
+            'error',
+            strval(
                        trans(
                            'firefly.cannot_add_amount_piggy',
                            ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
@@ -332,7 +333,8 @@ class PiggyBankController extends Controller
                 'success',
                 strval(
                     trans(
-                        'firefly.removed_amount_from_piggy', ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
+                        'firefly.removed_amount_from_piggy',
+                        ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
                     )
                 )
             );
@@ -344,7 +346,8 @@ class PiggyBankController extends Controller
         $amount = strval(round($request->get('amount'), 12));
 
         Session::flash(
-            'error', strval(
+            'error',
+            strval(
                        trans(
                            'firefly.cannot_remove_from_piggy',
                            ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
@@ -391,7 +394,6 @@ class PiggyBankController extends Controller
         $subTitle = e($piggyBank->name);
 
         return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'note'));
-
     }
 
     /**

app/Http/Controllers/Popup/ReportController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Popup;
 
-
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collection\BalanceLine;
@@ -80,7 +79,6 @@ class ReportController extends Controller
                 return $next($request);
             }
         );
-
     }
 
 
@@ -119,8 +117,6 @@ class ReportController extends Controller
         }
 
         return Response::json(['html' => $html]);
-
-
     }
 
     /**
@@ -251,5 +247,4 @@ class ReportController extends Controller
 
         return $attributes;
     }
-
 }

app/Http/Controllers/PreferencesController.php

@@ -113,9 +113,18 @@ class PreferencesController extends Controller
         return view(
             'preferences.index',
             compact(
-                'language', 'accounts', 'frontPageAccounts', 'tjOptionalFields',
+                'language',
-                'viewRange', 'customFiscalYear', 'transactionPageSize', 'fiscalYearStart', 'is2faEnabled',
+                'accounts',
-                'has2faSecret', 'showIncomplete', 'showDeps'
+                'frontPageAccounts',
+                'tjOptionalFields',
+                'viewRange',
+                'customFiscalYear',
+                'transactionPageSize',
+                'fiscalYearStart',
+                'is2faEnabled',
+                'has2faSecret',
+                'showIncomplete',
+                'showDeps'
             )
         );
     }
@@ -236,5 +245,4 @@ class PreferencesController extends Controller
 
         return $parts['host'];
     }
-
 }

app/Http/Controllers/ProfileController.php

@@ -64,7 +64,6 @@ class ProfileController extends Controller
             }
         );
         $this->middleware(IsLimitedUser::class)->except(['confirmEmailChange', 'undoEmailChange']);
-
     }
 
     /**
@@ -253,7 +252,7 @@ class ProfileController extends Controller
     /**
      *
      */
-    function regenerate()
+    public function regenerate()
     {
         $token = auth()->user()->generateAccessToken();
         Preferences::set('access_token', $token);
@@ -328,8 +327,5 @@ class ProfileController extends Controller
         }
 
         return true;
-
     }
-
-
 }

app/Http/Controllers/Report/AccountController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Report;
 
-
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Repositories\Account\AccountTaskerInterface;

app/Http/Controllers/Report/BalanceController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Report;
 
-
 use Carbon\Carbon;
 use FireflyIII\Helpers\Report\BalanceReportHelperInterface;
 use FireflyIII\Http\Controllers\Controller;

app/Http/Controllers/Report/BudgetController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Report;
 
-
 use Carbon\Carbon;
 use FireflyIII\Helpers\Report\BudgetReportHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -68,7 +67,6 @@ class BudgetController extends Controller
         $cache->store($result);
 
         return $result;
-
     }
 
     /**

app/Http/Controllers/Report/CategoryController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Report;
 
-
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
@@ -172,6 +171,4 @@ class CategoryController extends Controller
 
         return $data;
     }
-
-
 }

app/Http/Controllers/Report/OperationsController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Report;
 
-
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Repositories\Account\AccountTaskerInterface;
@@ -63,7 +62,6 @@ class OperationsController extends Controller
         $cache->store($result);
 
         return $result;
-
     }
 
     /**
@@ -92,7 +90,6 @@ class OperationsController extends Controller
         $cache->store($result);
 
         return $result;
-
     }
 
     /**
@@ -121,7 +118,8 @@ class OperationsController extends Controller
             array_map(
                 function ($item) {
                     return $item['sum'];
-                }, $incomes
+                },
+                $incomes
             )
         );
 
@@ -129,7 +127,8 @@ class OperationsController extends Controller
             array_map(
                 function ($item) {
                     return $item['sum'];
-                }, $expenses
+                },
+                $expenses
             )
         );
 
@@ -137,7 +136,5 @@ class OperationsController extends Controller
         $cache->store($result);
 
         return $result;
-
     }
-
 }

app/Http/Controllers/ReportController.php

@@ -69,7 +69,6 @@ class ReportController extends Controller
                 return $next($request);
             }
         );
-
     }
 
     /**
@@ -89,7 +88,8 @@ class ReportController extends Controller
         }
 
         View::share(
-            'subTitle', trans(
+            'subTitle',
+            trans(
                           'firefly.report_audit',
                           [
                               'start' => $start->formatLocalized($this->monthFormat),
@@ -104,7 +104,6 @@ class ReportController extends Controller
         $result = $generator->generate();
 
         return $result;
-
     }
 
     /**
@@ -125,7 +124,8 @@ class ReportController extends Controller
         }
 
         View::share(
-            'subTitle', trans(
+            'subTitle',
+            trans(
                           'firefly.report_budget',
                           [
                               'start' => $start->formatLocalized($this->monthFormat),
@@ -140,7 +140,6 @@ class ReportController extends Controller
         $result = $generator->generate();
 
         return $result;
-
     }
 
     /**
@@ -161,7 +160,8 @@ class ReportController extends Controller
         }
 
         View::share(
-            'subTitle', trans(
+            'subTitle',
+            trans(
                           'firefly.report_category',
                           [
                               'start' => $start->formatLocalized($this->monthFormat),
@@ -176,7 +176,6 @@ class ReportController extends Controller
         $result = $generator->generate();
 
         return $result;
-
     }
 
     /**
@@ -197,7 +196,8 @@ class ReportController extends Controller
         }
 
         View::share(
-            'subTitle', trans(
+            'subTitle',
+            trans(
                           'firefly.report_default',
                           [
                               'start' => $start->formatLocalized($this->monthFormat),
@@ -211,7 +211,6 @@ class ReportController extends Controller
         $result = $generator->generate();
 
         return $result;
-
     }
 
     /**
@@ -343,7 +342,8 @@ class ReportController extends Controller
         }
 
         View::share(
-            'subTitle', trans(
+            'subTitle',
+            trans(
                           'firefly.report_tag',
                           [
                               'start' => $start->formatLocalized($this->monthFormat),
@@ -358,7 +358,6 @@ class ReportController extends Controller
         $result = $generator->generate();
 
         return $result;
-
     }
 
     /**
@@ -372,7 +371,6 @@ class ReportController extends Controller
         $result     = view('reports.options.budget', compact('budgets'))->render();
 
         return $result;
-
     }
 
     /**
@@ -386,7 +384,6 @@ class ReportController extends Controller
         $result     = view('reports.options.category', compact('categories'))->render();
 
         return $result;
-
     }
 
     /**
@@ -412,6 +409,5 @@ class ReportController extends Controller
         $result     = view('reports.options.tag', compact('tags'))->render();
 
         return $result;
-
     }
 }

app/Http/Controllers/RuleController.php

@@ -110,7 +110,8 @@ class RuleController extends Controller
         Session::flash('gaEventAction', 'create-rule');
 
         return view(
-            'rules.rule.create', compact('subTitleIcon', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
+            'rules.rule.create',
+            compact('subTitleIcon', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
         );
     }
 
@@ -143,7 +144,6 @@ class RuleController extends Controller
      */
     public function destroy(RuleRepositoryInterface $repository, Rule $rule)
     {
-
         $title = $rule->title;
         $repository->destroy($rule);
 
@@ -164,7 +164,6 @@ class RuleController extends Controller
         $repository->moveDown($rule);
 
         return redirect(route('rules.index'));
-
     }
 
     /**
@@ -212,9 +211,16 @@ class RuleController extends Controller
         Session::flash('gaEventAction', 'edit-rule');
 
         return view(
-            'rules.rule.edit', compact(
+            'rules.rule.edit',
-                                 'rule', 'subTitle',
+            compact(
-                                 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
+                                 'rule',
+                'subTitle',
+                                 'primaryTrigger',
+                'oldTriggers',
+                'oldActions',
+                'triggerCount',
+                'actionCount',
+                'ruleGroups'
                              )
         );
     }
@@ -283,7 +289,6 @@ class RuleController extends Controller
         }
 
         return Response::json('true');
-
     }
 
     /**
@@ -301,7 +306,6 @@ class RuleController extends Controller
         }
 
         return Response::json('true');
-
     }
 
     /**
@@ -411,7 +415,6 @@ class RuleController extends Controller
      */
     public function testTriggersByRule(Rule $rule)
     {
-
         $triggers = $rule->ruleTriggers;
 
         if (count($triggers) === 0) {
@@ -454,7 +457,6 @@ class RuleController extends Controller
         $repository->moveUp($rule);
 
         return redirect(route('rules.index'));
-
     }
 
     /**
@@ -510,7 +512,6 @@ class RuleController extends Controller
 
             $repository->store($data);
         }
-
     }
 
     /**
@@ -655,7 +656,6 @@ class RuleController extends Controller
      */
     private function getValidTriggerList(TestRuleFormRequest $request): array
     {
-
         $triggers = [];
         $data     = [
             'rule-triggers'       => $request->get('rule-trigger'),
@@ -675,6 +675,4 @@ class RuleController extends Controller
 
         return $triggers;
     }
-
-
 }

app/Http/Controllers/RuleGroupController.php

@@ -111,7 +111,6 @@ class RuleGroupController extends Controller
      */
     public function destroy(Request $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
     {
-
         $title  = $ruleGroup->title;
         $moveTo = auth()->user()->ruleGroups()->find(intval($request->get('move_rules_before_delete')));
 
@@ -135,7 +134,6 @@ class RuleGroupController extends Controller
         $repository->moveDown($ruleGroup);
 
         return redirect(route('rules.index'));
-
     }
 
     /**
@@ -156,7 +154,6 @@ class RuleGroupController extends Controller
         Session::flash('gaEventAction', 'edit-rule-group');
 
         return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
-
     }
 
     /**
@@ -248,7 +245,6 @@ class RuleGroupController extends Controller
         $repository->moveUp($ruleGroup);
 
         return redirect(route('rules.index'));
-
     }
 
     /**
@@ -281,6 +277,5 @@ class RuleGroupController extends Controller
 
         // redirect to previous URL.
         return redirect($this->getPreviousUri('rule-groups.edit.uri'));
-
     }
 }

app/Http/Controllers/SearchController.php

@@ -51,7 +51,6 @@ class SearchController extends Controller
                 return $next($request);
             }
         );
-
     }
 
     /**
@@ -96,8 +95,5 @@ class SearchController extends Controller
         $html = view('search.search', compact('transactions'))->render();
 
         return Response::json(['count' => $transactions->count(), 'html' => $html]);
-
-
     }
-
 }

app/Http/Controllers/TagController.php

@@ -124,7 +124,6 @@ class TagController extends Controller
      */
     public function destroy(Tag $tag)
     {
-
         $tagName = $tag->tag;
         $this->repository->destroy($tag);
 
@@ -284,7 +283,6 @@ class TagController extends Controller
         }
 
         return redirect($this->getPreviousUri('tags.create.uri'));
-
     }
 
     /**
@@ -356,8 +354,5 @@ class TagController extends Controller
         $cache->store($collection);
 
         return $collection;
-
     }
-
-
 }

app/Http/Controllers/Transaction/ConvertController.php

@@ -107,9 +107,16 @@ class ConvertController extends Controller
         return view(
             'transactions.convert',
             compact(
-                'sourceType', 'destinationType', 'journal', 'assetAccounts',
+                'sourceType',
-                'positiveAmount', 'sourceAccount', 'destinationAccount', 'sourceType',
+                'destinationType',
-                'subTitle', 'subTitleIcon'
+                'journal',
+                'assetAccounts',
+                'positiveAmount',
+                'sourceAccount',
+                'destinationAccount',
+                'sourceType',
+                'subTitle',
+                'subTitleIcon'
 
             )
         );
@@ -271,7 +278,5 @@ class ConvertController extends Controller
         }
 
         return $source;
-
     }
-
 }

app/Http/Controllers/Transaction/LinkController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
-
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\JournalLinkRequest;
 use FireflyIII\Models\TransactionJournal;
@@ -60,7 +59,6 @@ class LinkController extends Controller
                 return $next($request);
             }
         );
-
     }
 
 
@@ -103,7 +101,10 @@ class LinkController extends Controller
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function store(
-        JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
+        JournalLinkRequest $request,
+        LinkTypeRepositoryInterface $repository,
+        JournalRepositoryInterface $journalRepository,
+        TransactionJournal $journal
     ) {
         $linkInfo = $request->getLinkInfo();
         if ($linkInfo['transaction_journal_id'] === 0) {
@@ -150,10 +151,8 @@ class LinkController extends Controller
      */
     public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
     {
-
         $repository->switchLink($link);
 
         return redirect(URL::previous());
     }
-
 }

app/Http/Controllers/Transaction/MassController.php

@@ -78,7 +78,6 @@ class MassController extends Controller
         Session::flash('gaEventAction', 'mass-delete');
 
         return view('transactions.mass-delete', compact('journals', 'subTitle'));
-
     }
 
     /**
@@ -115,7 +114,6 @@ class MassController extends Controller
 
         // redirect to previous URL:
         return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
-
     }
 
 
@@ -161,7 +159,7 @@ class MassController extends Controller
             }
 
             // cannot edit reconciled transactions / journals:
-            if($journal->transactions->first()->reconciled) {
+            if ($journal->transactions->first()->reconciled) {
                 $messages[] = trans('firefly.cannot_edit_reconciled', ['description' => $journal->description, 'id' => $journal->id]);
                 continue;
             }
@@ -270,13 +268,11 @@ class MassController extends Controller
                     $count++;
                 }
             }
-
         }
         Preferences::mark();
         Session::flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
 
         // redirect to previous URL:
         return redirect($this->getPreviousUri('transactions.mass-edit.uri'));
-
     }
 }

app/Http/Controllers/Transaction/SingleController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
-
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Events\StoredTransactionJournal;
@@ -99,7 +98,6 @@ class SingleController extends Controller
                 return $next($request);
             }
         );
-
     }
 
     public function cloneTransaction(TransactionJournal $journal)
@@ -214,8 +212,6 @@ class SingleController extends Controller
         Session::flash('gaEventAction', 'delete-' . $what);
 
         return view('transactions.single.delete', compact('journal', 'subTitle', 'what'));
-
-
     }
 
     /**

app/Http/Controllers/Transaction/SplitController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
-
 use ExpandedForm;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
@@ -136,9 +135,17 @@ class SplitController extends Controller
         return view(
             'transactions.split.edit',
             compact(
-                'subTitleIcon', 'currencies', 'optionalFields',
+                'subTitleIcon',
-                'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
+                'currencies',
-                'budgets', 'journal', 'accountArray', 'previous'
+                'optionalFields',
+                'preFilled',
+                'subTitle',
+                'uploadSize',
+                'assetAccounts',
+                'budgets',
+                'journal',
+                'accountArray',
+                'previous'
             )
         );
     }
@@ -306,7 +313,6 @@ class SplitController extends Controller
             }
 
             $return[] = $set;
-
         }
 
         return $return;
@@ -322,7 +328,6 @@ class SplitController extends Controller
         $return       = [];
         $transactions = $request->get('transactions');
         foreach ($transactions as $transaction) {
-
             $return[] = [
                 'description'              => $transaction['description'],
                 'source_account_id'        => $transaction['source_account_id'] ?? 0,
@@ -373,6 +378,4 @@ class SplitController extends Controller
 
         return $array;
     }
-
-
 }

app/Http/Controllers/TransactionController.php

@@ -64,7 +64,6 @@ class TransactionController extends Controller
                 return $next($request);
             }
         );
-
     }
 
     /**
@@ -130,7 +129,6 @@ class TransactionController extends Controller
 
 
         return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'periods', 'start', 'end', 'moment'));
-
     }
 
     /**
@@ -146,7 +144,6 @@ class TransactionController extends Controller
 
             $repository->reconcile($transaction);
         }
-
     }
 
     /**
@@ -173,7 +170,6 @@ class TransactionController extends Controller
         Preferences::mark();
 
         return Response::json([true]);
-
     }
 
     /**
@@ -300,5 +296,4 @@ class TransactionController extends Controller
 
         return $return;
     }
-
 }

app/Http/Kernel.php

@@ -57,7 +57,6 @@ use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 
-
 class Kernel extends HttpKernel
 {
     /**

app/Http/Middleware/Binder.php

@@ -27,7 +27,6 @@ use Closure;
 use FireflyIII\Support\Domain;
 use Illuminate\Http\Request;
 
-
 /**
  * Class Binder
  *

app/Http/Middleware/Range.php

@@ -35,7 +35,6 @@ use Preferences;
 use Session;
 use View;
 
-
 /**
  * Class SessionFilter
  *
@@ -85,7 +84,6 @@ class Range
         }
 
         return $next($request);
-
     }
 
     /**
@@ -132,7 +130,6 @@ class Range
     {
         // ignore preference. set the range to be the current month:
         if (!Session::has('start') && !Session::has('end')) {
-
             $viewRange = Preferences::get('viewRange', '1M')->data;
             $start     = new Carbon;
             $start     = Navigation::updateStartDate($viewRange, $start);
@@ -153,5 +150,4 @@ class Range
             Session::put('first', $first);
         }
     }
-
 }

app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php

@@ -28,7 +28,6 @@ use Cookie;
 use Illuminate\Support\Facades\Auth;
 use Preferences;
 
-
 /**
  * Class RedirectIfTwoFactorAuthenticated
  *
@@ -48,7 +47,6 @@ class RedirectIfTwoFactorAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-
             $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
             $has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
 

app/Http/Middleware/Sandstorm.php

@@ -117,7 +117,6 @@ class Sandstorm
             if ($count > 1) {
                 throw new FireflyException('Your Firefly III installation has more than one user, which is weird.');
             }
-
         }
 
         return $next($request);

app/Http/Middleware/StartFireflySession.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
-
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Session\Middleware\StartSession;

app/Http/Requests/ImportUploadRequest.php

@@ -53,6 +53,5 @@ class ImportUploadRequest extends Request
             'import_file_type'   => 'required|in:' . join(',', $types),
             'configuration_file' => 'file',
         ];
-
     }
 }

app/Http/Requests/PiggyBankFormRequest.php

@@ -62,7 +62,6 @@ class PiggyBankFormRequest extends Request
      */
     public function rules()
     {
-
         $nameRule = 'required|between:1,255|uniquePiggyBankForUser';
         if (intval($this->get('id'))) {
             $nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval($this->get('id'));

app/Http/Requests/ReportFormRequest.php

@@ -183,5 +183,4 @@ class ReportFormRequest extends Request
             'report_type' => 'in:audit,default,category,budget,tag',
         ];
     }
-
 }

app/Http/Requests/TagFormRequest.php

@@ -67,8 +67,6 @@ class TagFormRequest extends Request
         ];
 
         return $data;
-
-
     }
 
     /**

app/Import/Configurator/ConfiguratorInterface.php

@@ -80,5 +80,4 @@ interface ConfiguratorInterface
      * @return void
      */
     public function setJob(ImportJob $job);
-
 }

app/Import/Configurator/CsvConfigurator.php

@@ -87,7 +87,6 @@ class CsvConfigurator implements ConfiguratorInterface
         $object->setJob($job);
 
         return $object->getData();
-
     }
 
     /**

app/Import/Converter/Amount.php

@@ -93,6 +93,5 @@ class Amount implements ConverterInterface
         }
 
         return strval(round(floatval($value), 12));
-
     }
 }

app/Import/Converter/INGDebetCredit.php

@@ -51,6 +51,5 @@ class INGDebetCredit implements ConverterInterface
         Log::debug('Return 1');
 
         return 1;
-
     }
 }

app/Import/FileProcessor/CsvProcessor.php

@@ -285,7 +285,6 @@ class CsvProcessor implements FileProcessorInterface
         }
 
         return false;
-
     }
 
     /**
@@ -301,7 +300,6 @@ class CsvProcessor implements FileProcessorInterface
         $config = $this->job->configuration;
         $names  = array_keys($config['specifics']);
         foreach ($names as $name) {
-
             if (!in_array($name, $this->validSpecifics)) {
                 throw new FireflyException(sprintf('"%s" is not a valid class name', $name));
             }
@@ -314,6 +312,5 @@ class CsvProcessor implements FileProcessorInterface
         }
 
         return $row;
-
     }
 }

app/Import/Mapper/AssetAccountIbans.php

@@ -63,6 +63,5 @@ class AssetAccountIbans implements MapperInterface
         $list = [0 => trans('csv.map_do_not_map')] + $list;
 
         return $list;
-
     }
 }

app/Import/Mapper/AssetAccounts.php

@@ -60,6 +60,5 @@ class AssetAccounts implements MapperInterface
         $list = [0 => trans('csv.map_do_not_map')] + $list;
 
         return $list;
-
     }
 }

app/Import/Mapper/Bills.php

@@ -53,6 +53,5 @@ class Bills implements MapperInterface
         $list = [0 => trans('csv.map_do_not_map')] + $list;
 
         return $list;
-
     }
 }

app/Import/Mapper/Budgets.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Import\Mapper;
 
-
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 
@@ -54,6 +53,5 @@ class Budgets implements MapperInterface
         $list = [0 => trans('csv.map_do_not_map')] + $list;
 
         return $list;
-
     }
 }

app/Import/Mapper/Categories.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Import\Mapper;
 
-
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 
@@ -54,6 +53,5 @@ class Categories implements MapperInterface
         $list = [0 => trans('csv.map_do_not_map')] + $list;
 
         return $list;
-
     }
 }