Clean up code and comments.

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

@@ -58,7 +58,6 @@ class TransactionTypeController extends Controller
      * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
-
      */
     public function transactionTypes(AutocompleteRequest $request): JsonResponse
     {

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

@@ -63,7 +63,6 @@ class DestroyController extends Controller
      *
      * @param  Account  $account
      *
-
      * @return JsonResponse
      */
     public function destroy(Account $account): JsonResponse

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

@@ -76,7 +76,6 @@ class ListController extends Controller
      * @param  Account  $account
      *
      * @return JsonResponse
-
      * @throws FireflyException
      */
     public function attachments(Account $account): JsonResponse
@@ -110,7 +109,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBanks(Account $account): JsonResponse
     {
@@ -145,7 +143,6 @@ class ListController extends Controller
      *
      * Show all transaction groups related to the account.
      *
-
      *
      * @param  Request  $request
      * @param  Account  $account

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

@@ -75,7 +75,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {

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

@@ -64,7 +64,6 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-
      *
      * @param  Attachment  $attachment
      *

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

@@ -73,7 +73,6 @@ class ShowController extends Controller
      *
      * @param  Attachment  $attachment
      *
-
      * @return LaravelResponse
      * @throws   FireflyException
      */
@@ -118,7 +117,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {

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

@@ -95,7 +95,6 @@ class StoreController extends Controller
     /**
      * Upload an attachment.
      *
-
      *
      * @param  Request  $request
      * @param  Attachment  $attachment

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

@@ -70,7 +70,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -110,7 +109,6 @@ class ShowController extends Controller
      * @param  AvailableBudget  $availableBudget
      *
      * @return JsonResponse
-
      */
     public function show(AvailableBudget $availableBudget): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Bill  $bill
      *
      * @return JsonResponse
-
      */
     public function destroy(Bill $bill): JsonResponse
     {

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

@@ -76,7 +76,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Bill $bill): JsonResponse
     {
@@ -111,7 +110,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function rules(Bill $bill): JsonResponse
     {
@@ -150,7 +148,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Bill $bill): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -98,7 +97,6 @@ class ShowController extends Controller
      * @param  Bill  $bill
      *
      * @return JsonResponse
-
      */
     public function show(Bill $bill): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Budget  $budget
      *
      * @return JsonResponse
-
      */
     public function destroy(Budget $budget): JsonResponse
     {

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

@@ -78,7 +78,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Budget $budget): JsonResponse
     {
@@ -113,7 +112,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function budgetLimits(Budget $budget): JsonResponse
     {
@@ -147,7 +145,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Budget $budget): JsonResponse
     {
@@ -211,7 +208,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function withoutBudget(Request $request): JsonResponse
     {

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

@@ -71,7 +71,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -105,7 +104,6 @@ class ShowController extends Controller
      * @param  Budget  $budget
      *
      * @return JsonResponse
-
      */
     public function show(Budget $budget): JsonResponse
     {

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

@@ -69,7 +69,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {

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

@@ -77,7 +77,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {

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

@@ -80,7 +80,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request, Budget $budget): JsonResponse
     {
@@ -113,7 +112,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function indexAll(DateRequest $request): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Category  $category
      *
      * @return JsonResponse
-
      */
     public function destroy(Category $category): JsonResponse
     {

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

@@ -73,7 +73,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Category $category): JsonResponse
     {
@@ -110,7 +109,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Category $category): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -103,7 +102,6 @@ class ShowController extends Controller
      * @param  Category  $category
      *
      * @return JsonResponse
-
      */
     public function show(Category $category): JsonResponse
     {

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

@@ -64,7 +64,6 @@ class DestroyController extends Controller
      *
      * @param  ObjectGroup  $objectGroup
      *
-
      * @return JsonResponse
      */
     public function destroy(ObjectGroup $objectGroup): JsonResponse

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

@@ -72,7 +72,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function bills(ObjectGroup $objectGroup): JsonResponse
     {
@@ -108,7 +107,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
     {

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

@@ -73,7 +73,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
-
      */
     public function destroy(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(PiggyBank $piggyBank): JsonResponse
     {
@@ -102,7 +101,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -103,7 +102,6 @@ class ShowController extends Controller
      * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
-
      */
     public function show(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
-
      */
     public function destroy(Recurrence $recurrence): JsonResponse
     {

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

@@ -74,7 +74,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Recurrence $recurrence): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -104,7 +103,6 @@ class ShowController extends Controller
      * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
-
      */
     public function show(Recurrence $recurrence): JsonResponse
     {

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

@@ -66,7 +66,6 @@ class DestroyController extends Controller
      * @param  Rule  $rule
      *
      * @return JsonResponse
-
      */
     public function destroy(Rule $rule): JsonResponse
     {

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

@@ -71,7 +71,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -108,7 +107,6 @@ class ShowController extends Controller
      * @param  Rule  $rule
      *
      * @return JsonResponse
-
      */
     public function show(Rule $rule): JsonResponse
     {

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

@@ -66,7 +66,6 @@ class DestroyController extends Controller
      * @param  RuleGroup  $ruleGroup
      *
      * @return JsonResponse
-
      */
     public function destroy(RuleGroup $ruleGroup): JsonResponse
     {

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

@@ -70,7 +70,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function rules(RuleGroup $group): JsonResponse
     {

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

@@ -70,7 +70,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -106,7 +105,6 @@ class ShowController extends Controller
      * @param  RuleGroup  $ruleGroup
      *
      * @return JsonResponse
-
      */
     public function show(RuleGroup $ruleGroup): JsonResponse
     {

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

@@ -66,7 +66,6 @@ class DestroyController extends Controller
      * @param  Tag  $tag
      *
      * @return JsonResponse
-
      */
     public function destroy(Tag $tag): JsonResponse
     {

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

@@ -76,7 +76,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Tag $tag): JsonResponse
     {
@@ -112,7 +111,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Tag $tag): JsonResponse
     {

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

@@ -71,7 +71,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -107,7 +106,6 @@ class ShowController extends Controller
      * @param  Tag  $tag
      *
      * @return JsonResponse
-
      */
     public function show(Tag $tag): JsonResponse
     {

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

@@ -76,7 +76,6 @@ class DestroyController extends Controller
      * @param  TransactionGroup  $transactionGroup
      *
      * @return JsonResponse
-
      */
     public function destroy(TransactionGroup $transactionGroup): JsonResponse
     {
@@ -116,7 +115,6 @@ class DestroyController extends Controller
      *
      * @param  TransactionJournal  $transactionJournal
      *
-
      * @return JsonResponse
      */
     public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse

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

@@ -74,7 +74,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(TransactionGroup $transactionGroup): JsonResponse
     {
@@ -110,7 +109,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse
     {
@@ -149,7 +147,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse
     {

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

@@ -55,7 +55,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {
@@ -107,7 +106,6 @@ class ShowController extends Controller
      * @param  TransactionJournal  $transactionJournal
      *
      * @return JsonResponse
-
      */
     public function showJournal(TransactionJournal $transactionJournal): JsonResponse
     {
@@ -123,7 +121,6 @@ class ShowController extends Controller
      * @param  TransactionGroup  $transactionGroup
      *
      * @return JsonResponse
-
      */
     public function show(TransactionGroup $transactionGroup): JsonResponse
     {

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

@@ -39,7 +39,7 @@ use Validator;
 class DestroyController extends Controller
 {
     private CurrencyRepositoryInterface $repository;
-    private UserRepositoryInterface $userRepository;
+    private UserRepositoryInterface     $userRepository;
 
     /**
      * CurrencyRepository constructor.
@@ -51,7 +51,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());
 
@@ -70,7 +70,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroy(TransactionCurrency $currency): JsonResponse
     {

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

@@ -41,7 +41,6 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AccountTransformer;
@@ -67,6 +66,7 @@ class ListController extends Controller
     use TransactionFilter;
 
     private CurrencyRepositoryInterface $repository;
+
     /**
      * CurrencyRepository constructor.
      *
@@ -77,7 +77,7 @@ class ListController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $this->repository     = app(CurrencyRepositoryInterface::class);
+                $this->repository = app(CurrencyRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 
                 return $next($request);
@@ -95,7 +95,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
     {
@@ -149,7 +148,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function availableBudgets(TransactionCurrency $currency): JsonResponse
     {
@@ -188,7 +186,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function bills(TransactionCurrency $currency): JsonResponse
     {
@@ -232,7 +229,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function budgetLimits(TransactionCurrency $currency): JsonResponse
     {
@@ -267,7 +263,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function recurrences(TransactionCurrency $currency): JsonResponse
     {
@@ -320,7 +315,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function rules(TransactionCurrency $currency): JsonResponse
     {
@@ -374,7 +368,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, TransactionCurrency $currency): JsonResponse
     {

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

@@ -75,7 +75,6 @@ class ShowController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function index(): JsonResponse
     {
@@ -111,7 +110,6 @@ class ShowController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function show(TransactionCurrency $currency): JsonResponse
     {
@@ -137,7 +135,6 @@ class ShowController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function showDefault(): JsonResponse
     {

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

@@ -29,7 +29,6 @@ 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;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
@@ -76,7 +75,6 @@ class UpdateController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function disable(TransactionCurrency $currency): JsonResponse
     {
@@ -109,7 +107,6 @@ class UpdateController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function makeDefault(TransactionCurrency $currency): JsonResponse
     {
@@ -142,7 +139,6 @@ class UpdateController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function enable(TransactionCurrency $currency): JsonResponse
     {

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

@@ -65,7 +65,6 @@ class DestroyController extends Controller
      * @param  TransactionJournalLink  $link
      *
      * @return JsonResponse
-
      */
     public function destroy(TransactionJournalLink $link): JsonResponse
     {

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

@@ -73,7 +73,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {
@@ -114,7 +113,6 @@ class ShowController extends Controller
      * @param  TransactionJournalLink  $journalLink
      *
      * @return JsonResponse
-
      */
     public function show(TransactionJournalLink $journalLink): JsonResponse
     {

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

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\LinkType;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -58,8 +57,8 @@ class ListController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user                 = auth()->user();
+                $user             = auth()->user();
-                $this->repository     = app(LinkTypeRepositoryInterface::class);
+                $this->repository = app(LinkTypeRepositoryInterface::class);
                 $this->repository->setUser($user);
 
                 return $next($request);
@@ -76,7 +75,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, LinkType $linkType): JsonResponse
     {

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

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\LinkType;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\LinkTypeTransformer;
 use FireflyIII\User;
@@ -58,8 +57,8 @@ class ShowController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user                 = auth()->user();
+                $user             = auth()->user();
-                $this->repository     = app(LinkTypeRepositoryInterface::class);
+                $this->repository = app(LinkTypeRepositoryInterface::class);
                 $this->repository->setUser($user);
 
                 return $next($request);
@@ -74,7 +73,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -110,7 +108,6 @@ class ShowController extends Controller
      * @param  LinkType  $linkType
      *
      * @return JsonResponse
-
      */
     public function show(LinkType $linkType): JsonResponse
     {

app/Api/V1/Controllers/Summary/BasicController.php

@@ -360,7 +360,9 @@ class BasicController extends Controller
         /** @var NetWorthInterface $netWorthHelper */
         $netWorthHelper = app(NetWorthInterface::class);
         $netWorthHelper->setUser($user);
-        $allAccounts = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]);
+        $allAccounts = $this->accountRepository->getActiveAccountsByType(
+            [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]
+        );
 
         // filter list on preference of being included.
         $filtered = $allAccounts->filter(

app/Api/V1/Controllers/System/AboutController.php

@@ -33,7 +33,6 @@ use League\Fractal\Resource\Item;
 /**
  * Returns basic information about this installation.
  *
-
  * Class AboutController.
  */
 class AboutController extends Controller

app/Api/V1/Controllers/System/UserController.php

@@ -72,7 +72,6 @@ class UserController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroy(User $user): JsonResponse
     {
@@ -98,7 +97,6 @@ class UserController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -135,7 +133,6 @@ class UserController extends Controller
      * @param  User  $user
      *
      * @return JsonResponse
-
      */
     public function show(User $user): JsonResponse
     {
@@ -191,7 +188,7 @@ class UserController extends Controller
      */
     public function update(UserUpdateRequest $request, User $user): JsonResponse
     {
-        $data    = $request->getAll();
+        $data = $request->getAll();
 
         // can only update 'blocked' when user is admin.
         if (!$this->repository->hasRole(auth()->user(), 'owner')) {

app/Api/V1/Controllers/User/PreferencesController.php

@@ -52,7 +52,6 @@ class PreferencesController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -85,7 +84,6 @@ class PreferencesController extends Controller
      * @param  Preference  $preference
      *
      * @return JsonResponse
-
      */
     public function show(Preference $preference): JsonResponse
     {

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

@@ -45,7 +45,6 @@ class AttemptController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

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

@@ -40,7 +40,6 @@ class DestroyController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {
@@ -64,7 +63,6 @@ class DestroyController extends Controller
      * @param  Webhook  $webhook
      *
      * @return JsonResponse
-
      */
     public function destroy(Webhook $webhook): JsonResponse
     {
@@ -86,7 +84,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroyAttempt(Webhook $webhook, WebhookMessage $message, WebhookAttempt $attempt): JsonResponse
     {
@@ -114,7 +111,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroyMessage(Webhook $webhook, WebhookMessage $message): JsonResponse
     {

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

@@ -41,7 +41,6 @@ class MessageController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

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

@@ -24,9 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Webhook;
 
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Events\RequestedSendWebhookMessages;
-use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
 use FireflyIII\Models\TransactionGroup;
@@ -49,7 +47,6 @@ class ShowController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {
@@ -72,7 +69,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {

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

@@ -39,7 +39,6 @@ class StoreController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

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

@@ -37,7 +37,6 @@ class SubmitController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {
@@ -59,7 +58,6 @@ class SubmitController extends Controller
      * @param  Webhook  $webhook
      *
      * @return JsonResponse
-
      */
     public function submit(Webhook $webhook): JsonResponse
     {

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

@@ -39,7 +39,6 @@ class UpdateController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

app/Api/V1/Requests/Data/Export/ExportRequest.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data\Export;
 
-use Carbon\Carbon;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;

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

@@ -83,9 +83,9 @@ class StoreRequest extends FormRequest
         $data = $this->appendLocationData($data, null);
 
         if ('liability' === $data['account_type_name'] || 'liabilities' === $data['account_type_name']) {
-            $data['account_type_name']    = $this->convertString('liability_type');
+            $data['account_type_name']   = $this->convertString('liability_type');
-            $data['liability_direction']  = $this->convertString('liability_direction');
+            $data['liability_direction'] = $this->convertString('liability_direction');
-            $data['account_type_id']      = null;
+            $data['account_type_id']     = null;
         }
 
         return $data;

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

@@ -76,7 +76,7 @@ class UpdateRequest extends FormRequest
             'liability_amount'        => ['liability_amount', 'convertString'],
             'liability_start_date'    => ['liability_start_date', 'date'],
         ];
-        $data    = $this->getAllData($fields);
+        $data   = $this->getAllData($fields);
         return $this->appendLocationData($data, null);
     }
 

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

@@ -29,7 +29,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
-
  * Class StoreRequest
  */
 class StoreRequest extends FormRequest

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

@@ -30,7 +30,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
-
  * Class UpdateRequest
  */
 class UpdateRequest extends FormRequest

app/Api/V1/Requests/System/CronRequest.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\System;
 
-use Carbon\Carbon;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 

app/Api/V2/Controllers/NetWorthController.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V2\Controllers;
 
 use FireflyIII\Api\V2\Request\Generic\SingleDateRequest;
 use FireflyIII\Helpers\Report\NetWorthInterface;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
 use Illuminate\Http\JsonResponse;
 
@@ -37,7 +36,7 @@ class NetWorthController extends Controller
 {
     use ConvertsExchangeRates;
 
-    private NetWorthInterface          $netWorth;
+    private NetWorthInterface $netWorth;
 
     /**
      *
@@ -47,7 +46,7 @@ class NetWorthController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $this->netWorth   = app(NetWorthInterface::class);
+                $this->netWorth = app(NetWorthInterface::class);
                 $this->netWorth->setUser(auth()->user());
                 return $next($request);
             }

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -27,7 +27,6 @@ use Exception;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Database\QueryException;
 use Log;
 use stdClass;
 

app/Console/Commands/Correction/DeleteZeroAmount.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Database\QueryException;
 
 /**
  * Class DeleteZeroAmount

app/Console/Commands/Correction/FixAccountTypes.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
+use JsonException;
 use Log;
 
 /**
@@ -166,7 +167,7 @@ class FixAccountTypes extends Command
      * @param  Transaction  $dest
      *
      * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     private function fixJournal(TransactionJournal $journal, string $type, Transaction $source, Transaction $dest): void
     {

app/Console/Commands/Correction/FixTransactionTypes.php

@@ -147,7 +147,7 @@ class FixTransactionTypes extends Command
         /** @var Transaction $transaction */
         $transaction = $collection->first();
         /** @var Account|null $account */
-        $account     = $transaction->account;
+        $account = $transaction->account;
         if (null === $account) {
             throw new FireflyException(sprintf('300003: Journal #%d, transaction #%d has no source account.', $journal->id, $transaction->id));
         }
@@ -177,7 +177,7 @@ class FixTransactionTypes extends Command
         /** @var Transaction $transaction */
         $transaction = $collection->first();
         /** @var Account|null $account */
-        $account     = $transaction->account;
+        $account = $transaction->account;
         if (null === $account) {
             throw new FireflyException(sprintf('300006: Journal #%d, transaction #%d has no destination account.', $journal->id, $transaction->id));
         }

app/Console/Commands/Upgrade/BudgetLimitCurrency.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Console\Command;
-use JsonException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 

app/Console/Commands/Upgrade/MigrateJournalNotes.php

@@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournalMeta;
 use Illuminate\Console\Command;
-use Illuminate\Database\QueryException;
 use Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;

app/Console/Commands/Upgrade/TransactionIdentifier.php

@@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Log;
@@ -117,8 +116,8 @@ class TransactionIdentifier extends Command
      */
     private function stupidLaravel(): void
     {
-        $this->cliRepository     = app(JournalCLIRepositoryInterface::class);
+        $this->cliRepository = app(JournalCLIRepositoryInterface::class);
-        $this->count             = 0;
+        $this->count         = 0;
     }
 
     /**

app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php

@@ -237,7 +237,6 @@ class TransferCurrenciesCorrections extends Command
      * @param  TransactionJournal  $transfer
      *
      * @return bool
-
      */
     private function isSplitJournal(TransactionJournal $transfer): bool
     {
@@ -262,7 +261,6 @@ class TransferCurrenciesCorrections extends Command
      * @param  TransactionJournal  $transfer
      *
      * @return Transaction|null
-
      */
     private function getSourceTransaction(TransactionJournal $transfer): ?Transaction
     {
@@ -312,7 +310,6 @@ class TransferCurrenciesCorrections extends Command
      * @param  TransactionJournal  $transfer
      *
      * @return Transaction|null
-
      */
     private function getDestinationTransaction(TransactionJournal $transfer): ?Transaction
     {
@@ -323,7 +320,6 @@ class TransferCurrenciesCorrections extends Command
      * Is either the source or destination transaction NULL?
      *
      * @return bool
-
      */
     private function isEmptyTransactions(): bool
     {
@@ -334,7 +330,6 @@ class TransferCurrenciesCorrections extends Command
 
     /**
      * @return bool
-
      */
     private function isNoCurrencyPresent(): bool
     {

app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php

@@ -159,6 +159,90 @@ class UpgradeLiabilitiesEight extends Command
         Log::debug(sprintf('Done upgrading liability #%d ("%s")', $account->id, $account->name));
     }
 
+    /**
+     * @param  Account  $account
+     * @return bool
+     */
+    private function hasBadOpening(Account $account): bool
+    {
+        $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
+        $liabilityType      = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
+        $openingJournal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                                ->where('transactions.account_id', $account->id)
+                                                ->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
+                                                ->first(['transaction_journals.*']);
+        if (null === $openingJournal) {
+            Log::debug('Account has no opening balance and can be skipped.');
+            return false;
+        }
+        $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                              ->where('transactions.account_id', $account->id)
+                                              ->where('transaction_journals.transaction_type_id', $liabilityType->id)
+                                              ->first(['transaction_journals.*']);
+        if (null === $liabilityJournal) {
+            Log::debug('Account has no liability credit and can be skipped.');
+            return false;
+        }
+        if (!$openingJournal->date->isSameDay($liabilityJournal->date)) {
+            Log::debug('Account has opening/credit not on the same day.');
+            return false;
+        }
+        Log::debug('Account has bad opening balance data.');
+
+        return true;
+    }
+
+    /**
+     * @param  Account  $account
+     * @return void
+     */
+    private function deleteCreditTransaction(Account $account): void
+    {
+        Log::debug('Will delete credit transaction.');
+        $liabilityType    = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
+        $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                              ->where('transactions.account_id', $account->id)
+                                              ->where('transaction_journals.transaction_type_id', $liabilityType->id)
+                                              ->first(['transaction_journals.*']);
+        if (null !== $liabilityJournal) {
+            $group   = $liabilityJournal->transactionGroup;
+            $service = new TransactionGroupDestroyService();
+            $service->destroy($group);
+            Log::debug(sprintf('Deleted liability credit group #%d', $group->id));
+            return;
+        }
+        Log::debug('No liability credit journal found.');
+    }
+
+    /**
+     * @param  Account  $account
+     * @return void
+     */
+    private function reverseOpeningBalance(Account $account): void
+    {
+        $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
+        /** @var TransactionJournal $openingJournal */
+        $openingJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                            ->where('transactions.account_id', $account->id)
+                                            ->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
+                                            ->first(['transaction_journals.*']);
+        /** @var Transaction|null $source */
+        $source = $openingJournal->transactions()->where('amount', '<', 0)->first();
+        /** @var Transaction|null $dest */
+        $dest = $openingJournal->transactions()->where('amount', '>', 0)->first();
+        if ($source && $dest) {
+            $sourceId           = $source->account_id;
+            $destId             = $dest->account_id;
+            $dest->account_id   = $sourceId;
+            $source->account_id = $destId;
+            $source->save();
+            $dest->save();
+            Log::debug(sprintf('Opening balance transaction journal #%d reversed.', $openingJournal->id));
+            return;
+        }
+        Log::warning('Did not find opening balance.');
+    }
+
     /**
      * @param $account
      * @return int
@@ -204,29 +288,6 @@ class UpgradeLiabilitiesEight extends Command
         return $count;
     }
 
-    /**
-     * @param  Account  $account
-     * @return void
-     */
-    private function deleteCreditTransaction(Account $account): void
-    {
-        Log::debug('Will delete credit transaction.');
-        $liabilityType    = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
-        $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                              ->where('transactions.account_id', $account->id)
-                                              ->where('transaction_journals.transaction_type_id', $liabilityType->id)
-                                              ->first(['transaction_journals.*']);
-        if (null !== $liabilityJournal) {
-            $group   = $liabilityJournal->transactionGroup;
-            $service = new TransactionGroupDestroyService();
-            $service->destroy($group);
-            Log::debug(sprintf('Deleted liability credit group #%d', $group->id));
-            return;
-        }
-        Log::debug('No liability credit journal found.');
-    }
-
-
     /**
      *
      */
@@ -234,66 +295,4 @@ class UpgradeLiabilitiesEight extends Command
     {
         app('fireflyconfig')->set(self::CONFIG_NAME, true);
     }
-
-    /**
-     * @param  Account  $account
-     * @return bool
-     */
-    private function hasBadOpening(Account $account): bool
-    {
-        $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
-        $liabilityType      = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
-        $openingJournal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                                ->where('transactions.account_id', $account->id)
-                                                ->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
-                                                ->first(['transaction_journals.*']);
-        if (null === $openingJournal) {
-            Log::debug('Account has no opening balance and can be skipped.');
-            return false;
-        }
-        $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                              ->where('transactions.account_id', $account->id)
-                                              ->where('transaction_journals.transaction_type_id', $liabilityType->id)
-                                              ->first(['transaction_journals.*']);
-        if (null === $liabilityJournal) {
-            Log::debug('Account has no liability credit and can be skipped.');
-            return false;
-        }
-        if (!$openingJournal->date->isSameDay($liabilityJournal->date)) {
-            Log::debug('Account has opening/credit not on the same day.');
-            return false;
-        }
-        Log::debug('Account has bad opening balance data.');
-
-        return true;
-    }
-
-    /**
-     * @param  Account  $account
-     * @return void
-     */
-    private function reverseOpeningBalance(Account $account): void
-    {
-        $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
-        /** @var TransactionJournal $openingJournal */
-        $openingJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                            ->where('transactions.account_id', $account->id)
-                                            ->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
-                                            ->first(['transaction_journals.*']);
-        /** @var Transaction|null $source */
-        $source = $openingJournal->transactions()->where('amount', '<', 0)->first();
-        /** @var Transaction|null $dest */
-        $dest = $openingJournal->transactions()->where('amount', '>', 0)->first();
-        if ($source && $dest) {
-            $sourceId           = $source->account_id;
-            $destId             = $dest->account_id;
-            $dest->account_id   = $sourceId;
-            $source->account_id = $destId;
-            $source->save();
-            $dest->save();
-            Log::debug(sprintf('Opening balance transaction journal #%d reversed.', $openingJournal->id));
-            return;
-        }
-        Log::warning('Did not find opening balance.');
-    }
 }

app/Factory/RecurrenceFactory.php

@@ -30,6 +30,7 @@ use FireflyIII\Services\Internal\Support\RecurringTransactionTrait;
 use FireflyIII\Services\Internal\Support\TransactionTypeTrait;
 use FireflyIII\User;
 use Illuminate\Support\MessageBag;
+use JsonException;
 use Log;
 
 /**
@@ -58,7 +59,7 @@ class RecurrenceFactory
      *
      * @return Recurrence
      * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function create(array $data): Recurrence
     {

app/Factory/TransactionFactory.php

@@ -42,11 +42,11 @@ use Validator;
 class TransactionFactory
 {
     private Account              $account;
+    private array                $accountInformation;
     private TransactionCurrency  $currency;
     private ?TransactionCurrency $foreignCurrency;
     private TransactionJournal   $journal;
     private bool                 $reconciled;
-    private array                $accountInformation;
 
     /**
      * Constructor.
@@ -140,6 +140,38 @@ class TransactionFactory
         return $result;
     }
 
+    /**
+     * @return void
+     * @throws FireflyException
+     */
+    private function updateAccountInformation(): void
+    {
+        if (!array_key_exists('iban', $this->accountInformation)) {
+            Log::debug('No IBAN information in array, will not update.');
+            return;
+        }
+        if ('' !== (string)$this->account->iban) {
+            Log::debug('Account already has IBAN information, will not update.');
+            return;
+        }
+        if ($this->account->iban === $this->accountInformation['iban']) {
+            Log::debug('Account already has this IBAN, will not update.');
+            return;
+        }
+        // validate info:
+        $validator = Validator::make(['iban' => $this->accountInformation['iban']], [
+            'iban' => ['required', new UniqueIban($this->account, $this->account->accountType->type)],
+        ]);
+        if ($validator->fails()) {
+            Log::debug('Invalid or non-unique IBAN, will not update.');
+            return;
+        }
+
+        Log::debug('Will update account with IBAN information.');
+        $service = app(AccountUpdateService::class);
+        $service->update($this->account, ['iban' => $this->accountInformation['iban']]);
+    }
+
     /**
      * Create transaction with positive amount (for destination accounts).
      *
@@ -171,6 +203,14 @@ class TransactionFactory
         $this->account = $account;
     }
 
+    /**
+     * @param  array  $accountInformation
+     */
+    public function setAccountInformation(array $accountInformation): void
+    {
+        $this->accountInformation = $accountInformation;
+    }
+
     /**
      * @param  TransactionCurrency  $currency
      *
@@ -220,45 +260,4 @@ class TransactionFactory
     {
         // empty function.
     }
-
-    /**
-     * @param  array  $accountInformation
-     */
-    public function setAccountInformation(array $accountInformation): void
-    {
-        $this->accountInformation = $accountInformation;
-    }
-
-
-    /**
-     * @return void
-     * @throws FireflyException
-     */
-    private function updateAccountInformation(): void
-    {
-        if (!array_key_exists('iban', $this->accountInformation)) {
-            Log::debug('No IBAN information in array, will not update.');
-            return;
-        }
-        if ('' !== (string)$this->account->iban) {
-            Log::debug('Account already has IBAN information, will not update.');
-            return;
-        }
-        if ($this->account->iban === $this->accountInformation['iban']) {
-            Log::debug('Account already has this IBAN, will not update.');
-            return;
-        }
-        // validate info:
-        $validator = Validator::make(['iban' => $this->accountInformation['iban']], [
-            'iban' => ['required', new UniqueIban($this->account, $this->account->accountType->type)],
-        ]);
-        if ($validator->fails()) {
-            Log::debug('Invalid or non-unique IBAN, will not update.');
-            return;
-        }
-
-        Log::debug('Will update account with IBAN information.');
-        $service = app(AccountUpdateService::class);
-        $service->update($this->account, ['iban' => $this->accountInformation['iban']]);
-    }
 }

app/Factory/TransactionJournalFactory.php

@@ -73,7 +73,6 @@ class TransactionJournalFactory
      * Constructor.
      *
      * @throws Exception
-
      */
     public function __construct()
     {

app/Factory/TransactionJournalMetaFactory.php

@@ -25,7 +25,6 @@ namespace FireflyIII\Factory;
 
 use Carbon\Carbon;
 use FireflyIII\Models\TransactionJournalMeta;
-use Illuminate\Database\QueryException;
 use Log;
 
 /**

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -50,7 +50,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @return string
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function generate(): string
     {
@@ -186,7 +185,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @param  Collection  $accounts
      *
      * @return ReportGeneratorInterface
-
      */
     public function setAccounts(Collection $accounts): ReportGeneratorInterface
     {
@@ -201,7 +199,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @param  Collection  $budgets
      *
      * @return ReportGeneratorInterface
-
      */
     public function setBudgets(Collection $budgets): ReportGeneratorInterface
     {
@@ -214,7 +211,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @param  Collection  $categories
      *
      * @return ReportGeneratorInterface
-
      */
     public function setCategories(Collection $categories): ReportGeneratorInterface
     {
@@ -227,7 +223,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @param  Carbon  $date
      *
      * @return ReportGeneratorInterface
-
      */
     public function setEndDate(Carbon $date): ReportGeneratorInterface
     {
@@ -242,7 +237,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @param  Collection  $expense
      *
      * @return ReportGeneratorInterface
-
      */
     public function setExpense(Collection $expense): ReportGeneratorInterface
     {
@@ -256,7 +250,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @param  Carbon  $date
      *
      * @return ReportGeneratorInterface
-
      */
     public function setStartDate(Carbon $date): ReportGeneratorInterface
     {
@@ -271,7 +264,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @param  Collection  $tags
      *
      * @return ReportGeneratorInterface
-
      */
     public function setTags(Collection $tags): ReportGeneratorInterface
     {

app/Generator/Webhook/MessageGeneratorInterface.php

@@ -46,12 +46,6 @@ interface MessageGeneratorInterface
      */
     public function setObjects(Collection $objects): void;
 
-    /**
-     * @param  Collection  $webhooks
-     * @return void
-     */
-    public function setWebhooks(Collection $webhooks): void;
-
     /**
      * @param  int  $trigger
      */
@@ -61,4 +55,10 @@ interface MessageGeneratorInterface
      * @param  User  $user
      */
     public function setUser(User $user): void;
+
+    /**
+     * @param  Collection  $webhooks
+     * @return void
+     */
+    public function setWebhooks(Collection $webhooks): void;
 }

app/Handlers/Events/BillEventHandler.php

@@ -43,7 +43,7 @@ class BillEventHandler
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
 
-        $bill       = $event->bill;
+        $bill = $event->bill;
         /** @var bool $preference */
         $preference = Preferences::getForUser($bill->user, 'notification_bill_reminder', true)->data;
 

app/Handlers/Events/PiggyBankEventHandler.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Events;
 
-use Carbon\Carbon;
 use FireflyIII\Events\ChangedPiggyBankAmount;
 use FireflyIII\Models\PiggyBankEvent;
 use Illuminate\Support\Facades\Log;

app/Handlers/Events/UserEventHandler.php

@@ -368,7 +368,7 @@ class UserEventHandler
         }
         $preference = array_values($preference);
         /** @var bool $send */
-        $send       = app('preferences')->getForUser($user, 'notification_user_login', true)->data;
+        $send = app('preferences')->getForUser($user, 'notification_user_login', true)->data;
         app('preferences')->setForUser($user, 'login_ip_history', $preference);
 
         if (false === $inArray && true === $send) {

app/Helpers/Attachments/AttachmentHelper.php

@@ -69,7 +69,6 @@ class AttachmentHelper implements AttachmentHelperInterface
     /**
      * Returns the content of an attachment.
      *
-
      *
      * @param  Attachment  $attachment
      *
@@ -93,7 +92,6 @@ class AttachmentHelper implements AttachmentHelperInterface
      *
      * @param  Attachment  $attachment
      *
-
      * @return string
      */
     public function getAttachmentLocation(Attachment $attachment): string
@@ -104,7 +102,6 @@ class AttachmentHelper implements AttachmentHelperInterface
     /**
      * Get all attachments.
      *
-
      * @return Collection
      */
     public function getAttachments(): Collection
@@ -116,7 +113,6 @@ class AttachmentHelper implements AttachmentHelperInterface
      * Get all errors.
      *
      * @return MessageBag
-
      */
     public function getErrors(): MessageBag
     {
@@ -127,7 +123,6 @@ class AttachmentHelper implements AttachmentHelperInterface
      * Get all messages.
      *
      * @return MessageBag
-
      */
     public function getMessages(): MessageBag
     {
@@ -232,7 +227,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $validation = $this->validateUpload($file, $model);
         $attachment = null;
         if (false !== $validation) {
-            $user  = $model->user; // @phpstan-ignore-line
+            $user = $model->user; // @phpstan-ignore-line
             // ignore lines about polymorphic calls.
             if ($model instanceof PiggyBank) {
                 $user = $model->account->user;
@@ -336,7 +331,6 @@ class AttachmentHelper implements AttachmentHelperInterface
     /**
      * Verify if the size of a file is valid.
      *
-
      *
      * @param  UploadedFile  $file
      *
@@ -377,7 +371,8 @@ class AttachmentHelper implements AttachmentHelperInterface
             $count = $model->account->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
         }
         if ($model instanceof PiggyBank) {
-            $count = $model->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(); // @phpstan-ignore-line
+            $count = $model->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(
+            ); // @phpstan-ignore-line
         }
         $result = false;
         if ($count > 0) {

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -196,6 +196,19 @@ trait MetaCollection
         return $this;
     }
 
+    /**
+     * Join table to get tag information.
+     */
+    protected function joinMetaDataTables(): void
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+            $this->fields[] = 'journal_meta.name as meta_name';
+            $this->fields[] = 'journal_meta.data as meta_data';
+        }
+    }
+
     /**
      * @inheritDoc
      */
@@ -245,19 +258,6 @@ trait MetaCollection
         return $this;
     }
 
-    /**
-     * Join table to get tag information.
-     */
-    protected function joinMetaDataTables(): void
-    {
-        if (false === $this->hasJoinedMetaTables) {
-            $this->hasJoinedMetaTables = true;
-            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
-            $this->fields[] = 'journal_meta.name as meta_name';
-            $this->fields[] = 'journal_meta.data as meta_data';
-        }
-    }
-
     /**
      * @inheritDoc
      */

app/Helpers/Collector/GroupCollector.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Helpers\Collector;
 
 use Carbon\Carbon;
-use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
 use Closure;
 use Exception;
@@ -515,8 +514,8 @@ class GroupCollector implements GroupCollectorInterface
 
             if (!array_key_exists($groupId, $groups)) {
                 // make new array
-                $parsedGroup                            = $this->parseAugmentedJournal($augumentedJournal);
+                $parsedGroup = $this->parseAugmentedJournal($augumentedJournal);
-                $groupArray                             = [
+                $groupArray  = [
                     'id'               => (int)$augumentedJournal->transaction_group_id,
                     'user_id'          => (int)$augumentedJournal->user_id,
                     // Field transaction_group_title was added by the query.

app/Helpers/Fiscal/FiscalHelper.php

@@ -42,7 +42,7 @@ class FiscalHelper implements FiscalHelperInterface
      */
     public function __construct()
     {
-        $this->useCustomFiscalYear = (bool) app('preferences')->get('customFiscalYear', false)->data;
+        $this->useCustomFiscalYear = (bool)app('preferences')->get('customFiscalYear', false)->data;
     }
 
     /**

app/Helpers/Report/NetWorth.php

@@ -32,7 +32,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
 use JsonException;
 
 /**
@@ -112,7 +111,6 @@ class NetWorth implements NetWorthInterface
                 $netWorth[$currencyId] = '0';
             }
             $netWorth[$currencyId] = bcadd($balance, $netWorth[$currencyId]);
-
 //            Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId]));
         }
         ksort($netWorth);
@@ -184,7 +182,9 @@ class NetWorth implements NetWorthInterface
      */
     private function getAccounts(): Collection
     {
-        $accounts = $this->accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
+        $accounts = $this->accountRepository->getAccountsByType(
+            [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]
+        );
         $filtered = new Collection();
         /** @var Account $account */
         foreach ($accounts as $account) {

app/Http/Controllers/Admin/UpdateController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -109,7 +109,6 @@ class ForgotPasswordController extends Controller
     /**
      * Show form for email recovery.
      *
-
      *
      * @return Factory|View
      * @throws FireflyException

app/Http/Controllers/Bill/ShowController.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Bill;
 
 use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Attachment;

app/Http/Controllers/Budget/ShowController.php

@@ -37,7 +37,6 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
-use JsonException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 

app/Http/Controllers/Category/IndexController.php

@@ -23,7 +23,6 @@ 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;

app/Http/Controllers/Category/ShowController.php

@@ -34,7 +34,6 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\View\View;
-use JsonException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 

app/Http/Controllers/Chart/BillController.php

@@ -23,7 +23,6 @@ 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;

app/Http/Controllers/Chart/TransactionController.php

@@ -25,7 +25,6 @@ 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;

app/Http/Controllers/Json/ReconcileController.php

@@ -31,8 +31,6 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -46,7 +44,7 @@ use Throwable;
  */
 class ReconcileController extends Controller
 {
-    private AccountRepositoryInterface  $accountRepos;
+    private AccountRepositoryInterface $accountRepos;
 
     /**
      * ReconcileController constructor.
@@ -62,7 +60,7 @@ class ReconcileController extends Controller
             function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-credit-card');
                 app('view')->share('title', (string)trans('firefly.accounts'));
-                $this->accountRepos  = app(AccountRepositoryInterface::class);
+                $this->accountRepos = app(AccountRepositoryInterface::class);
 
                 return $next($request);
             }

app/Http/Controllers/Json/RecurrenceController.php

@@ -71,7 +71,7 @@ class RecurrenceController extends Controller
      */
     public function events(Request $request): JsonResponse
     {
-        $occurrences = [];
+        $occurrences      = [];
         $return           = [];
         $start            = Carbon::createFromFormat('Y-m-d', $request->get('start'));
         $end              = Carbon::createFromFormat('Y-m-d', $request->get('end'));

app/Http/Controllers/PiggyBank/ShowController.php

@@ -32,6 +32,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Transformers\PiggyBankTransformer;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\View\View;
+use JsonException;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -69,7 +70,7 @@ class ShowController extends Controller
      *
      * @return Factory|View
      * @throws FireflyException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function show(PiggyBank $piggyBank)
     {