Code cleanup.

app/Http/Controllers/Transaction/BulkController.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
+
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\BulkEditJournalRequest;
 use FireflyIII\Models\TransactionJournal;
@@ -38,6 +39,7 @@ class BulkController extends Controller
 {
     /** @var JournalRepositoryInterface Journals and transactions overview */
     private $repository;
+
     /**
      * BulkController constructor.
      *
@@ -78,10 +80,11 @@ class BulkController extends Controller
         // get list of budgets:
         /** @var BudgetRepositoryInterface $budgetRepos */
         $budgetRepos = app(BudgetRepositoryInterface::class);
-        $budgetList = app('expandedform')->makeSelectListWithEmpty($budgetRepos->getActiveBudgets());
+        $budgetList  = app('expandedform')->makeSelectListWithEmpty($budgetRepos->getActiveBudgets());
 
         return prefixView('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
     }
+
     /**
      * Update all journals.
      *
@@ -136,24 +139,6 @@ class BulkController extends Controller
         return true;
     }
 
-    /**
-     * @param TransactionJournal $journal
-     * @param bool               $ignoreUpdate
-     * @param string             $category
-     *
-     * @return bool
-     */
-    private function updateJournalCategory(TransactionJournal $journal, bool $ignoreUpdate, string $category): bool
-    {
-        if (true === $ignoreUpdate) {
-            return false;
-        }
-        Log::debug(sprintf('Set budget to %s', $category));
-        $this->repository->updateCategory($journal, $category);
-
-        return true;
-    }
-
     /**
      * @param TransactionJournal $journal
      * @param string             $action
@@ -172,6 +157,25 @@ class BulkController extends Controller
             $new      = array_unique(array_merge($tags, $existing));
             $this->repository->updateTags($journal, $new);
         }
+
+        return true;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     * @param bool               $ignoreUpdate
+     * @param string             $category
+     *
+     * @return bool
+     */
+    private function updateJournalCategory(TransactionJournal $journal, bool $ignoreUpdate, string $category): bool
+    {
+        if (true === $ignoreUpdate) {
+            return false;
+        }
+        Log::debug(sprintf('Set budget to %s', $category));
+        $this->repository->updateCategory($journal, $category);
+
         return true;
     }
 }

app/Http/Controllers/Transaction/ConvertController.php

@@ -38,9 +38,11 @@ use FireflyIII\Support\Http\Controllers\ModelInformation;
 use FireflyIII\Support\Http\Controllers\UserNavigation;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\Validation\AccountValidator;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\View\View;
 use Log;
 
 /**
@@ -52,8 +54,8 @@ class ConvertController extends Controller
 {
     use ModelInformation, UserNavigation;
 
-    private JournalRepositoryInterface $repository;
     private AccountRepositoryInterface $accountRepository;
+    private JournalRepositoryInterface $repository;
 
     /**
      * ConvertController constructor.
@@ -76,13 +78,14 @@ class ConvertController extends Controller
             }
         );
     }
+
     /**
      * Show overview of a to be converted transaction.
      *
      * @param TransactionType  $destinationType
      * @param TransactionGroup $group
      *
-     * @return RedirectResponse|Redirector|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return RedirectResponse|Redirector|Factory|View
      * @throws Exception
      *
      */
@@ -141,6 +144,137 @@ class ConvertController extends Controller
         );
     }
 
+    /**
+     * @return array
+     */
+    private function getValidDepositSources(): array
+    {
+        // make repositories
+        $liabilityTypes = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN];
+        $accountList    = $this->accountRepository
+            ->getActiveAccountsByType([AccountType::REVENUE, AccountType::CASH, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
+        $grouped        = [];
+        // group accounts:
+        /** @var Account $account */
+        foreach ($accountList as $account) {
+            $role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
+            $name = $account->name;
+            if ('' === $role) {
+                $role = 'no_account_type'; // @codeCoverageIgnore
+            }
+
+            // maybe it's a liability thing:
+            if (in_array($account->accountType->type, $liabilityTypes, true)) {
+                $role = 'l_' . $account->accountType->type; // @codeCoverageIgnore
+            }
+            if (AccountType::CASH === $account->accountType->type) {
+                // @codeCoverageIgnoreStart
+                $role = 'cash_account';
+                $name = sprintf('(%s)', trans('firefly.cash'));
+                // @codeCoverageIgnoreEnd
+            }
+            if (AccountType::REVENUE === $account->accountType->type) {
+                $role = 'revenue_account'; // @codeCoverageIgnore
+            }
+
+            $key                         = (string)trans('firefly.opt_group_' . $role);
+            $grouped[$key][$account->id] = $name;
+        }
+
+        return $grouped;
+    }
+
+    /**
+     * @return array
+     */
+    private function getValidWithdrawalDests(): array
+    {
+        // make repositories
+        $liabilityTypes = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN];
+        $accountList    = $this->accountRepository->getActiveAccountsByType(
+            [AccountType::EXPENSE, AccountType::CASH, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]
+        );
+        $grouped        = [];
+        // group accounts:
+        /** @var Account $account */
+        foreach ($accountList as $account) {
+            $role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
+            $name = $account->name;
+            if ('' === $role) {
+                $role = 'no_account_type'; // @codeCoverageIgnore
+            }
+
+            // maybe it's a liability thing:
+            if (in_array($account->accountType->type, $liabilityTypes, true)) {
+                $role = 'l_' . $account->accountType->type; // @codeCoverageIgnore
+            }
+            if (AccountType::CASH === $account->accountType->type) {
+                // @codeCoverageIgnoreStart
+                $role = 'cash_account';
+                $name = sprintf('(%s)', trans('firefly.cash'));
+                // @codeCoverageIgnoreEnd
+            }
+            if (AccountType::EXPENSE === $account->accountType->type) {
+                $role = 'expense_account'; // @codeCoverageIgnore
+            }
+
+            $key                         = (string)trans('firefly.opt_group_' . $role);
+            $grouped[$key][$account->id] = $name;
+        }
+
+        return $grouped;
+    }
+
+    /**
+     * @return array
+     * @throws Exception
+     */
+    private function getLiabilities(): array
+    {
+        // make repositories
+        $accountList     = $this->accountRepository->getActiveAccountsByType([AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $grouped         = [];
+        // group accounts:
+        /** @var Account $account */
+        foreach ($accountList as $account) {
+            $balance                     = app('steam')->balance($account, today());
+            $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
+            $role                        = 'l_' . $account->accountType->type;
+            $key                         = (string)trans('firefly.opt_group_' . $role);
+            $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')';
+        }
+
+        return $grouped;
+    }
+
+    /**
+     * @return array
+     * @throws Exception
+     */
+    private function getAssetAccounts(): array
+    {
+        // make repositories
+        $accountList     = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET]);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $grouped         = [];
+        // group accounts:
+        /** @var Account $account */
+        foreach ($accountList as $account) {
+            $balance  = app('steam')->balance($account, today());
+            $currency = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
+            $role     = (string)$this->accountRepository->getMetaValue($account, 'account_role');
+            if ('' === $role) {
+                $role = 'no_account_type'; // @codeCoverageIgnore
+            }
+
+            $key                         = (string)trans('firefly.opt_group_' . $role);
+            $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')';
+        }
+
+        return $grouped;
+    }
+
     /**
      * Do the conversion.
      *
@@ -232,135 +366,4 @@ class ConvertController extends Controller
 
         return $journal;
     }
-
-    /**
-     * @return array
-     * @throws Exception
-     */
-    private function getAssetAccounts(): array
-    {
-        // make repositories
-        $accountList       = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET]);
-        $defaultCurrency   = app('amount')->getDefaultCurrency();
-        $grouped           = [];
-        // group accounts:
-        /** @var Account $account */
-        foreach ($accountList as $account) {
-            $balance  = app('steam')->balance($account, today());
-            $currency = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
-            $role     = (string)$this->accountRepository->getMetaValue($account, 'account_role');
-            if ('' === $role) {
-                $role = 'no_account_type'; // @codeCoverageIgnore
-            }
-
-            $key                         = (string)trans('firefly.opt_group_' . $role);
-            $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')';
-        }
-
-        return $grouped;
-    }
-
-    /**
-     * @return array
-     * @throws Exception
-     */
-    private function getLiabilities(): array
-    {
-        // make repositories
-        $accountList       = $this->accountRepository->getActiveAccountsByType([AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
-        $defaultCurrency   = app('amount')->getDefaultCurrency();
-        $grouped           = [];
-        // group accounts:
-        /** @var Account $account */
-        foreach ($accountList as $account) {
-            $balance                     = app('steam')->balance($account, today());
-            $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
-            $role                        = 'l_' . $account->accountType->type;
-            $key                         = (string)trans('firefly.opt_group_' . $role);
-            $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')';
-        }
-
-        return $grouped;
-    }
-
-    /**
-     * @return array
-     */
-    private function getValidDepositSources(): array
-    {
-        // make repositories
-        $liabilityTypes    = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN];
-        $accountList       = $this->accountRepository
-            ->getActiveAccountsByType([AccountType::REVENUE, AccountType::CASH, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
-        $grouped           = [];
-        // group accounts:
-        /** @var Account $account */
-        foreach ($accountList as $account) {
-            $role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
-            $name = $account->name;
-            if ('' === $role) {
-                $role = 'no_account_type'; // @codeCoverageIgnore
-            }
-
-            // maybe it's a liability thing:
-            if (in_array($account->accountType->type, $liabilityTypes, true)) {
-                $role = 'l_' . $account->accountType->type; // @codeCoverageIgnore
-            }
-            if (AccountType::CASH === $account->accountType->type) {
-                // @codeCoverageIgnoreStart
-                $role = 'cash_account';
-                $name = sprintf('(%s)', trans('firefly.cash'));
-                // @codeCoverageIgnoreEnd
-            }
-            if (AccountType::REVENUE === $account->accountType->type) {
-                $role = 'revenue_account'; // @codeCoverageIgnore
-            }
-
-            $key                         = (string)trans('firefly.opt_group_' . $role);
-            $grouped[$key][$account->id] = $name;
-        }
-
-        return $grouped;
-    }
-
-    /**
-     * @return array
-     */
-    private function getValidWithdrawalDests(): array
-    {
-        // make repositories
-        $liabilityTypes    = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN];
-        $accountList       = $this->accountRepository->getActiveAccountsByType(
-            [AccountType::EXPENSE, AccountType::CASH, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]
-        );
-        $grouped           = [];
-        // group accounts:
-        /** @var Account $account */
-        foreach ($accountList as $account) {
-            $role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
-            $name = $account->name;
-            if ('' === $role) {
-                $role = 'no_account_type'; // @codeCoverageIgnore
-            }
-
-            // maybe it's a liability thing:
-            if (in_array($account->accountType->type, $liabilityTypes, true)) {
-                $role = 'l_' . $account->accountType->type; // @codeCoverageIgnore
-            }
-            if (AccountType::CASH === $account->accountType->type) {
-                // @codeCoverageIgnoreStart
-                $role = 'cash_account';
-                $name = sprintf('(%s)', trans('firefly.cash'));
-                // @codeCoverageIgnoreEnd
-            }
-            if (AccountType::EXPENSE === $account->accountType->type) {
-                $role = 'expense_account'; // @codeCoverageIgnore
-            }
-
-            $key                         = (string)trans('firefly.opt_group_' . $role);
-            $grouped[$key][$account->id] = $name;
-        }
-
-        return $grouped;
-    }
 }

app/Http/Controllers/Transaction/CreateController.php

@@ -49,7 +49,7 @@ class CreateController extends Controller
 
         $this->middleware(
             static function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 return $next($request);
@@ -75,7 +75,7 @@ class CreateController extends Controller
         app('preferences')->mark();
 
         $title = $newGroup->title ?? $newGroup->transactionJournals->first()->description;
-        $link = route('transactions.show', [$newGroup->id]);
+        $link  = route('transactions.show', [$newGroup->id]);
         session()->flash('success', trans('firefly.stored_journal', ['description' => $title]));
         session()->flash('success_uri', $link);
 
@@ -93,14 +93,14 @@ class CreateController extends Controller
     {
         app('preferences')->mark();
 
-        $sourceId      = (int) request()->get('source');
-        $destinationId = (int) request()->get('destination');
+        $sourceId      = (int)request()->get('source');
+        $destinationId = (int)request()->get('destination');
 
         /** @var AccountRepositoryInterface $repository */
         $repository           = app(AccountRepositoryInterface::class);
         $cash                 = $repository->getCashAccount();
         $preFilled            = session()->has('preFilled') ? session('preFilled') : [];
-        $subTitle             = (string) trans('breadcrumbs.create_new_transaction');
+        $subTitle             = (string)trans('breadcrumbs.create_new_transaction');
         $subTitleIcon         = 'fa-plus';
         $optionalFields       = app('preferences')->get('transaction_journal_optional_fields', [])->data;
         $allowedOpposingTypes = config('firefly.allowed_opposing_types');
@@ -112,6 +112,7 @@ class CreateController extends Controller
         $previousUri          = str_replace($search, '', $previousUri);
 
         session()->put('preFilled', $preFilled);
+
         return prefixView(
             'transactions.create',
             compact(

app/Http/Controllers/Transaction/DeleteController.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
+
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
@@ -38,6 +39,7 @@ use URL;
 class DeleteController extends Controller
 {
     use UserNavigation;
+
     /** @var TransactionGroupRepositoryInterface */
     private $repository;
 
@@ -53,7 +55,7 @@ class DeleteController extends Controller
         // translations:
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 $this->repository = app(TransactionGroupRepositoryInterface::class);
@@ -83,7 +85,7 @@ class DeleteController extends Controller
             throw new NotFoundHttpException;
         }
         $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
-        $subTitle   = (string) trans('firefly.delete_' . $objectType, ['description' => $group->title ?? $journal->description]);
+        $subTitle   = (string)trans('firefly.delete_' . $objectType, ['description' => $group->title ?? $journal->description]);
         $previous   = URL::previous(route('index'));
         // put previous url in session
         Log::debug('Will try to remember previous URI');
@@ -110,7 +112,7 @@ class DeleteController extends Controller
             throw new NotFoundHttpException;
         }
         $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
-        session()->flash('success', (string) trans('firefly.deleted_' . strtolower($objectType), ['description' => $group->title ?? $journal->description]));
+        session()->flash('success', (string)trans('firefly.deleted_' . strtolower($objectType), ['description' => $group->title ?? $journal->description]));
 
         $this->repository->destroy($group);
 

app/Http/Controllers/Transaction/EditController.php

@@ -22,11 +22,14 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
+
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\UserNavigation;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 
 /**
@@ -49,17 +52,18 @@ class EditController extends Controller
         $this->middleware(
             static function ($request, $next) {
 
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 return $next($request);
             }
         );
     }
+
     /**
      * @param TransactionGroup $transactionGroup
      *
-     * @return Factory|View|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return Factory|View|RedirectResponse|Redirector
      */
     public function edit(TransactionGroup $transactionGroup)
     {
@@ -83,6 +87,7 @@ class EditController extends Controller
         $parts           = parse_url($previousUri);
         $search          = sprintf('?%s', $parts['query'] ?? '');
         $previousUri     = str_replace($search, '', $previousUri);
+
         return prefixView(
             'transactions.edit',
             compact(

app/Http/Controllers/Transaction/IndexController.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
+
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -54,7 +55,7 @@ class IndexController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-exchange');
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
 
                 $this->repository = app(JournalRepositoryInterface::class);
 
@@ -71,15 +72,15 @@ class IndexController extends Controller
      * @param Carbon|null $start
      * @param Carbon|null $end
      *
-     * @throws Exception
      * @return Factory|View
+     * @throws Exception
      */
     public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
     {
         $subTitleIcon = config('firefly.transactionIconsByType.' . $objectType);
         $types        = config('firefly.transactionTypesByType.' . $objectType);
-        $page         = (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page         = (int)$request->get('page');
+        $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
         if (null === $start) {
             $start = session('start');
             $end   = session('end');
@@ -94,7 +95,7 @@ class IndexController extends Controller
         $path     = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $startStr = $start->formatLocalized($this->monthAndDayFormat);
         $endStr   = $end->formatLocalized($this->monthAndDayFormat);
-        $subTitle = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
+        $subTitle = (string)trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
 
         $firstJournal = $this->repository->firstNull();
         $startPeriod  = null === $firstJournal ? new Carbon : $firstJournal->date;
@@ -124,21 +125,21 @@ class IndexController extends Controller
      * @param Request $request
      * @param string  $objectType
      *
-     * @throws Exception
      * @return Factory|View
+     * @throws Exception
      */
     public function indexAll(Request $request, string $objectType)
     {
         $subTitleIcon = config('firefly.transactionIconsByType.' . $objectType);
         $types        = config('firefly.transactionTypesByType.' . $objectType);
-        $page         = (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page         = (int)$request->get('page');
+        $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
         $path         = route('transactions.index.all', [$objectType]);
         $first        = $this->repository->firstNull();
         $start        = null === $first ? new Carbon : $first->date;
         $last         = $this->repository->getLast();
         $end          = $last ? $last->date : today(config('app.timezone'));
-        $subTitle     = (string) trans('firefly.all_' . $objectType);
+        $subTitle     = (string)trans('firefly.all_' . $objectType);
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);

app/Http/Controllers/Transaction/LinkController.php

@@ -40,7 +40,7 @@ use URL;
  */
 class LinkController extends Controller
 {
-    private JournalRepositoryInterface $journalRepository;
+    private JournalRepositoryInterface  $journalRepository;
     private LinkTypeRepositoryInterface $repository;
 
     /**
@@ -54,7 +54,7 @@ class LinkController extends Controller
         // some useful repositories:
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 $this->journalRepository = app(JournalRepositoryInterface::class);
@@ -75,7 +75,7 @@ class LinkController extends Controller
     public function delete(TransactionJournalLink $link)
     {
         $subTitleIcon = 'fa-link';
-        $subTitle     = (string) trans('breadcrumbs.delete_journal_link');
+        $subTitle     = (string)trans('breadcrumbs.delete_journal_link');
         $this->rememberPreviousUri('journal_links.delete.uri');
 
         return prefixView('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
@@ -92,10 +92,10 @@ class LinkController extends Controller
     {
         $this->repository->destroyLink($link);
 
-        session()->flash('success', (string) trans('firefly.deleted_link'));
+        session()->flash('success', (string)trans('firefly.deleted_link'));
         app('preferences')->mark();
 
-        return redirect((string) session('journal_links.delete.uri'));
+        return redirect((string)session('journal_links.delete.uri'));
     }
 
     /**
@@ -125,7 +125,7 @@ class LinkController extends Controller
         Log::debug('We are here (store)');
         $other = $this->journalRepository->findNull($linkInfo['transaction_journal_id']);
         if (null === $other) {
-            session()->flash('error', (string) trans('firefly.invalid_link_selection'));
+            session()->flash('error', (string)trans('firefly.invalid_link_selection'));
 
             return redirect(route('transactions.show', [$journal->transaction_group_id]));
         }
@@ -133,19 +133,19 @@ class LinkController extends Controller
         $alreadyLinked = $this->repository->findLink($journal, $other);
 
         if ($other->id === $journal->id) {
-            session()->flash('error', (string) trans('firefly.journals_link_to_self'));
+            session()->flash('error', (string)trans('firefly.journals_link_to_self'));
 
             return redirect(route('transactions.show', [$journal->transaction_group_id]));
         }
 
         if ($alreadyLinked) {
-            session()->flash('error', (string) trans('firefly.journals_error_linked'));
+            session()->flash('error', (string)trans('firefly.journals_error_linked'));
 
             return redirect(route('transactions.show', [$journal->transaction_group_id]));
         }
         Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id));
         $this->repository->storeLink($linkInfo, $other, $journal);
-        session()->flash('success', (string) trans('firefly.journals_linked'));
+        session()->flash('success', (string)trans('firefly.journals_linked'));
 
         return redirect(route('transactions.show', [$journal->transaction_group_id]));
     }

app/Http/Controllers/Transaction/MassController.php

@@ -60,7 +60,7 @@ class MassController extends Controller
 
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
                 $this->repository = app(JournalRepositoryInterface::class);
 
@@ -78,7 +78,7 @@ class MassController extends Controller
      */
     public function delete(array $journals): IlluminateView
     {
-        $subTitle = (string) trans('firefly.mass_delete_journals');
+        $subTitle = (string)trans('firefly.mass_delete_journals');
 
         // put previous url in session
         $this->rememberPreviousUri('transactions.mass-delete.uri');
@@ -103,15 +103,15 @@ class MassController extends Controller
             foreach ($ids as $journalId) {
 
                 /** @var TransactionJournal $journal */
-                $journal = $this->repository->findNull((int) $journalId);
-                if (null !== $journal && (int) $journalId === $journal->id) {
+                $journal = $this->repository->findNull((int)$journalId);
+                if (null !== $journal && (int)$journalId === $journal->id) {
                     $this->repository->destroyJournal($journal);
                     ++$count;
                 }
             }
         }
         app('preferences')->mark();
-        session()->flash('success', (string) trans_choice('firefly.mass_deleted_transactions_success', $count));
+        session()->flash('success', (string)trans_choice('firefly.mass_deleted_transactions_success', $count));
 
         // redirect to previous URL:
         return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
@@ -126,7 +126,7 @@ class MassController extends Controller
      */
     public function edit(array $journals): IlluminateView
     {
-        $subTitle = (string) trans('firefly.mass_edit_journals');
+        $subTitle = (string)trans('firefly.mass_edit_journals');
 
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository = app(AccountRepositoryInterface::class);
@@ -160,8 +160,8 @@ class MassController extends Controller
      *
      * @param MassEditJournalRequest $request
      *
-     * @throws FireflyException
      * @return RedirectResponse|Redirector
+     * @throws FireflyException
      */
     public function update(MassEditJournalRequest $request)
     {
@@ -173,7 +173,7 @@ class MassController extends Controller
         $count = 0;
         /** @var string $journalId */
         foreach ($journalIds as $journalId) {
-            $integer = (int) $journalId;
+            $integer = (int)$journalId;
             try {
                 $this->updateJournal($integer, $request);
                 $count++;
@@ -183,82 +183,12 @@ class MassController extends Controller
         }
 
         app('preferences')->mark();
-        session()->flash('success', (string) trans_choice('firefly.mass_edited_transactions_success', $count ));
+        session()->flash('success', (string)trans_choice('firefly.mass_edited_transactions_success', $count));
 
         // redirect to previous URL:
         return redirect($this->getPreviousUri('transactions.mass-edit.uri'));
     }
 
-    /**
-     * @param MassEditJournalRequest $request
-     * @param int                    $journalId
-     * @param string                 $string
-     *
-     * @return Carbon|null
-     * @codeCoverageIgnore
-     */
-    private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?Carbon
-    {
-        $value = $request->get($string);
-        if (!is_array($value)) {
-            return null;
-        }
-        if (!isset($value[$journalId])) {
-            return null;
-        }
-        try {
-            $carbon = Carbon::parse($value[$journalId]);
-        } catch (InvalidArgumentException $e) {
-            $e->getMessage();
-
-            return null;
-        }
-
-        return $carbon;
-    }
-
-    /**
-     * @param MassEditJournalRequest $request
-     * @param int                    $journalId
-     * @param string                 $string
-     *
-     * @return int|null
-     * @codeCoverageIgnore
-     */
-    private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int
-    {
-        $value = $request->get($string);
-        if (!is_array($value)) {
-            return null;
-        }
-        if (!isset($value[$journalId])) {
-            return null;
-        }
-
-        return (int) $value[$journalId];
-    }
-
-    /**
-     * @param MassEditJournalRequest $request
-     * @param int                    $journalId
-     * @param string                 $string
-     *
-     * @return string|null
-     * @codeCoverageIgnore
-     */
-    private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string
-    {
-        $value = $request->get($string);
-        if (!is_array($value)) {
-            return null;
-        }
-        if (!isset($value[$journalId])) {
-            return null;
-        }
-
-        return (string) $value[$journalId];
-    }
-
     /**
      * @param int                    $journalId
      * @param MassEditJournalRequest $request
@@ -295,4 +225,74 @@ class MassController extends Controller
         // trigger rules
         event(new UpdatedTransactionGroup($journal->transactionGroup));
     }
+
+    /**
+     * @param MassEditJournalRequest $request
+     * @param int                    $journalId
+     * @param string                 $string
+     *
+     * @return Carbon|null
+     * @codeCoverageIgnore
+     */
+    private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?Carbon
+    {
+        $value = $request->get($string);
+        if (!is_array($value)) {
+            return null;
+        }
+        if (!isset($value[$journalId])) {
+            return null;
+        }
+        try {
+            $carbon = Carbon::parse($value[$journalId]);
+        } catch (InvalidArgumentException $e) {
+            $e->getMessage();
+
+            return null;
+        }
+
+        return $carbon;
+    }
+
+    /**
+     * @param MassEditJournalRequest $request
+     * @param int                    $journalId
+     * @param string                 $string
+     *
+     * @return string|null
+     * @codeCoverageIgnore
+     */
+    private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string
+    {
+        $value = $request->get($string);
+        if (!is_array($value)) {
+            return null;
+        }
+        if (!isset($value[$journalId])) {
+            return null;
+        }
+
+        return (string)$value[$journalId];
+    }
+
+    /**
+     * @param MassEditJournalRequest $request
+     * @param int                    $journalId
+     * @param string                 $string
+     *
+     * @return int|null
+     * @codeCoverageIgnore
+     */
+    private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int
+    {
+        $value = $request->get($string);
+        if (!is_array($value)) {
+            return null;
+        }
+        if (!isset($value[$journalId])) {
+            return null;
+        }
+
+        return (int)$value[$journalId];
+    }
 }

app/Http/Controllers/Transaction/ShowController.php

@@ -54,7 +54,7 @@ class ShowController extends Controller
             function ($request, $next) {
                 $this->repository = app(TransactionGroupRepositoryInterface::class);
 
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 return $next($request);
@@ -75,8 +75,8 @@ class ShowController extends Controller
     /**
      * @param TransactionGroup $transactionGroup
      *
-     * @throws FireflyException
      * @return Factory|View
+     * @throws FireflyException
      */
     public function show(Request $request, TransactionGroup $transactionGroup)
     {
@@ -88,7 +88,7 @@ class ShowController extends Controller
             throw new FireflyException('This transaction is broken :(.');
         }
 
-        $type     = (string) trans(sprintf('firefly.%s', $first->transactionType->type));
+        $type     = (string)trans(sprintf('firefly.%s', $first->transactionType->type));
         $title    = 1 === $splits ? $first->description : $transactionGroup->title;
         $subTitle = sprintf('%s: "%s"', $type, $title);
 
@@ -98,7 +98,7 @@ class ShowController extends Controller
         $groupArray = $transformer->transformObject($transactionGroup);
 
         // do some calculations:
-        $amounts = $this->getAmounts($groupArray);
+        $amounts  = $this->getAmounts($groupArray);
         $accounts = $this->getAccounts($groupArray);
 
         foreach ($groupArray['transactions'] as $index => $transaction) {
@@ -161,7 +161,7 @@ class ShowController extends Controller
 
         return $amounts;
     }
-    
+
     /**
      * @param array $group
      *
@@ -170,22 +170,23 @@ class ShowController extends Controller
     private function getAccounts(array $group): array
     {
         $accounts = [];
-        
+
         foreach ($group['transactions'] as $transaction) {
-            $accounts['source'][] = [ 
+            $accounts['source'][]      = [
                 'type' => $transaction['source_type'],
-                'id' => $transaction['source_id'],
+                'id'   => $transaction['source_id'],
                 'name' => $transaction['source_name'],
-                'iban' => $transaction['source_iban'] ];
-            $accounts['destination'][] = [ 
+                'iban' => $transaction['source_iban']];
+            $accounts['destination'][] = [
                 'type' => $transaction['destination_type'],
-                'id' => $transaction['destination_id'],
+                'id'   => $transaction['destination_id'],
                 'name' => $transaction['destination_name'],
-                'iban' => $transaction['destination_iban'] ];
+                'iban' => $transaction['destination_iban']];
         }
 
-        $accounts['source'] = array_unique($accounts['source'], SORT_REGULAR);
+        $accounts['source']      = array_unique($accounts['source'], SORT_REGULAR);
         $accounts['destination'] = array_unique($accounts['destination'], SORT_REGULAR);
+
         return $accounts;
     }
 }