Run phpcs locally to make sure phpstan stays fixed. [skip ci]

app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php

@@ -28,11 +28,9 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;

app/Console/Commands/Correction/RemovesEmptyGroups.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
-use Exception;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use Illuminate\Console\Command;
@@ -39,7 +38,7 @@ class RemovesEmptyGroups extends Command
     /**
      * Execute the console command.
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function handle(): int
     {

app/Console/Commands/Upgrade/UpgradesLiabilities.php

@@ -138,13 +138,13 @@ class UpgradesLiabilities extends Command
 
     private function getSourceTransaction(TransactionJournal $journal): ?Transaction
     {
-        /** @var Transaction|null */
+        /** @var null|Transaction */
         return $journal->transactions()->where('amount', '<', 0)->first();
     }
 
     private function getDestinationTransaction(TransactionJournal $journal): ?Transaction
     {
-        /** @var Transaction|null */
+        /** @var null|Transaction */
         return $journal->transactions()->where('amount', '>', 0)->first();
     }
 

app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php

@@ -30,7 +30,6 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use Illuminate\Console\Command;
@@ -208,7 +207,7 @@ class UpgradesTransferCurrencies extends Command
 
     private function getSourceTransaction(TransactionJournal $transfer): ?Transaction
     {
-        /** @var Transaction|null */
+        /** @var null|Transaction */
         return $transfer->transactions()->where('amount', '<', 0)->first();
     }
 
@@ -244,7 +243,7 @@ class UpgradesTransferCurrencies extends Command
 
     private function getDestinationTransaction(TransactionJournal $transfer): ?Transaction
     {
-        /** @var Transaction|null */
+        /** @var null|Transaction */
         return $transfer->transactions()->where('amount', '>', 0)->first();
     }
 

app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php

@@ -28,11 +28,9 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@@ -175,7 +173,7 @@ class UpgradesVariousCurrencyInformation extends Command
      */
     private function getLeadTransaction(TransactionJournal $journal): ?Transaction
     {
-        /** @var Transaction|null $lead */
+        /** @var null|Transaction $lead */
         $lead = null;
 
         switch ($journal->transactionType->type) {
@@ -214,7 +212,8 @@ class UpgradesVariousCurrencyInformation extends Command
 
                 break;
         }
-        /** @var Transaction|null */
+
+        /** @var null|Transaction */
         return $lead;
     }
 

app/Factory/AccountFactory.php

@@ -160,7 +160,7 @@ class AccountFactory
         app('log')->debug(sprintf('Now in AccountFactory::find("%s", "%s")', $accountName, $accountType));
         $type = AccountType::whereType($accountType)->first();
 
-        /** @var Account|null */
+        /** @var null|Account */
         return $this->user->accounts()->where('account_type_id', $type->id)->where('name', $accountName)->first();
     }
 

app/Factory/BillFactory.php

@@ -129,7 +129,7 @@ class BillFactory
 
     public function findByName(string $name): ?Bill
     {
-        /** @var Bill|null */
+        /** @var null|Bill */
         return $this->user->bills()->whereLike('name', sprintf('%%%s%%', $name))->first();
     }
 

app/Factory/BudgetFactory.php

@@ -63,7 +63,7 @@ class BudgetFactory
 
     public function findByName(string $name): ?Budget
     {
-        /** @var Budget|null */
+        /** @var null|Budget */
         return $this->user->budgets()->where('name', $name)->first();
     }
 

app/Factory/CategoryFactory.php

@@ -84,7 +84,7 @@ class CategoryFactory
 
     public function findByName(string $name): ?Category
     {
-        /** @var Category|null */
+        /** @var null|Category */
         return $this->user->categories()->where('name', $name)->first();
     }
 

app/Factory/PiggyBankFactory.php

@@ -67,7 +67,7 @@ class PiggyBankFactory
     public function store(array $data): PiggyBank
     {
 
-        $piggyBankData = $data;
+        $piggyBankData                            = $data;
 
         // unset some fields
         unset($piggyBankData['object_group_title'], $piggyBankData['transaction_currency_code'], $piggyBankData['transaction_currency_id'], $piggyBankData['accounts'], $piggyBankData['object_group_id'], $piggyBankData['notes']);
@@ -91,11 +91,11 @@ class PiggyBankFactory
 
             throw new FireflyException('400005: Could not store new piggy bank.', 0, $e);
         }
-        $piggyBank = $this->setOrder($piggyBank, $data);
+        $piggyBank                                = $this->setOrder($piggyBank, $data);
         $this->linkToAccountIds($piggyBank, $data['accounts']);
         $this->piggyBankRepository->updateNote($piggyBank, $data['notes']);
 
-        $objectGroupTitle = $data['object_group_title'] ?? '';
+        $objectGroupTitle                         = $data['object_group_title'] ?? '';
         if ('' !== $objectGroupTitle) {
             $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
             if (null !== $objectGroup) {
@@ -103,7 +103,7 @@ class PiggyBankFactory
             }
         }
         // try also with ID
-        $objectGroupId = (int) ($data['object_group_id'] ?? 0);
+        $objectGroupId                            = (int) ($data['object_group_id'] ?? 0);
         if (0 !== $objectGroupId) {
             $objectGroup = $this->findObjectGroupById($objectGroupId);
             if (null !== $objectGroup) {
@@ -111,7 +111,7 @@ class PiggyBankFactory
             }
         }
         Log::debug('Touch piggy bank');
-        $piggyBank->encrypted = false;
+        $piggyBank->encrypted                     = false;
         $piggyBank->save();
         $piggyBank->touch();
 
@@ -144,10 +144,11 @@ class PiggyBankFactory
         // first find by ID:
         if ($piggyBankId > 0) {
             $piggyBank = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
-                                  ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+                ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
-                                  ->where('accounts.user_id', $this->user->id)
+                ->where('accounts.user_id', $this->user->id)
-                                  ->where('piggy_banks.id', $piggyBankId)
+                ->where('piggy_banks.id', $piggyBankId)
-                                  ->first(['piggy_banks.*']);
+                ->first(['piggy_banks.*'])
+            ;
             if (null !== $piggyBank) {
                 return $piggyBank;
             }
@@ -168,16 +169,17 @@ class PiggyBankFactory
     public function findByName(string $name): ?PiggyBank
     {
         return PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
-                        ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
-                        ->where('accounts.user_id', $this->user->id)
+            ->where('accounts.user_id', $this->user->id)
-                        ->where('piggy_banks.name', $name)
+            ->where('piggy_banks.name', $name)
-                        ->first(['piggy_banks.*']);
+            ->first(['piggy_banks.*'])
+        ;
     }
 
     private function setOrder(PiggyBank $piggyBank, array $data): PiggyBank
     {
         $this->resetOrder();
-        $order = $this->getMaxOrder() + 1;
+        $order            = $this->getMaxOrder() + 1;
         if (array_key_exists('order', $data)) {
             $order = $data['order'];
         }
@@ -192,14 +194,15 @@ class PiggyBankFactory
     {
         // TODO duplicate code
         $set     = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
-                            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
-                            ->where('accounts.user_id', $this->user->id)
+            ->where('accounts.user_id', $this->user->id)
-                            ->with(
+            ->with(
-                                [
+                [
-                                    'objectGroups',
+                    'objectGroups',
-                                ]
+                ]
-                            )
+            )
-                            ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']);
+            ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*'])
+        ;
         $current = 1;
         foreach ($set as $piggyBank) {
             if ($piggyBank->order !== $current) {

app/Factory/TransactionJournalFactory.php

@@ -34,7 +34,6 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionJournalMeta;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -451,7 +450,7 @@ class TransactionJournalFactory
         app('log')->debug('Now in getCurrencyByAccount()');
 
         return match ($type) {
-            default                  => $this->getCurrency($currency, $source),
+            default                             => $this->getCurrency($currency, $source),
             TransactionTypeEnum::DEPOSIT->value => $this->getCurrency($currency, $destination),
         };
     }

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -31,7 +31,6 @@ use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use FireflyIII\TransactionRules\Engine\RuleEngineInterface;

app/Helpers/Collector/GroupCollector.php

@@ -38,7 +38,6 @@ use FireflyIII\Helpers\Collector\Extensions\TimeCollection;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;

app/Helpers/Report/NetWorth.php

@@ -28,7 +28,6 @@ use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;

app/Helpers/Report/PopupReport.php

@@ -28,7 +28,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;

app/Http/Controllers/Account/CreateController.php

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\AccountFormRequest;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\ModelInformation;
 use Illuminate\Contracts\View\Factory;

app/Http/Controllers/Account/ReconcileController.php

@@ -32,8 +32,6 @@ use FireflyIII\Factory\TransactionGroupFactory;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\ReconciliationStoreRequest;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Steam;

app/Http/Controllers/Account/ShowController.php

@@ -90,8 +90,6 @@ class ShowController extends Controller
 
         /** @var Carbon $start */
         /** @var Carbon $end */
-
-
         if ($end->lt($start)) {
             [$start, $end] = [$end, $start];
         }

app/Http/Controllers/Budget/CreateController.php

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\BudgetFormStoreRequest;
-use FireflyIII\Models\AutoBudget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
@@ -74,7 +73,7 @@ class CreateController extends Controller
 
         // auto budget types
         $autoBudgetTypes   = [
-            0                                => (string) trans('firefly.auto_budget_none'),
+            0                                           => (string) trans('firefly.auto_budget_none'),
             AutoBudgetType::AUTO_BUDGET_RESET->value    => (string) trans('firefly.auto_budget_reset'),
             AutoBudgetType::AUTO_BUDGET_ROLLOVER->value => (string) trans('firefly.auto_budget_rollover'),
             AutoBudgetType::AUTO_BUDGET_ADJUSTED->value => (string) trans('firefly.auto_budget_adjusted'),

app/Http/Controllers/Budget/EditController.php

@@ -28,7 +28,6 @@ use FireflyIII\Enums\AutoBudgetType;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\BudgetFormUpdateRequest;
-use FireflyIII\Models\AutoBudget;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
@@ -76,7 +75,7 @@ class EditController extends Controller
 
         // auto budget types
         $autoBudgetTypes   = [
-            0                                => (string) trans('firefly.auto_budget_none'),
+            0                                           => (string) trans('firefly.auto_budget_none'),
             AutoBudgetType::AUTO_BUDGET_RESET->value    => (string) trans('firefly.auto_budget_reset'),
             AutoBudgetType::AUTO_BUDGET_ROLLOVER->value => (string) trans('firefly.auto_budget_rollover'),
             AutoBudgetType::AUTO_BUDGET_ADJUSTED->value => (string) trans('firefly.auto_budget_adjusted'),

app/Http/Controllers/Budget/ShowController.php

@@ -31,7 +31,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\AugumentData;
@@ -84,7 +83,6 @@ class ShowController extends Controller
 
         /** @var Carbon $start */
         /** @var Carbon $end */
-
         $subTitle  = trans(
             'firefly.without_budget_between',
             ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat)]

app/Http/Controllers/Category/NoCategoryController.php

@@ -29,7 +29,6 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
@@ -80,7 +79,6 @@ class NoCategoryController extends Controller
 
         /** @var Carbon $start */
         /** @var Carbon $end */
-
         $page      = (int) $request->get('page');
         $pageSize  = (int) app('preferences')->get('listPageSize', 50)->data;
         $subTitle  = trans(

app/Http/Controllers/Category/ShowController.php

@@ -79,7 +79,6 @@ class ShowController extends Controller
 
         /** @var Carbon $start */
         /** @var Carbon $end */
-
         $subTitleIcon = 'fa-bookmark';
         $page         = (int) $request->get('page');
         $attachments  = $this->repository->getAttachments($category);

app/Http/Controllers/Chart/AccountController.php

@@ -32,7 +32,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;

app/Http/Controllers/Chart/BudgetController.php

@@ -32,7 +32,6 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\NoBudgetRepositoryInterface;

app/Http/Controllers/Chart/TransactionController.php

@@ -29,7 +29,6 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\JsonResponse;
 

app/Http/Controllers/DebugController.php

@@ -29,7 +29,6 @@ use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Middleware\IsDemoUser;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
@@ -67,6 +66,7 @@ class DebugController extends Controller
         if (!auth()->user()->hasRole('owner')) {
             throw new NotFoundHttpException();
         }
+
         /** @var iterable $routes */
         $routes = Route::getRoutes();
         $return = [];

app/Http/Controllers/HomeController.php

@@ -30,7 +30,6 @@ use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Middleware\Installer;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\User;

app/Http/Controllers/JavascriptController.php

@@ -27,7 +27,6 @@ use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;

app/Http/Controllers/Json/BoxController.php

@@ -30,8 +30,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;

app/Http/Controllers/Json/ReconcileController.php

@@ -31,7 +31,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Steam;
 use Illuminate\Http\JsonResponse;

app/Http/Controllers/NewUserController.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Http\Controllers;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\NewUserFormRequest;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\CreateStuff;

app/Http/Controllers/PreferencesController.php

@@ -29,7 +29,6 @@ use FireflyIII\Events\Test\UserTestNotificationChannel;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\PreferencesRequest;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;

app/Http/Controllers/Recurring/CreateController.php

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\RecurrenceFormRequest;
-use FireflyIII\Models\RecurrenceRepetition;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;

app/Http/Controllers/Report/BalanceController.php

@@ -30,7 +30,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Support\Collection;
 

app/Http/Controllers/ReportController.php

@@ -30,7 +30,6 @@ use FireflyIII\Generator\Report\ReportGeneratorFactory;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Http\Requests\ReportFormRequest;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\RenderPartialViews;

app/Http/Controllers/Transaction/ConvertController.php

@@ -30,7 +30,6 @@ use FireflyIII\Events\UpdatedTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;

app/Http/Controllers/Transaction/MassController.php

@@ -31,9 +31,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\MassDeleteJournalRequest;
 use FireflyIII\Http\Requests\MassEditJournalRequest;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;

app/Http/Middleware/InterestingMessage.php

@@ -142,7 +142,8 @@ class InterestingMessage
         $message   = $request->get('message');
 
         /** @var User $user */
-        $user = auth()->user();
+        $user      = auth()->user();
+
         /** @var null|Account $account */
         $account   = $user->accounts()->withTrashed()->find($accountId);
 

app/Http/Requests/RecurrenceFormRequest.php

@@ -28,7 +28,6 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Factory\CategoryFactory;
 use FireflyIII\Models\Recurrence;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Rules\ValidRecurrenceRepetitionType;
 use FireflyIII\Rules\ValidRecurrenceRepetitionValue;

app/Jobs/CreateAutoBudgetLimits.php

@@ -203,7 +203,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
             )
         );
 
-        /** @var BudgetLimit|null */
+        /** @var null|BudgetLimit */
         return $budget->budgetlimits()
             ->where('start_date', $start->format('Y-m-d'))
             ->where('end_date', $end->format('Y-m-d'))->first()

app/Models/Account.php

@@ -39,8 +39,6 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Account extends Model
 {
     use HasFactory;

app/Models/AccountBalance.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-/**
- */
 class AccountBalance extends Model
 {
     use HasFactory;

app/Models/AccountMeta.php

@@ -27,8 +27,6 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-/**
- */
 class AccountMeta extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/AccountType.php

@@ -28,8 +28,6 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
-/**
- */
 class AccountType extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Attachment.php

@@ -34,8 +34,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Attachment extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/AuditLogEntry.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class AuditLogEntry extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/AutoBudget.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class AutoBudget extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/AvailableBudget.php

@@ -33,8 +33,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class AvailableBudget extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Bill.php

@@ -36,8 +36,6 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Bill extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Budget.php

@@ -35,8 +35,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Budget extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/BudgetLimit.php

@@ -34,8 +34,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class BudgetLimit extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Category.php

@@ -34,8 +34,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Category extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Configuration.php

@@ -27,8 +27,6 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class Configuration extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/CurrencyExchangeRate.php

@@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class CurrencyExchangeRate extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/GroupMembership.php

@@ -31,8 +31,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-/**
- */
 class GroupMembership extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/InvitedUser.php

@@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class InvitedUser extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/LinkType.php

@@ -29,8 +29,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class LinkType extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Location.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
-/**
- */
 class Location extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Note.php

@@ -29,8 +29,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class Note extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/ObjectGroup.php

@@ -33,8 +33,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class ObjectGroup extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/PiggyBank.php

@@ -34,8 +34,6 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class PiggyBank extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/PiggyBankEvent.php

@@ -29,14 +29,12 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-/**
- */
 class PiggyBankEvent extends Model
 {
     use ReturnsIntegerIdTrait;
 
     protected $casts
-        = [
+                        = [
             'created_at'    => 'datetime',
             'updated_at'    => 'datetime',
             'date'          => SeparateTimezoneCaster::class,
@@ -46,7 +44,7 @@ class PiggyBankEvent extends Model
 
     protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'date_tz', 'amount', 'native_amount'];
 
-    protected $hidden = ['amount_encrypted'];
+    protected $hidden   = ['amount_encrypted'];
 
     public function piggyBank(): BelongsTo
     {
@@ -72,14 +70,14 @@ class PiggyBankEvent extends Model
     protected function amount(): Attribute
     {
         return Attribute::make(
-            get: static fn($value) => (string) $value,
+            get: static fn ($value) => (string) $value,
         );
     }
 
     protected function piggyBankId(): Attribute
     {
         return Attribute::make(
-            get: static fn($value) => (int) $value,
+            get: static fn ($value) => (int) $value,
         );
     }
 }

app/Models/PiggyBankRepetition.php

@@ -31,8 +31,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-/**
- */
 class PiggyBankRepetition extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Preference.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Preference extends Model
 {
     use ReturnsIntegerIdTrait;
@@ -90,6 +88,7 @@ class Preference extends Model
                 $preference->user_id       = (int) $user->id;
                 $preference->user_group_id = in_array($value, $items, true) ? $userGroupId : null;
                 $preference->save();
+
                 return $preference;
             }
         }

app/Models/Recurrence.php

@@ -36,8 +36,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Recurrence extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/RecurrenceMeta.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class RecurrenceMeta extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/RecurrenceRepetition.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class RecurrenceRepetition extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/RecurrenceTransaction.php

@@ -31,8 +31,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class RecurrenceTransaction extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/RecurrenceTransactionMeta.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class RecurrenceTransactionMeta extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Role.php

@@ -28,8 +28,6 @@ use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
-/**
- */
 class Role extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Rule.php

@@ -33,8 +33,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Rule extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/RuleAction.php

@@ -31,8 +31,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\ExpressionLanguage\SyntaxError;
 
-/**
- */
 class RuleAction extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/RuleGroup.php

@@ -33,8 +33,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class RuleGroup extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/RuleTrigger.php

@@ -28,8 +28,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-/**
- */
 class RuleTrigger extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Tag.php

@@ -34,8 +34,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Tag extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Transaction.php

@@ -33,8 +33,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class Transaction extends Model
 {
     use HasFactory;

app/Models/TransactionCurrency.php

@@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class TransactionCurrency extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/TransactionGroup.php

@@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class TransactionGroup extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/TransactionJournal.php

@@ -41,8 +41,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * @method EloquentBuilder|static before()
+ * @method        EloquentBuilder|static before()
- * @method EloquentBuilder|static after()
+ * @method        EloquentBuilder|static after()
  * @method static EloquentBuilder|static query()
  */
 class TransactionJournal extends Model

app/Models/TransactionJournalLink.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class TransactionJournalLink extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/TransactionJournalMeta.php

@@ -29,8 +29,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-/**
- */
 class TransactionJournalMeta extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/TransactionType.php

@@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class TransactionType extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/UserGroup.php

@@ -25,8 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Models;
 
 use FireflyIII\Enums\UserRoleEnum;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
@@ -35,8 +33,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class UserGroup extends Model
 {
     use ReturnsIntegerIdTrait;
@@ -151,7 +147,7 @@ class UserGroup extends Model
      */
     public function piggyBanks(): HasManyThrough
     {
-        return $this->hasManyThrough( PiggyBank::class, Account::class);
+        return $this->hasManyThrough(PiggyBank::class, Account::class);
     }
 
     public function recurrences(): HasMany

app/Models/UserRole.php

@@ -28,8 +28,6 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
-/**
- */
 class UserRole extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/Webhook.php

@@ -36,8 +36,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class Webhook extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/WebhookAttempt.php

@@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class WebhookAttempt extends Model
 {
     use ReturnsIntegerIdTrait;

app/Models/WebhookMessage.php

@@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/**
- */
 class WebhookMessage extends Model
 {
     use ReturnsIntegerIdTrait;

app/Repositories/Account/AccountRepository.php

@@ -36,7 +36,6 @@ use FireflyIII\Models\Location;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
 use FireflyIII\Support\Facades\Steam;
@@ -120,7 +119,7 @@ class AccountRepository implements AccountRepositoryInterface
             $dbQuery->whereIn('account_types.type', $types);
         }
 
-        /** @var Account|null */
+        /** @var null|Account */
         return $dbQuery->first(['accounts.*']);
     }
 
@@ -134,7 +133,7 @@ class AccountRepository implements AccountRepositoryInterface
             $query->whereIn('account_types.type', $types);
         }
 
-        /** @var Account|null */
+        /** @var null|Account */
         return $query->where('iban', $iban)->first(['accounts.*']);
     }
 
@@ -278,7 +277,7 @@ class AccountRepository implements AccountRepositoryInterface
 
     public function getLocation(Account $account): ?Location
     {
-        /** @var Location|null */
+        /** @var null|Location */
         return $account->locations()->first();
     }
 
@@ -428,7 +427,7 @@ class AccountRepository implements AccountRepositoryInterface
 
     public function find(int $accountId): ?Account
     {
-        /** @var Account|null */
+        /** @var null|Account */
         return $this->user->accounts()->find($accountId);
     }
 

app/Repositories/Account/AccountTasker.php

@@ -28,7 +28,6 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;

app/Repositories/Bill/BillRepository.php

@@ -142,7 +142,7 @@ class BillRepository implements BillRepositoryInterface
      */
     public function find(int $billId): ?Bill
     {
-        /** @var Bill|null */
+        /** @var null|Bill */
         return $this->user->bills()->find($billId);
     }
 
@@ -151,7 +151,7 @@ class BillRepository implements BillRepositoryInterface
      */
     public function findByName(string $name): ?Bill
     {
-        /** @var Bill|null */
+        /** @var null|Bill */
         return $this->user->bills()->where('name', $name)->first(['bills.*']);
     }
 

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -103,7 +103,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
      */
     public function find(TransactionCurrency $currency, Carbon $start, Carbon $end): ?AvailableBudget
     {
-        /** @var AvailableBudget|null */
+        /** @var null|AvailableBudget */
         return $this->user->availableBudgets()
             ->where('transaction_currency_id', $currency->id)
             ->where('start_date', $start->format('Y-m-d'))
@@ -195,7 +195,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
 
     public function getByCurrencyDate(Carbon $start, Carbon $end, TransactionCurrency $currency): ?AvailableBudget
     {
-        /** @var AvailableBudget|null */
+        /** @var null|AvailableBudget */
         return $this->user
             ->availableBudgets()
             ->where('transaction_currency_id', $currency->id)
@@ -226,6 +226,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
         }
         $availableBudget->amount = $amount;
         $availableBudget->save();
+
         return $availableBudget;
     }
 

app/Repositories/Budget/BudgetLimitRepository.php

@@ -285,7 +285,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         $currency->save();
 
         // find the budget:
-        /** @var Budget|null $budget */
+        /** @var null|Budget $budget */
         $budget                         = $this->user->budgets()->find((int) $data['budget_id']);
         if (null === $budget) {
             throw new FireflyException('200004: Budget does not exist.');
@@ -324,7 +324,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
 
     public function find(Budget $budget, TransactionCurrency $currency, Carbon $start, Carbon $end): ?BudgetLimit
     {
-        /** @var BudgetLimit|null */
+        /** @var null|BudgetLimit */
         return $budget->budgetlimits()
             ->where('transaction_currency_id', $currency->id)
             ->where('start_date', $start->format('Y-m-d'))

app/Repositories/Budget/BudgetRepository.php

@@ -37,7 +37,6 @@ use FireflyIII\Models\Note;
 use FireflyIII\Models\RecurrenceTransactionMeta;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\RuleTrigger;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\BudgetDestroyService;
@@ -384,7 +383,7 @@ class BudgetRepository implements BudgetRepositoryInterface
 
     public function getAutoBudget(Budget $budget): ?AutoBudget
     {
-        /** @var AutoBudget|null */
+        /** @var null|AutoBudget */
         return $budget->autoBudgets()->first();
     }
 
@@ -443,7 +442,7 @@ class BudgetRepository implements BudgetRepositoryInterface
      */
     public function find(?int $budgetId = null): ?Budget
     {
-        /** @var Budget|null */
+        /** @var null|Budget */
         return $this->user->budgets()->find($budgetId);
     }
 
@@ -515,7 +514,8 @@ class BudgetRepository implements BudgetRepositoryInterface
             return null;
         }
         $query = sprintf('%%%s%%', $name);
-        /** @var Budget|null */
+
+        /** @var null|Budget */
         return $this->user->budgets()->whereLike('name', $query)->first();
     }
 

app/Repositories/Budget/NoBudgetRepository.php

@@ -28,7 +28,6 @@ use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;

app/Repositories/Budget/OperationsRepository.php

@@ -30,7 +30,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;

app/Repositories/Category/CategoryRepository.php

@@ -129,7 +129,7 @@ class CategoryRepository implements CategoryRepositoryInterface
      */
     public function find(int $categoryId): ?Category
     {
-        /** @var Category|null */
+        /** @var null|Category */
         return $this->user->categories()->find($categoryId);
     }
 
@@ -138,7 +138,7 @@ class CategoryRepository implements CategoryRepositoryInterface
      */
     public function findByName(string $name): ?Category
     {
-        /** @var Category|null */
+        /** @var null|Category */
         return $this->user->categories()->where('name', $name)->first(['categories.*']);
     }
 

app/Repositories/Category/NoCategoryRepository.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Repositories\Category;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;

app/Repositories/Category/OperationsRepository.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Repositories\Category;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\User;

app/Repositories/Journal/JournalCLIRepository.php

@@ -54,13 +54,14 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface
      */
     public function getJournalBudgetId(TransactionJournal $journal): int
     {
-        $budget = $journal->budgets()->first();
+        $budget      = $journal->budgets()->first();
         if (null !== $budget) {
             return $budget->id;
         }
-        /** @var Transaction|null $transaction */
+
+        /** @var null|Transaction $transaction */
         $transaction = $journal->transactions()->first();
-        $budget = $transaction?->budgets()->first();
+        $budget      = $transaction?->budgets()->first();
         if (null !== $budget) {
             return $budget->id;
         }
@@ -73,13 +74,14 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface
      */
     public function getJournalCategoryId(TransactionJournal $journal): int
     {
-        $category = $journal->categories()->first();
+        $category    = $journal->categories()->first();
         if (null !== $category) {
             return $category->id;
         }
-        /** @var Transaction|null $transaction */
+
+        /** @var null|Transaction $transaction */
         $transaction = $journal->transactions()->first();
-        $category = $transaction?->categories()->first();
+        $category    = $transaction?->categories()->first();
         if (null !== $category) {
             return $category->id;
         }