Code reordering and reformatting. I should really start employing style CI.

app/Api/V1/Controllers/Autocomplete/CurrencyController.php

@@ -88,8 +88,9 @@ class CurrencyController extends Controller
      * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC
      *
      * @param AutocompleteRequest $request
-     * @deprecated
+     *
      * @return JsonResponse
+     * @deprecated
      */
     public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
     {

app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php

@@ -58,6 +58,7 @@ class ObjectGroupController extends Controller
     /**
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC
+     *
      * @param AutocompleteRequest $request
      *
      * @return JsonResponse

app/Api/V1/Controllers/Chart/AccountController.php

@@ -107,7 +107,7 @@ class AccountController extends Controller
             if (null === $currency) {
                 $currency = $default;
             }
-            $currentSet = [
+            $currentSet   = [
                 'label'                   => $account->name,
                 'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,

app/Api/V1/Controllers/Controller.php

@@ -46,8 +46,8 @@ abstract class Controller extends BaseController
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
     protected const CONTENT_TYPE = 'application/vnd.api+json';
-    protected ParameterBag $parameters;
     protected array        $allowedSort;
+    protected ParameterBag $parameters;
 
     /**
      * Controller constructor.
@@ -92,7 +92,7 @@ abstract class Controller extends BaseController
             if (null !== $date) {
                 try {
                     $obj = Carbon::parse($date);
-                } catch (InvalidDateException|InvalidFormatException $e) {
+                } catch (InvalidDateException | InvalidFormatException $e) {
                     // don't care
                     Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
                 }

app/Api/V1/Controllers/Data/Bulk/AccountController.php

@@ -58,10 +58,11 @@ class AccountController extends Controller
 
     /**
      * This endpoint is deprecated and not documented.
-     * @deprecated
+     *
      * @param MoveTransactionsRequest $request
      *
      * @return JsonResponse
+     * @deprecated
      */
     public function moveTransactions(MoveTransactionsRequest $request): JsonResponse
     {

app/Api/V1/Controllers/Data/Export/ExportController.php

@@ -78,9 +78,9 @@ class ExportController extends Controller
      */
     private function returnExport(string $key): LaravelResponse
     {
-        $date     = date('Y-m-d-H-i-s');
+        $date = date('Y-m-d-H-i-s');
         $fileName = sprintf('%s-export-%s.csv', $date, $key);
-        $data     = $this->exporter->export();
+        $data = $this->exporter->export();
 
         /** @var LaravelResponse $response */
         $response = response($data[$key]);

app/Api/V1/Controllers/Insight/Transfer/AccountController.php

@@ -71,6 +71,7 @@ class AccountController extends Controller
         $end           = $request->getEnd();
         $assetAccounts = $request->getAssetAccounts();
         $transfers     = $this->opsRepository->sumTransfers($start, $end, $assetAccounts);
+
         return response()->json($transfers);
     }
 }

app/Api/V1/Controllers/Models/Account/ShowController.php

@@ -84,7 +84,7 @@ class ShowController extends Controller
         $this->parameters->set('type', $type);
 
         // types to get, page size:
-        $types    = $this->mapAccountTypes($this->parameters->get('type'));
+        $types = $this->mapAccountTypes($this->parameters->get('type'));
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of accounts. Count it and split it.
@@ -95,7 +95,7 @@ class ShowController extends Controller
         // continue sort:
 
 
-        $accounts   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // make paginator:
         $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));

app/Api/V1/Controllers/Models/Account/UpdateController.php

@@ -74,10 +74,10 @@ class UpdateController extends Controller
     public function update(UpdateRequest $request, Account $account): JsonResponse
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
-        $data         = $request->getUpdateData();
+        $data = $request->getUpdateData();
         $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
-        $account      = $this->repository->update($account, $data);
+        $account = $this->repository->update($account, $data);
-        $manager      = $this->getManager();
+        $manager = $this->getManager();
         $account->refresh();
         Preferences::mark();
 

app/Api/V1/Controllers/Models/Attachment/DestroyController.php

@@ -49,7 +49,7 @@ class DestroyController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user             = auth()->user();
+                $user = auth()->user();
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 

app/Api/V1/Controllers/Models/Attachment/UpdateController.php

@@ -52,7 +52,7 @@ class UpdateController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user             = auth()->user();
+                $user = auth()->user();
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 

app/Api/V1/Controllers/Models/AvailableBudget/DestroyController.php

@@ -47,7 +47,7 @@ class DestroyController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user               = auth()->user();
+                $user = auth()->user();
                 $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
                 $this->abRepository->setUser($user);
 

app/Api/V1/Controllers/Models/Bill/StoreController.php

@@ -69,8 +69,8 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        $data    = $request->getAll();
+        $data = $request->getAll();
-        $bill    = $this->repository->store($data);
+        $bill = $this->repository->store($data);
         $manager = $this->getManager();
 
         /** @var BillTransformer $transformer */

app/Api/V1/Controllers/Models/Bill/UpdateController.php

@@ -66,8 +66,8 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Bill $bill): JsonResponse
     {
-        $data    = $request->getAll();
+        $data = $request->getAll();
-        $bill    = $this->repository->update($bill, $data);
+        $bill = $this->repository->update($bill, $data);
         $manager = $this->getManager();
 
         /** @var BillTransformer $transformer */

app/Api/V1/Controllers/Models/Budget/ShowController.php

@@ -53,7 +53,7 @@ class ShowController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $this->repository   = app(BudgetRepositoryInterface::class);
+                $this->repository = app(BudgetRepositoryInterface::class);
                 $this->blRepository = app(BudgetLimitRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
                 $this->blRepository->setUser(auth()->user());

app/Api/V1/Controllers/Models/Category/UpdateController.php

@@ -66,9 +66,9 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Category $category): JsonResponse
     {
-        $data     = $request->getAll();
+        $data = $request->getAll();
         $category = $this->repository->update($category, $data);
-        $manager  = $this->getManager();
+        $manager = $this->getManager();
 
         /** @var CategoryTransformer $transformer */
         $transformer = app(CategoryTransformer::class);

app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php

@@ -47,7 +47,7 @@ class DestroyController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user             = auth()->user();
+                $user = auth()->user();
                 $this->repository = app(ObjectGroupRepositoryInterface::class);
                 $this->repository->setUser($user);
 

app/Api/V1/Controllers/Models/ObjectGroup/ListController.php

@@ -53,7 +53,7 @@ class ListController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user             = auth()->user();
+                $user = auth()->user();
                 $this->repository = app(ObjectGroupRepositoryInterface::class);
                 $this->repository->setUser($user);
 

app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php

@@ -50,7 +50,7 @@ class UpdateController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user             = auth()->user();
+                $user = auth()->user();
                 $this->repository = app(ObjectGroupRepositoryInterface::class);
                 $this->repository->setUser($user);
 

app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php

@@ -66,7 +66,7 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, PiggyBank $piggyBank): JsonResponse
     {
-        $data      = $request->getAll();
+        $data = $request->getAll();
         $piggyBank = $this->repository->update($piggyBank, $data);
 
         if (array_key_exists('current_amount', $data) && '' !== $data['current_amount']) {

app/Api/V1/Controllers/Models/Recurrence/StoreController.php

@@ -66,9 +66,9 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        $data       = $request->getAll();
+        $data = $request->getAll();
         $recurrence = $this->repository->store($data);
-        $manager    = $this->getManager();
+        $manager = $this->getManager();
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);

app/Api/V1/Controllers/Models/Recurrence/UpdateController.php

@@ -66,9 +66,9 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Recurrence $recurrence): JsonResponse
     {
-        $data       = $request->getAll();
+        $data = $request->getAll();
         $recurrence = $this->repository->update($recurrence, $data);
-        $manager    = $this->getManager();
+        $manager = $this->getManager();
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);

app/Api/V1/Controllers/Models/Rule/StoreController.php

@@ -68,7 +68,7 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        $rule    = $this->ruleRepository->store($request->getAll());
+        $rule = $this->ruleRepository->store($request->getAll());
         $manager = $this->getManager();
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);

app/Api/V1/Controllers/Models/Rule/UpdateController.php

@@ -70,8 +70,8 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Rule $rule): JsonResponse
     {
-        $data    = $request->getAll();
+        $data = $request->getAll();
-        $rule    = $this->ruleRepository->update($rule, $data);
+        $rule = $this->ruleRepository->update($rule, $data);
         $manager = $this->getManager();
 
         /** @var RuleTransformer $transformer */

app/Api/V1/Controllers/Models/RuleGroup/StoreController.php

@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
 class StoreController extends Controller
 {
 
-    private AccountRepositoryInterface   $accountRepository;
+    private AccountRepositoryInterface $accountRepository;
     private RuleGroupRepositoryInterface $ruleGroupRepository;
 
     /**

app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
+use Exception;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\RuleGroup\TestRequest;
 use FireflyIII\Api\V1\Requests\Models\RuleGroup\TriggerRequest;
@@ -36,7 +37,6 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use Exception;
 
 /**
  * Class TriggerController

app/Api/V1/Controllers/Models/Tag/StoreController.php

@@ -68,7 +68,7 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        $rule    = $this->repository->store($request->getAll());
+        $rule = $this->repository->store($request->getAll());
         $manager = $this->getManager();
         /** @var TagTransformer $transformer */
         $transformer = app(TagTransformer::class);

app/Api/V1/Controllers/Models/Tag/UpdateController.php

@@ -70,7 +70,7 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Tag $tag): JsonResponse
     {
-        $rule    = $this->repository->update($tag, $request->getAll());
+        $rule = $this->repository->update($tag, $request->getAll());
         $manager = $this->getManager();
         /** @var TagTransformer $transformer */
         $transformer = app(TagTransformer::class);

app/Api/V1/Controllers/Models/Transaction/StoreController.php

@@ -94,16 +94,16 @@ class StoreController extends Controller
             $validator = Validator::make(
                 ['transactions' => [['description' => $e->getMessage()]]], ['transactions.0.description' => new IsDuplicateTransaction]
             );
-            throw new ValidationException($validator,0, $e);
+            throw new ValidationException($validator, 0, $e);
         } catch (FireflyException $e) {
             Log::warning('Caught an exception. Return error message.');
             Log::error($e->getMessage());
             $message   = sprintf('Internal exception: %s', $e->getMessage());
             $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction]);
-            throw new ValidationException($validator,0, $e);
+            throw new ValidationException($validator, 0, $e);
         }
         app('preferences')->mark();
-        $applyRules = $data['apply_rules'] ?? true;
+        $applyRules   = $data['apply_rules'] ?? true;
         $fireWebhooks = $data['fire_webhooks'] ?? true;
         event(new StoredTransactionGroup($transactionGroup, $applyRules, $fireWebhooks));
 

app/Api/V1/Controllers/Models/Transaction/UpdateController.php

@@ -80,7 +80,7 @@ class UpdateController extends Controller
         $manager          = $this->getManager();
 
         app('preferences')->mark();
-        $applyRules = $data['apply_rules'] ?? true;
+        $applyRules   = $data['apply_rules'] ?? true;
         $fireWebhooks = $data['fire_webhooks'] ?? true;
         event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks));
 

app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php

@@ -50,7 +50,7 @@ class DestroyController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $this->repository     = app(CurrencyRepositoryInterface::class);
+                $this->repository = app(CurrencyRepositoryInterface::class);
                 $this->userRepository = app(UserRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 

app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -33,6 +34,7 @@ use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
 use Illuminate\Http\JsonResponse;
+use JsonException;
 use League\Fractal\Resource\Item;
 
 /**
@@ -126,7 +128,7 @@ class UpdateController extends Controller
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      * @codeCoverageIgnore
      */
     public function makeDefault(TransactionCurrency $currency): JsonResponse
@@ -157,8 +159,8 @@ class UpdateController extends Controller
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function update(UpdateRequest $request, TransactionCurrency $currency): JsonResponse
     {

app/Api/V1/Controllers/Models/TransactionLink/ShowController.php

@@ -84,8 +84,8 @@ class ShowController extends Controller
         $linkType = $this->repository->findByName($name);
 
         // get list of transaction links. Count it and split it.
-        $collection   = $this->repository->getJournalLinks($linkType);
+        $collection = $this->repository->getJournalLinks($linkType);
-        $count        = $collection->count();
+        $count = $collection->count();
         $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // make paginator:

app/Api/V1/Controllers/Webhook/ShowController.php

@@ -67,11 +67,11 @@ class ShowController extends Controller
      */
     public function index(): JsonResponse
     {
-        $manager    = $this->getManager();
+        $manager = $this->getManager();
         $collection = $this->repository->all();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $count      = $collection->count();
+        $count = $collection->count();
-        $webhooks   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $webhooks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // make paginator:
         $paginator = new LengthAwarePaginator($webhooks, $count, $pageSize, $this->parameters->get('page'));

app/Api/V1/Controllers/Webhook/StoreController.php

@@ -61,7 +61,7 @@ class StoreController extends Controller
      */
     public function store(CreateRequest $request): JsonResponse
     {
-        $data    = $request->getData();
+        $data = $request->getData();
         $webhook = $this->repository->store($data);
         $manager = $this->getManager();
         /** @var WebhookTransformer $transformer */

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -71,7 +71,7 @@ class UpdateRequest extends FormRequest
             'currency_id'             => ['currency_id', 'integer'],
             'currency_code'           => ['currency_code', 'string'],
             'liability_direction'     => ['liability_direction', 'string'],
-            'liability_amount'         => ['liability_amount', 'string'],
+            'liability_amount'        => ['liability_amount', 'string'],
             'liability_start_date'    => ['liability_start_date', 'date'],
         ];
         /** @var Account $account */

app/Api/V1/Requests/Models/Budget/UpdateRequest.php

@@ -78,6 +78,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         $budget = $this->route()->parameter('budget');
+
         return [
             'name'                      => sprintf('between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id),
             'active'                    => [new IsBoolean],

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -76,7 +76,7 @@ class UpdateRequest extends FormRequest
      * Configure the validator instance with special rules for after the basic validation rules.
      *
      * @param Validator $validator
-* See reference nr. 72
+     * See reference nr. 72
      *
      * @return void
      */

app/Api/V1/Requests/Models/Tag/UpdateRequest.php

@@ -65,7 +65,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         $tag = $this->route()->parameter('tagOrId');
-// See reference nr. 73
+        // See reference nr. 73
         $rules = [
             'tag'         => 'min:1|uniqueObjectForUser:tags,tag,' . $tag->id,
             'description' => 'min:1|nullable',

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -53,6 +53,7 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         Log::debug('get all data in TransactionStoreRequest');
+
         return [
             'group_title'             => $this->string('group_title'),
             'error_if_duplicate_hash' => $this->boolean('error_if_duplicate_hash'),
@@ -60,7 +61,7 @@ class StoreRequest extends FormRequest
             'fire_webhooks'           => $this->boolean('fire_webhooks', true),
             'transactions'            => $this->getTransactionData(),
         ];
-// See reference nr. 71
+        // See reference nr. 71
     }
 
     /**

app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php

@@ -55,7 +55,7 @@ class UpdateRequest extends FormRequest
         ];
 
         return $this->getAllData($fields);
-//        return $return;
+        //        return $return;
     }
 
     /**

app/Console/Commands/Correction/CorrectDatabase.php

@@ -76,7 +76,7 @@ class CorrectDatabase extends Command
             'firefly-iii:fix-recurring-transactions',
             'firefly-iii:restore-oauth-keys',
             'firefly-iii:fix-transaction-types',
-            'firefly-iii:fix-frontpage-accounts'
+            'firefly-iii:fix-frontpage-accounts',
         ];
         foreach ($commands as $command) {
             $this->line(sprintf('Now executing %s', $command));

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -106,7 +106,7 @@ class DeleteOrphanedTransactions extends Command
     private function deleteFromOrphanedAccounts(): void
     {
         $set
-               = Transaction
+            = Transaction
             ::leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
             ->whereNotNull('accounts.deleted_at')
             ->get(['transactions.*']);

app/Console/Commands/Correction/DeleteZeroAmount.php

@@ -53,9 +53,9 @@ class DeleteZeroAmount extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
+        $start    = microtime(true);
-        $set   = Transaction::where('amount', 0)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
+        $set      = Transaction::where('amount', 0)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
-        $set   = array_unique($set);
+        $set      = array_unique($set);
         $journals = TransactionJournal::whereIn('id', $set)->get();
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {

app/Console/Commands/Correction/EnableCurrencies.php

@@ -85,8 +85,8 @@ class EnableCurrencies extends Command
             $found[] = (int)$entry->transaction_currency_id;
         }
 
-        $found   = array_values(array_unique($found));
+        $found = array_values(array_unique($found));
-        $found   = array_values(
+        $found = array_values(
             array_filter(
                 $found, function (int $currencyId) {
                 return $currencyId !== 0;

app/Console/Commands/Correction/FixPiggies.php

@@ -57,7 +57,7 @@ class FixPiggies extends Command
     {
         $count = 0;
         $start = microtime(true);
-        $set         = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
+        $set   = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
 
         /** @var PiggyBankEvent $event */
         foreach ($set as $event) {

app/Console/Commands/Correction/FixPostgresSequences.php

@@ -125,7 +125,7 @@ class FixPostgresSequences extends Command
 
             $highestId = DB::table($tableToCheck)->select(DB::raw('MAX(id)'))->first();
             $nextId    = DB::table($tableToCheck)->select(DB::raw(sprintf('nextval(\'%s_id_seq\')', $tableToCheck)))->first();
-            if(null === $nextId) {
+            if (null === $nextId) {
                 $this->line(sprintf('nextval is NULL for table "%s", go to next table.', $tableToCheck));
                 continue;
             }

app/Console/Commands/Export/ExportData.php

@@ -36,7 +36,6 @@ use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use InvalidArgumentException;
-use League\Csv\CannotInsertRecord;
 use Log;
 
 /**

app/Console/Commands/Upgrade/BudgetLimitCurrency.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Console\Command;
+use JsonException;
 
 /**
  * Class BudgetLimitCurrency
@@ -51,7 +52,7 @@ class BudgetLimitCurrency extends Command
      *
      * @return int
      * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function handle(): int
     {

app/Console/Commands/Upgrade/MigrateJournalNotes.php

@@ -66,7 +66,7 @@ class MigrateJournalNotes extends Command
         }
 
         $count = 0;
-        $set = TransactionJournalMeta::whereName('notes')->get();
+        $set   = TransactionJournalMeta::whereName('notes')->get();
         /** @var TransactionJournalMeta $meta */
         foreach ($set as $meta) {
             $journal = $meta->transactionJournal;

app/Console/Commands/Upgrade/TransactionIdentifier.php

@@ -191,6 +191,7 @@ class TransactionIdentifier extends Command
 
             return null;
         }
+
         return $opposing;
     }
 

app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Upgrade;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
@@ -132,7 +133,7 @@ class TransferCurrenciesCorrections extends Command
 
     /**
      * @return bool
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     private function isExecuted(): bool
     {

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -106,7 +106,7 @@ class UpgradeDatabase extends Command
 
             // instructions
             'firefly:instructions update',
-            'firefly-iii:verify-security-alerts'
+            'firefly-iii:verify-security-alerts',
         ];
         $args     = [];
         if ($this->option('force')) {

app/Console/Commands/Upgrade/UpgradeLiabilities.php

@@ -92,59 +92,6 @@ class UpgradeLiabilities extends Command
         return false;
     }
 
-    /**
-     * @param Account            $account
-     * @param TransactionJournal $openingBalance
-     */
-    private function correctOpeningBalance(Account $account, TransactionJournal $openingBalance): void
-    {
-        $source      = $this->getSourceTransaction($openingBalance);
-        $destination = $this->getDestinationTransaction($openingBalance);
-        if (null === $source || null === $destination) {
-            return;
-        }
-        // source MUST be the liability.
-        if ((int)$destination->account_id === (int)$account->id) {
-            Log::debug(sprintf('Must switch around, because account #%d is the destination.', $destination->account_id));
-            // so if not, switch things around:
-            $sourceAccountId         = (int)$source->account_id;
-            $source->account_id      = $destination->account_id;
-            $destination->account_id = $sourceAccountId;
-            $source->save();
-            $destination->save();
-            Log::debug(sprintf('Source transaction #%d now has account #%d', $source->id, $source->account_id));
-            Log::debug(sprintf('Dest   transaction #%d now has account #%d', $destination->id, $destination->account_id));
-        }
-    }
-
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return Transaction|null
-     */
-    private function getSourceTransaction(TransactionJournal $journal): ?Transaction
-    {
-        return $journal->transactions()->where('amount', '<', 0)->first();
-    }
-
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return Transaction|null
-     */
-    private function getDestinationTransaction(TransactionJournal $journal): ?Transaction
-    {
-        return $journal->transactions()->where('amount', '>', 0)->first();
-    }
-
-    /**
-     *
-     */
-    private function markAsExecuted(): void
-    {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
-    }
-
     /**
      *
      */
@@ -200,4 +147,57 @@ class UpgradeLiabilities extends Command
         $factory->crud($account, 'liability_direction', 'debit');
     }
 
+    /**
+     * @param Account            $account
+     * @param TransactionJournal $openingBalance
+     */
+    private function correctOpeningBalance(Account $account, TransactionJournal $openingBalance): void
+    {
+        $source      = $this->getSourceTransaction($openingBalance);
+        $destination = $this->getDestinationTransaction($openingBalance);
+        if (null === $source || null === $destination) {
+            return;
+        }
+        // source MUST be the liability.
+        if ((int)$destination->account_id === (int)$account->id) {
+            Log::debug(sprintf('Must switch around, because account #%d is the destination.', $destination->account_id));
+            // so if not, switch things around:
+            $sourceAccountId         = (int)$source->account_id;
+            $source->account_id      = $destination->account_id;
+            $destination->account_id = $sourceAccountId;
+            $source->save();
+            $destination->save();
+            Log::debug(sprintf('Source transaction #%d now has account #%d', $source->id, $source->account_id));
+            Log::debug(sprintf('Dest   transaction #%d now has account #%d', $destination->id, $destination->account_id));
+        }
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Transaction|null
+     */
+    private function getSourceTransaction(TransactionJournal $journal): ?Transaction
+    {
+        return $journal->transactions()->where('amount', '<', 0)->first();
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Transaction|null
+     */
+    private function getDestinationTransaction(TransactionJournal $journal): ?Transaction
+    {
+        return $journal->transactions()->where('amount', '>', 0)->first();
+    }
+
+    /**
+     *
+     */
+    private function markAsExecuted(): void
+    {
+        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+    }
+
 }

app/Console/Commands/VerifySecurityAlerts.php

@@ -25,14 +25,21 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
-use Storage;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Log;
+use Storage;
 
 /**
  * Class VerifySecurityAlerts
  */
 class VerifySecurityAlerts extends Command
 {
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Verify security alerts';
     /**
      * The name and signature of the console command.
      *
@@ -40,18 +47,11 @@ class VerifySecurityAlerts extends Command
      */
     protected $signature = 'firefly-iii:verify-security-alerts';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Verify security alerts';
-
     /**
      * Execute the console command.
      *
      * @return int
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     * @throws FileNotFoundException
      */
     public function handle(): int
     {
@@ -64,6 +64,7 @@ class VerifySecurityAlerts extends Command
         $disk    = Storage::disk('resources');
         if (!$disk->has('alerts.json')) {
             Log::debug('No alerts.json file present.');
+
             return 0;
         }
         $content = $disk->get('alerts.json');
@@ -81,6 +82,7 @@ class VerifySecurityAlerts extends Command
                 if ('info' === $array['level']) {
                     Log::debug('INFO level alert');
                     $this->info($array['message']);
+
                     return 0;
                 }
                 if ('warning' === $array['level']) {
@@ -88,6 +90,7 @@ class VerifySecurityAlerts extends Command
                     $this->warn('------------------------ :o');
                     $this->warn($array['message']);
                     $this->warn('------------------------ :o');
+
                     return 0;
                 }
                 if ('danger' === $array['level']) {
@@ -95,6 +98,7 @@ class VerifySecurityAlerts extends Command
                     $this->error('------------------------ :-(');
                     $this->error($array['message']);
                     $this->error('------------------------ :-(');
+
                     return 0;
                 }
 

app/Events/AdminRequestedTestMessage.php

@@ -41,6 +41,7 @@ class AdminRequestedTestMessage extends Event
     public $ipAddress;
     /** @var User The user */
     public $user;
+
     /**
      * Create a new event instance.
      *

app/Events/DestroyedTransactionGroup.php

@@ -37,6 +37,7 @@ class DestroyedTransactionGroup extends Event
     use SerializesModels;
 
     public TransactionGroup $transactionGroup;
+
     /**
      * Create a new event instance.
      *

app/Events/DestroyedTransactionLink.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Events;
+
 use FireflyIII\Models\TransactionJournalLink;
 use Illuminate\Queue\SerializesModels;
 

app/Events/DetectedNewIPAddress.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Events;
+
 use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 

app/Events/RegisteredUser.php

@@ -40,6 +40,7 @@ class RegisteredUser extends Event
     public $ipAddress;
     /** @var User The user */
     public $user;
+
     /**
      * Create a new event instance. This event is triggered when a new user registers.
      *

app/Events/RequestedNewPassword.php

@@ -42,6 +42,7 @@ class RequestedNewPassword extends Event
     public $token;
     /** @var User The user */
     public $user;
+
     /**
      * Create a new event instance. This event is triggered when a users tries to reset his or her password.
      *

app/Events/RequestedReportOnJournals.php

@@ -44,6 +44,7 @@ class RequestedReportOnJournals
     public $groups;
     /** @var int The ID of the user. */
     public $userId;
+
     /**
      * Create a new event instance.
      *

app/Events/RequestedSendWebhookMessages.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Events;
 
 use Illuminate\Queue\SerializesModels;
+
 class RequestedSendWebhookMessages extends Event
 {
     use SerializesModels;

app/Events/RequestedVersionCheckStatus.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Events;
 
 use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
+
 /**
  * Class RequestedVersionCheckStatus
  *
@@ -37,6 +38,7 @@ class RequestedVersionCheckStatus extends Event
 
     /** @var User The user */
     public $user;
+
     /**
      * Create a new event instance. This event is triggered when Firefly III wants to know
      * what the deal is with the version checker.

app/Events/UserChangedEmail.php

@@ -44,6 +44,7 @@ class UserChangedEmail extends Event
     public $oldEmail;
     /** @var User The user itself */
     public $user;
+
     /**
      * UserChangedEmail constructor.
      *

app/Exceptions/GracefulNotFoundHandler.php

@@ -166,7 +166,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
     }
 
     /**
-     * @param Request $request
+     * @param Request   $request
      * @param Throwable $exception
      *
      * @return RedirectResponse|\Illuminate\Http\Response|Redirector|Response

app/Factory/AccountFactory.php

@@ -49,8 +49,8 @@ class AccountFactory
     protected array                      $validAssetFields;
     protected array                      $validCCFields;
     protected array                      $validFields;
-    private array                        $canHaveVirtual;
     private array                        $canHaveOpeningBalance;
+    private array                        $canHaveVirtual;
     private User                         $user;
 
     /**

app/Factory/RecurrenceFactory.php

@@ -141,14 +141,6 @@ class RecurrenceFactory
         return $recurrence;
     }
 
-    /**
-     * @param User $user
-     */
-    public function setUser(User $user): void
-    {
-        $this->user = $user;
-    }
-
     /**
      * @return MessageBag
      */
@@ -157,5 +149,13 @@ class RecurrenceFactory
         return $this->errors;
     }
 
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
 
 }

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -32,6 +32,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Support\Collection;
 use JetBrains\PhpStorm\ArrayShape;
+use JsonException;
 use Log;
 use Throwable;
 
@@ -195,7 +196,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
      *
      * @return array
      * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     #[ArrayShape(['journals'         => "array", 'currency' => "mixed", 'exists' => "bool", 'end' => "string", 'endBalance' => "mixed", 'dayBefore' => "string",
                   'dayBeforeBalance' => "mixed"])] public function getAuditReport(Account $account, Carbon $date): array

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -34,7 +34,7 @@ use Throwable;
 
 /**
  * Class MonthReportGenerator.
-* See reference nr. 19
+ * See reference nr. 19
  *
  * @codeCoverageIgnore
  */

app/Generator/Report/Category/MonthReportGenerator.php

@@ -35,7 +35,7 @@ use Throwable;
 
 /**
  * Class MonthReportGenerator.
-* See reference nr. 18
+ * See reference nr. 18
  *
  * @codeCoverageIgnore
  */

app/Handlers/Events/StoredGroupEventHandler.php

@@ -77,6 +77,18 @@ class StoredGroupEventHandler
         $newRuleEngine->fire();
     }
 
+    /**
+     * @param StoredTransactionGroup $event
+     */
+    public function recalculateCredit(StoredTransactionGroup $event): void
+    {
+        $group = $event->transactionGroup;
+        /** @var CreditRecalculateService $object */
+        $object = app(CreditRecalculateService::class);
+        $object->setGroup($group);
+        $object->recalculate();
+    }
+
     /**
      * This method processes all webhooks that respond to the "stored transaction group" trigger (100)
      *
@@ -108,16 +120,4 @@ class StoredGroupEventHandler
         event(new RequestedSendWebhookMessages);
     }
 
-    /**
-     * @param StoredTransactionGroup $event
-     */
-    public function recalculateCredit(StoredTransactionGroup $event): void
-    {
-        $group = $event->transactionGroup;
-        /** @var CreditRecalculateService $object */
-        $object = app(CreditRecalculateService::class);
-        $object->setGroup($group);
-        $object->recalculate();
-    }
-
 }

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -77,6 +77,18 @@ class UpdatedGroupEventHandler
         $newRuleEngine->fire();
     }
 
+    /**
+     * @param UpdatedTransactionGroup $event
+     */
+    public function recalculateCredit(UpdatedTransactionGroup $event): void
+    {
+        $group = $event->transactionGroup;
+        /** @var CreditRecalculateService $object */
+        $object = app(CreditRecalculateService::class);
+        $object->setGroup($group);
+        $object->recalculate();
+    }
+
     /**
      * @param UpdatedTransactionGroup $updatedGroupEvent
      */
@@ -100,18 +112,6 @@ class UpdatedGroupEventHandler
         event(new RequestedSendWebhookMessages);
     }
 
-    /**
-     * @param UpdatedTransactionGroup $event
-     */
-    public function recalculateCredit(UpdatedTransactionGroup $event): void
-    {
-        $group = $event->transactionGroup;
-        /** @var CreditRecalculateService $object */
-        $object = app(CreditRecalculateService::class);
-        $object->setGroup($group);
-        $object->recalculate();
-    }
-
     /**
      * This method will make sure all source / destination accounts are the same.
      *

app/Handlers/Events/UserEventHandler.php

@@ -108,6 +108,34 @@ class UserEventHandler
         return true;
     }
 
+    /**
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     * @throws FireflyException
+     */
+    public function createGroupMembership(RegisteredUser $event): bool
+    {
+        $user = $event->user;
+        // create a new group.
+        $group = UserGroup::create(['title' => $user->email]);
+        $role  = UserRole::where('title', UserRole::OWNER)->first();
+        if (null === $role) {
+            throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
+        }
+        GroupMembership::create(
+            [
+                'user_id'       => $user->id,
+                'user_group_id' => $group->id,
+                'user_role_id'  => $role->id,
+            ]
+        );
+        $user->user_group_id = $group->id;
+        $user->save();
+
+        return true;
+    }
+
     /**
      * Set the demo user back to English.
      *
@@ -251,34 +279,6 @@ class UserEventHandler
         return true;
     }
 
-    /**
-     * @param RegisteredUser $event
-     *
-     * @return bool
-     * @throws FireflyException
-     */
-    public function createGroupMembership(RegisteredUser $event): bool
-    {
-        $user = $event->user;
-        // create a new group.
-        $group = UserGroup::create(['title' => $user->email]);
-        $role  = UserRole::where('title', UserRole::OWNER)->first();
-        if (null === $role) {
-            throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
-        }
-        GroupMembership::create(
-            [
-                'user_id'       => $user->id,
-                'user_group_id' => $group->id,
-                'user_role_id'  => $role->id,
-            ]
-        );
-        $user->user_group_id = $group->id;
-        $user->save();
-
-        return true;
-    }
-
     /**
      * This method will send the user a registration mail, welcoming him or her to Firefly III.
      * This message is only sent when the configuration of Firefly III says so.

app/Handlers/Events/VersionCheckEventHandler.php

@@ -61,7 +61,7 @@ class VersionCheckEventHandler
 
         /** @var UserRepositoryInterface $repository */
         $repository = app(UserRepositoryInterface::class);
-        $user = $event->user;
+        $user       = $event->user;
         if (!$repository->hasRole($user, 'owner')) {
             Log::debug('User is not admin, done.');
 
@@ -88,13 +88,14 @@ class VersionCheckEventHandler
 
     /**
      * @param RequestedVersionCheckStatus $event
+     *
      * @throws FireflyException
      */
     protected function warnToCheckForUpdates(RequestedVersionCheckStatus $event): void
     {
         /** @var UserRepositoryInterface $repository */
         $repository = app(UserRepositoryInterface::class);
-        $user = $event->user;
+        $user       = $event->user;
         if (!$repository->hasRole($user, 'owner')) {
             Log::debug('User is not admin, done.');
 

app/Helpers/Collector/Extensions/AccountCollection.php

@@ -216,9 +216,9 @@ trait AccountCollection
             $this->query->leftJoin('account_types as dest_account_type', 'dest_account_type.id', '=', 'dest_account.account_type_id');
 
             // and add fields:
-            $this->fields[]       = 'dest_account.name as destination_account_name';
+            $this->fields[] = 'dest_account.name as destination_account_name';
-            $this->fields[]       = 'dest_account.iban as destination_account_iban';
+            $this->fields[] = 'dest_account.iban as destination_account_iban';
-            $this->fields[]       = 'dest_account_type.type as destination_account_type';
+            $this->fields[] = 'dest_account_type.type as destination_account_type';
             $this->hasAccountInfo = true;
         }
 

app/Helpers/Collector/GroupCollector.php

@@ -198,6 +198,16 @@ class GroupCollector implements GroupCollectorInterface
         return $this;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function findNothing(): GroupCollectorInterface
+    {
+        $this->query->where('transaction_groups.id', -1);
+
+        return $this;
+    }
+
     /**
      * Return the transaction journals without group information. Is useful in some instances.
      *
@@ -767,14 +777,4 @@ class GroupCollector implements GroupCollectorInterface
 
         return $groups;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function findNothing(): GroupCollectorInterface
-    {
-        $this->query->where('transaction_groups.id', -1);
-
-        return $this;
-    }
 }

app/Helpers/Collector/GroupCollectorInterface.php

@@ -57,13 +57,6 @@ interface GroupCollectorInterface
      */
     public function amountLess(string $amount): GroupCollectorInterface;
 
-    /**
-     * Ensure the search will find nothing at all, zero results.
-     *
-     * @return GroupCollectorInterface
-     */
-    public function findNothing(): GroupCollectorInterface;
-
     /**
      * Get transactions where the amount is more than.
      *
@@ -118,6 +111,13 @@ interface GroupCollectorInterface
      */
     public function excludeSourceAccounts(Collection $accounts): GroupCollectorInterface;
 
+    /**
+     * Ensure the search will find nothing at all, zero results.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function findNothing(): GroupCollectorInterface;
+
     /**
      * Return the transaction journals without group information. Is useful in some instances.
      *
@@ -478,6 +478,13 @@ interface GroupCollectorInterface
      */
     public function withAttachmentInformation(): GroupCollectorInterface;
 
+    /**
+     * Limit results to transactions without a bill..
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withBill(): GroupCollectorInterface;
+
     /**
      * Include bill name + ID.
      *
@@ -527,13 +534,6 @@ interface GroupCollectorInterface
      */
     public function withTagInformation(): GroupCollectorInterface;
 
-    /**
-     * Limit results to transactions without a bill..
-     *
-     * @return GroupCollectorInterface
-     */
-    public function withBill(): GroupCollectorInterface;
-
     /**
      * Limit results to a transactions without a bill.
      *

app/Helpers/Fiscal/FiscalHelper.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Helpers\Fiscal;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use Log;
 
 /**
@@ -67,7 +68,7 @@ class FiscalHelper implements FiscalHelperInterface
      * @param Carbon $date
      *
      * @return Carbon date object
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function startOfFiscalYear(Carbon $date): Carbon
     {

app/Helpers/Help/Help.php

@@ -96,7 +96,7 @@ class Help implements HelpInterface
         if ('' !== $content) {
             Log::debug('Content is longer than zero. Expect something.');
             $converter = new CommonMarkConverter();
-            $content   = (string) $converter->convertToHtml($content);
+            $content   = (string)$converter->convertToHtml($content);
         }
 
         return $content;

app/Helpers/Report/NetWorth.php

@@ -30,6 +30,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
+use JsonException;
 use Log;
 
 /**
@@ -62,7 +63,7 @@ class NetWorth implements NetWorthInterface
      * @param Carbon     $date
      *
      * @return array
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function getNetWorthByCurrency(Collection $accounts, Carbon $date): array
     {

app/Http/Controllers/Account/CreateController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\AccountFormRequest;
@@ -135,7 +136,7 @@ class CreateController extends Controller
      * @param AccountFormRequest $request
      *
      * @return RedirectResponse|Redirector
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function store(AccountFormRequest $request)
     {

app/Http/Controllers/Account/EditController.php

@@ -44,9 +44,9 @@ class EditController extends Controller
 {
     use ModelInformation;
 
-    private AttachmentHelperInterface $attachments;
+    private AttachmentHelperInterface   $attachments;
     private CurrencyRepositoryInterface $currencyRepos;
-    private AccountRepositoryInterface $repository;
+    private AccountRepositoryInterface  $repository;
 
     /**
      * EditController constructor.
@@ -123,11 +123,11 @@ class EditController extends Controller
         $request->session()->forget('accounts.edit.fromUpdate');
 
         $openingBalanceAmount = app('steam')->positive((string)$repository->getOpeningBalanceAmount($account));
-        if('0' === $openingBalanceAmount) {
+        if ('0' === $openingBalanceAmount) {
             $openingBalanceAmount = '';
         }
-        $openingBalanceDate   = $repository->getOpeningBalanceDate($account);
+        $openingBalanceDate = $repository->getOpeningBalanceDate($account);
-        $currency             = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
+        $currency           = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
 
         // include this account in net-worth charts?
         $includeNetWorth = $repository->getMetaValue($account, 'include_net_worth');
@@ -144,7 +144,7 @@ class EditController extends Controller
             'opening_balance_date'    => $openingBalanceDate,
             'liability_type_id'       => $account->account_type_id,
             'opening_balance'         => $openingBalanceAmount,
-            'liability_direction' => $this->repository->getMetaValue($account, 'liability_direction'),
+            'liability_direction'     => $this->repository->getMetaValue($account, 'liability_direction'),
             'virtual_balance'         => $account->virtual_balance,
             'currency_id'             => $currency->id,
             'include_net_worth'       => $includeNetWorth,

app/Http/Controllers/Account/IndexController.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Account;
 
 use Carbon\Carbon;
 use Exception;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -72,7 +73,7 @@ class IndexController extends Controller
      * @param string  $objectType
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function inactive(Request $request, string $objectType)
     {
@@ -160,13 +161,15 @@ class IndexController extends Controller
 
         $accounts->each(
             function (Account $account) use ($activities, $startBalances, $endBalances) {
-// See reference nr. 68
+                // See reference nr. 68
                 $account->lastActivityDate    = $this->isInArray($activities, $account->id);
                 $account->startBalance        = $this->isInArray($startBalances, $account->id);
                 $account->endBalance          = $this->isInArray($endBalances, $account->id);
                 $account->difference          = bcsub($account->endBalance, $account->startBalance);
                 $account->interest            = number_format((float)$this->repository->getMetaValue($account, 'interest'), 4, '.', '');
-                $account->interestPeriod      = (string)trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
+                $account->interestPeriod      = (string)trans(
+                    sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period'))
+                );
                 $account->accountTypeString   = (string)trans(sprintf('firefly.account_type_%s', $account->accountType->type));
                 $account->location            = $this->repository->getLocation($account);
                 $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');

app/Http/Controllers/Admin/ConfigurationController.php

@@ -64,7 +64,7 @@ class ConfigurationController extends Controller
      */
     public function index()
     {
-        $subTitle     = (string)trans('firefly.instance_configuration');
+        $subTitle = (string)trans('firefly.instance_configuration');
         $subTitleIcon = 'fa-wrench';
 
         Log::channel('audit')->info('User visits admin config index.');

app/Http/Controllers/Admin/HomeController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Admin;
 
 use FireflyIII\Events\AdminRequestedTestMessage;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\User;
@@ -53,7 +54,7 @@ class HomeController extends Controller
      * Index of the admin.
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function index()
     {

app/Http/Controllers/Auth/LoginController.php

@@ -28,15 +28,17 @@ use DB;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Providers\RouteServiceProvider;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Routing\Redirector;
 use Illuminate\Validation\ValidationException;
-use Illuminate\View\View;
 use Log;
 
 /**
@@ -194,7 +196,7 @@ class LoginController extends Controller
      *
      * @param Request $request
      *
-     * @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View|\Illuminate\Routing\Redirector|RedirectResponse
+     * @return Factory|Application|View|Redirector|RedirectResponse
      * @throws FireflyException
      */
     public function showLoginForm(Request $request)

app/Http/Controllers/Auth/RegisterController.php

@@ -27,6 +27,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\Http\Controllers\CreateStuff;
 use FireflyIII\User;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\RedirectResponse;
@@ -78,7 +79,7 @@ class RegisterController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Contracts\Foundation\Application|Redirector|RedirectResponse
+     * @return Application|Redirector|RedirectResponse
      * @throws FireflyException
      * @throws ValidationException
      */

app/Http/Controllers/Bill/CreateController.php

@@ -30,6 +30,7 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\BillStoreRequest;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Log;
@@ -68,7 +69,7 @@ class CreateController extends Controller
      *
      * @param Request $request
      *
-     * @return Factory|\Illuminate\Contracts\View\View
+     * @return Factory|View
      */
     public function create(Request $request)
     {

app/Http/Controllers/Bill/EditController.php

@@ -30,6 +30,7 @@ use FireflyIII\Http\Requests\BillUpdateRequest;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
@@ -68,7 +69,7 @@ class EditController extends Controller
      * @param Request $request
      * @param Bill    $bill
      *
-     * @return Factory|\Illuminate\Contracts\View\View
+     * @return Factory|View
      */
     public function edit(Request $request, Bill $bill)
     {

app/Http/Controllers/Bill/IndexController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Bill;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -105,18 +106,18 @@ class IndexController extends Controller
                     'object_group_title' => $array['object_group_title'],
                     'bills'              => [],
                 ];
-//            var_dump($array);exit;
+            //            var_dump($array);exit;
-//            // expected today? default:
+            //            // expected today? default:
-//            $array['next_expected_match_diff'] = trans('firefly.not_expected_period');
+            //            $array['next_expected_match_diff'] = trans('firefly.not_expected_period');
-//            $nextExpectedMatch                 = new Carbon($array['next_expected_match']);
+            //            $nextExpectedMatch                 = new Carbon($array['next_expected_match']);
-//            if ($nextExpectedMatch->isToday()) {
+            //            if ($nextExpectedMatch->isToday()) {
-//                $array['next_expected_match_diff'] = trans('firefly.today');
+            //                $array['next_expected_match_diff'] = trans('firefly.today');
-//            }
+            //            }
-//            $current = $array['pay_dates'][0] ?? null;
+            //            $current = $array['pay_dates'][0] ?? null;
-//            if (null !== $current && !$nextExpectedMatch->isToday()) {
+            //            if (null !== $current && !$nextExpectedMatch->isToday()) {
-//                $currentExpectedMatch              = Carbon::createFromFormat('Y-m-d\TH:i:sP', $current);
+            //                $currentExpectedMatch              = Carbon::createFromFormat('Y-m-d\TH:i:sP', $current);
-//                $array['next_expected_match_diff'] = $currentExpectedMatch->diffForHumans(today(), Carbon::DIFF_RELATIVE_TO_NOW);
+            //                $array['next_expected_match_diff'] = $currentExpectedMatch->diffForHumans(today(), Carbon::DIFF_RELATIVE_TO_NOW);
-//            }
+            //            }
 
             $currency                         = $bill->transactionCurrency ?? $defaultCurrency;
             $array['currency_id']             = $currency->id;
@@ -143,7 +144,7 @@ class IndexController extends Controller
      * @param array $bills
      *
      * @return array
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     private function getSums(array $bills): array
     {

app/Http/Controllers/Budget/IndexController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Budget;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\Budget;
@@ -90,7 +91,7 @@ class IndexController extends Controller
      * @param Carbon|null $end
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function index(Request $request, Carbon $start = null, Carbon $end = null)
     {

app/Http/Controllers/Budget/ShowController.php

@@ -47,7 +47,7 @@ class ShowController extends Controller
     use PeriodOverview, AugumentData;
 
     protected JournalRepositoryInterface $journalRepos;
-    private BudgetRepositoryInterface  $repository;
+    private BudgetRepositoryInterface    $repository;
 
     /**
      * ShowController constructor.

app/Http/Controllers/Category/DeleteController.php

@@ -80,7 +80,7 @@ class DeleteController extends Controller
     /**
      * Destroy a category.
      *
-     * @param Request  $request
+     * @param Request $request
      * @param Category $category
      *
      * @return RedirectResponse|Redirector

app/Http/Controllers/Category/IndexController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Category;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -66,7 +67,7 @@ class IndexController extends Controller
      * @param Request $request
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function index(Request $request)
     {

app/Http/Controllers/Category/NoCategoryController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Category;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionType;
@@ -74,7 +75,7 @@ class NoCategoryController extends Controller
      * @param Carbon|null $end
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function show(Request $request, Carbon $start = null, Carbon $end = null)
     {
@@ -112,7 +113,7 @@ class NoCategoryController extends Controller
      * @param Request $request
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function showAll(Request $request)
     {

app/Http/Controllers/Category/ShowController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Category;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
@@ -76,7 +77,7 @@ class ShowController extends Controller
      * @param Carbon|null $end
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
     {
@@ -116,7 +117,7 @@ class ShowController extends Controller
      * @param Category $category
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function showAll(Request $request, Category $category)
     {

app/Http/Controllers/Chart/AccountController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -38,6 +39,7 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
+use JsonException;
 use Log;
 
 /**
@@ -83,7 +85,7 @@ class AccountController extends Controller
      * This chart is (multi) currency aware.
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function expenseAccounts(): JsonResponse
     {
@@ -195,7 +197,7 @@ class AccountController extends Controller
      * @param Carbon  $end
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function expenseBudget(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
@@ -270,7 +272,7 @@ class AccountController extends Controller
      * @param Carbon  $end
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function expenseCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
@@ -325,7 +327,7 @@ class AccountController extends Controller
      * @param AccountRepositoryInterface $repository
      *
      * @return JsonResponse
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function frontpage(AccountRepositoryInterface $repository): JsonResponse
     {
@@ -368,7 +370,7 @@ class AccountController extends Controller
      * @param Carbon  $end
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function incomeCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
@@ -426,8 +428,8 @@ class AccountController extends Controller
      * @param Carbon  $end
      *
      * @return JsonResponse
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function period(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
@@ -465,8 +467,8 @@ class AccountController extends Controller
      * @param TransactionCurrency $currency
      *
      * @return array
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
     {
@@ -518,7 +520,7 @@ class AccountController extends Controller
     /**
      * Shows the balances for a given set of dates and accounts.
      *
-* See reference nr. 55
+     * See reference nr. 55
      *
      * @param Carbon     $start
      * @param Carbon     $end
@@ -537,7 +539,7 @@ class AccountController extends Controller
      * This chart is multi-currency aware.
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function revenueAccounts(): JsonResponse
     {

app/Http/Controllers/Chart/BillController.php

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\JsonResponse;
+use JsonException;
 
 /**
  * Class BillController.
@@ -57,7 +58,7 @@ class BillController extends Controller
      * @param BillRepositoryInterface $repository
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function frontpage(BillRepositoryInterface $repository): JsonResponse
     {
@@ -103,7 +104,7 @@ class BillController extends Controller
      * @param Bill $bill
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function single(Bill $bill): JsonResponse
     {

app/Http/Controllers/Chart/BudgetController.php

@@ -41,6 +41,7 @@ use FireflyIII\Support\Http\Controllers\AugumentData;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
+use JsonException;
 
 /**
  * Class BudgetController.
@@ -84,7 +85,7 @@ class BudgetController extends Controller
      * @param Budget $budget
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function budget(Budget $budget): JsonResponse
     {
@@ -153,7 +154,7 @@ class BudgetController extends Controller
      * @return JsonResponse
      *
      * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function budgetLimit(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
@@ -204,7 +205,7 @@ class BudgetController extends Controller
      * @param BudgetLimit|null $budgetLimit
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
     {
@@ -273,7 +274,7 @@ class BudgetController extends Controller
      * @param BudgetLimit|null $budgetLimit
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
     {
@@ -338,7 +339,7 @@ class BudgetController extends Controller
      * @param BudgetLimit|null $budgetLimit
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
     {
@@ -402,7 +403,7 @@ class BudgetController extends Controller
      * Shows a budget list with spent/left/overspent.
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function frontpage(): JsonResponse
     {
@@ -440,7 +441,7 @@ class BudgetController extends Controller
      * @param Carbon              $end
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function period(Budget $budget, TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
     {
@@ -516,7 +517,7 @@ class BudgetController extends Controller
      * @param Carbon              $end
      *
      * @return JsonResponse
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function periodNoBudget(TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
     {