diff --git a/app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php b/app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php index f147160361..39cb9e9b2d 100644 --- a/app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php +++ b/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; diff --git a/app/Console/Commands/Correction/RemovesEmptyGroups.php b/app/Console/Commands/Correction/RemovesEmptyGroups.php index 9058b2f2ab..7f64fc048a 100644 --- a/app/Console/Commands/Correction/RemovesEmptyGroups.php +++ b/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 { diff --git a/app/Console/Commands/Upgrade/UpgradesLiabilities.php b/app/Console/Commands/Upgrade/UpgradesLiabilities.php index b9214069e6..0fc444304b 100644 --- a/app/Console/Commands/Upgrade/UpgradesLiabilities.php +++ b/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(); } diff --git a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php b/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php index 89258d3e77..eec9c08e44 100644 --- a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php +++ b/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(); } diff --git a/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php b/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php index 7a5002c3e6..ee4ba67ada 100644 --- a/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php +++ b/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; } diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.php index a2d2c4f881..2a359bc823 100644 --- a/app/Factory/AccountFactory.php +++ b/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(); } diff --git a/app/Factory/BillFactory.php b/app/Factory/BillFactory.php index 18a2889fbe..430997761a 100644 --- a/app/Factory/BillFactory.php +++ b/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(); } diff --git a/app/Factory/BudgetFactory.php b/app/Factory/BudgetFactory.php index 76cbc66a7d..b08b1f2e4e 100644 --- a/app/Factory/BudgetFactory.php +++ b/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(); } diff --git a/app/Factory/CategoryFactory.php b/app/Factory/CategoryFactory.php index caf095471e..9978e2c233 100644 --- a/app/Factory/CategoryFactory.php +++ b/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(); } diff --git a/app/Factory/PiggyBankFactory.php b/app/Factory/PiggyBankFactory.php index 5835757ce5..6755df9559 100644 --- a/app/Factory/PiggyBankFactory.php +++ b/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') - ->where('accounts.user_id', $this->user->id) - ->where('piggy_banks.id', $piggyBankId) - ->first(['piggy_banks.*']); + ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id') + ->where('accounts.user_id', $this->user->id) + ->where('piggy_banks.id', $piggyBankId) + ->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') - ->where('accounts.user_id', $this->user->id) - ->where('piggy_banks.name', $name) - ->first(['piggy_banks.*']); + ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id') + ->where('accounts.user_id', $this->user->id) + ->where('piggy_banks.name', $name) + ->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') - ->where('accounts.user_id', $this->user->id) - ->with( - [ - 'objectGroups', - ] - ) - ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']); + ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id') + ->where('accounts.user_id', $this->user->id) + ->with( + [ + 'objectGroups', + ] + ) + ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']) + ; $current = 1; foreach ($set as $piggyBank) { if ($piggyBank->order !== $current) { diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index b2826b0ab1..d2d0d50fda 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/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), }; } diff --git a/app/Handlers/Events/UpdatedGroupEventHandler.php b/app/Handlers/Events/UpdatedGroupEventHandler.php index 585b839081..ef1ed4e430 100644 --- a/app/Handlers/Events/UpdatedGroupEventHandler.php +++ b/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; diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index 2567e3853b..5c0c176afd 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/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; diff --git a/app/Helpers/Report/NetWorth.php b/app/Helpers/Report/NetWorth.php index c57bde60cf..c6dfee68a7 100644 --- a/app/Helpers/Report/NetWorth.php +++ b/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; diff --git a/app/Helpers/Report/PopupReport.php b/app/Helpers/Report/PopupReport.php index 019e76c26b..586b4a0897 100644 --- a/app/Helpers/Report/PopupReport.php +++ b/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; diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index cf9957f670..8f0904f859 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/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; diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 30cecb967b..f8b8c8ed04 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/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; diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 1360a462d5..50c7ee56c9 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/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]; } diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 6c27bed324..602d797e59 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/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'), diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index 23ad6bb1c9..73110ded81 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/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'), diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 27137aa543..e59abc4437 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/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)] diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 323b309f4e..7309209ca2 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/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( diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index c99370b6cb..d9a03f2f4a 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/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); diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index c8f13b9248..a559bfa26f 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/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; diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 996a7432da..10e20eea4d 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/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; diff --git a/app/Http/Controllers/Chart/TransactionController.php b/app/Http/Controllers/Chart/TransactionController.php index cd625b61ba..05ed97f518 100644 --- a/app/Http/Controllers/Chart/TransactionController.php +++ b/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; diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index d7c06b02af..ae65970791 100644 --- a/app/Http/Controllers/DebugController.php +++ b/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 = []; diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index af162f6f94..ab2f6d6720 100644 --- a/app/Http/Controllers/HomeController.php +++ b/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; diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 8e897845b6..2111caa5d2 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/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; diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 7bfeb9fd51..66d78230a9 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/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; diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 089fd09bce..12c694fe34 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/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; diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 084aad756d..64b6956ca0 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/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; diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index c9813b1226..85606eb2ac 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/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; diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 9e2e014be9..391bb75365 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/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; diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index 8d554bea61..8efcb083f4 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/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; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 1f0cb1875b..d153861248 100644 --- a/app/Http/Controllers/ReportController.php +++ b/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; diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 25b37ca913..5f4c9b9cc0 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/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; diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 2d0a5b4125..f5d46ec514 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/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; diff --git a/app/Http/Middleware/InterestingMessage.php b/app/Http/Middleware/InterestingMessage.php index 4a4ab920fe..d6ca27466c 100644 --- a/app/Http/Middleware/InterestingMessage.php +++ b/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); diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 3d82eb6633..e08bca3a47 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/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; diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.php index 8c228a2f1b..da3d576cb7 100644 --- a/app/Jobs/CreateAutoBudgetLimits.php +++ b/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() diff --git a/app/Models/Account.php b/app/Models/Account.php index dfe33af896..c241eb9c4b 100644 --- a/app/Models/Account.php +++ b/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; diff --git a/app/Models/AccountBalance.php b/app/Models/AccountBalance.php index 2bd418bf67..e7eaf361ce 100644 --- a/app/Models/AccountBalance.php +++ b/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; diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 7aacf17970..fa3b58a5b6 100644 --- a/app/Models/AccountMeta.php +++ b/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; diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 6056a01671..cffbf7a8bf 100644 --- a/app/Models/AccountType.php +++ b/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; diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 1da02dff0b..ab3ec23b98 100644 --- a/app/Models/Attachment.php +++ b/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; diff --git a/app/Models/AuditLogEntry.php b/app/Models/AuditLogEntry.php index b13e76ea83..436436340e 100644 --- a/app/Models/AuditLogEntry.php +++ b/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; diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index 84078ca046..922931d5d4 100644 --- a/app/Models/AutoBudget.php +++ b/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; diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 40341fb1ab..f665705f69 100644 --- a/app/Models/AvailableBudget.php +++ b/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; diff --git a/app/Models/Bill.php b/app/Models/Bill.php index d71411edc0..273b9d0628 100644 --- a/app/Models/Bill.php +++ b/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; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 91387ba106..33a43f423d 100644 --- a/app/Models/Budget.php +++ b/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; diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index b715ab9a98..c330ab4f5b 100644 --- a/app/Models/BudgetLimit.php +++ b/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; diff --git a/app/Models/Category.php b/app/Models/Category.php index b07aa58e96..aa52efbd3b 100644 --- a/app/Models/Category.php +++ b/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; diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index 5028d26ba3..a6a137e975 100644 --- a/app/Models/Configuration.php +++ b/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; diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index 0cec202e79..722407d2a9 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/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; diff --git a/app/Models/GroupMembership.php b/app/Models/GroupMembership.php index d29e028f28..965cdc2608 100644 --- a/app/Models/GroupMembership.php +++ b/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; diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php index 97b25074a6..093f56f32f 100644 --- a/app/Models/InvitedUser.php +++ b/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; diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index edce1a3f27..a865277cd9 100644 --- a/app/Models/LinkType.php +++ b/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; diff --git a/app/Models/Location.php b/app/Models/Location.php index 3f5429ba8f..50d051d532 100644 --- a/app/Models/Location.php +++ b/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; diff --git a/app/Models/Note.php b/app/Models/Note.php index 94ae3448ce..29762af139 100644 --- a/app/Models/Note.php +++ b/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; diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index b011c18ebf..6133acd0d0 100644 --- a/app/Models/ObjectGroup.php +++ b/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; diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index eb7414ae2a..8d0a680941 100644 --- a/app/Models/PiggyBank.php +++ b/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; diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 159cfe0218..9ab7ab7c18 100644 --- a/app/Models/PiggyBankEvent.php +++ b/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, ); } } diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index f1d8e3d5ac..715d5b276c 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/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; diff --git a/app/Models/Preference.php b/app/Models/Preference.php index af9d6d4a78..eef5ff17ec 100644 --- a/app/Models/Preference.php +++ b/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; } } diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 52e77b7979..41106fb9ff 100644 --- a/app/Models/Recurrence.php +++ b/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; diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index bfbea2ba84..c977252354 100644 --- a/app/Models/RecurrenceMeta.php +++ b/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; diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 6261a44952..5d66eb7e30 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/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; diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index 40c9b2008f..b648cf4cd2 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/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; diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index 6899a36cd0..c4e5758df4 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/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; diff --git a/app/Models/Role.php b/app/Models/Role.php index e5862c51a1..421e896d24 100644 --- a/app/Models/Role.php +++ b/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; diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 47e69b8a7e..37f0fa4e25 100644 --- a/app/Models/Rule.php +++ b/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; diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 1b250aedfc..f7fbd2e6eb 100644 --- a/app/Models/RuleAction.php +++ b/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; diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 273e1ef6ab..9b909aaa7e 100644 --- a/app/Models/RuleGroup.php +++ b/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; diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index a342ccdff1..ac400525d9 100644 --- a/app/Models/RuleTrigger.php +++ b/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; diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 4e17b31627..a17ca72b61 100644 --- a/app/Models/Tag.php +++ b/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; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 2f6876ec9d..65aff28889 100644 --- a/app/Models/Transaction.php +++ b/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; diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index f24d9d25ce..9577d3a2d4 100644 --- a/app/Models/TransactionCurrency.php +++ b/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; diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index fe0294f5c1..e42fb3763f 100644 --- a/app/Models/TransactionGroup.php +++ b/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; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index fb33823f0a..9b26bd0f30 100644 --- a/app/Models/TransactionJournal.php +++ b/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 after() + * @method EloquentBuilder|static before() + * @method EloquentBuilder|static after() * @method static EloquentBuilder|static query() */ class TransactionJournal extends Model diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index bc0d79314b..4d7d8a632f 100644 --- a/app/Models/TransactionJournalLink.php +++ b/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; diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index ca65121061..09ac979206 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/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; diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 09b75e6d47..3d5390b3da 100644 --- a/app/Models/TransactionType.php +++ b/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; diff --git a/app/Models/UserGroup.php b/app/Models/UserGroup.php index 1b801b5701..fbae2d70f6 100644 --- a/app/Models/UserGroup.php +++ b/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 diff --git a/app/Models/UserRole.php b/app/Models/UserRole.php index 89b7b1950e..dc422684cc 100644 --- a/app/Models/UserRole.php +++ b/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; diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index a99a0244e3..69e1eb1da4 100644 --- a/app/Models/Webhook.php +++ b/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; diff --git a/app/Models/WebhookAttempt.php b/app/Models/WebhookAttempt.php index bfa40bf76d..fa283f9ca2 100644 --- a/app/Models/WebhookAttempt.php +++ b/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; diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php index 134aa1b4d5..f18347330c 100644 --- a/app/Models/WebhookMessage.php +++ b/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; diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 0913d75650..6e0bba192f 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/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); } diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 5750336642..94cedca5d3 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/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; diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index b8bdbf7213..c6d666271c 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/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.*']); } diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index 40b74a7e4d..5dc7ed8ead 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/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; } diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php index 203fe91e02..59faf9ae5c 100644 --- a/app/Repositories/Budget/BudgetLimitRepository.php +++ b/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')) diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 7d41044d3b..e35ae55ae8 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/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(); } diff --git a/app/Repositories/Budget/NoBudgetRepository.php b/app/Repositories/Budget/NoBudgetRepository.php index fccb277cf1..decae30ffc 100644 --- a/app/Repositories/Budget/NoBudgetRepository.php +++ b/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; diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.php index 25ad300558..aa9639a1ef 100644 --- a/app/Repositories/Budget/OperationsRepository.php +++ b/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; diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index b9aed75534..d8ad866c45 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/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.*']); } diff --git a/app/Repositories/Category/NoCategoryRepository.php b/app/Repositories/Category/NoCategoryRepository.php index 438180d17e..9fdeae0978 100644 --- a/app/Repositories/Category/NoCategoryRepository.php +++ b/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; diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.php index a923374cf2..6a5fa3a77b 100644 --- a/app/Repositories/Category/OperationsRepository.php +++ b/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; diff --git a/app/Repositories/Journal/JournalCLIRepository.php b/app/Repositories/Journal/JournalCLIRepository.php index e5c83e891a..a605f60331 100644 --- a/app/Repositories/Journal/JournalCLIRepository.php +++ b/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; } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index d55668c352..0a07d7d166 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -185,7 +185,7 @@ class JournalRepository implements JournalRepositoryInterface */ public function find(int $journalId): ?TransactionJournal { - /** @var TransactionJournal|null */ + /** @var null|TransactionJournal */ return $this->user->transactionJournals()->find($journalId); } diff --git a/app/Repositories/ObjectGroup/CreatesObjectGroups.php b/app/Repositories/ObjectGroup/CreatesObjectGroups.php index 1710ca6405..5835a32f11 100644 --- a/app/Repositories/ObjectGroup/CreatesObjectGroups.php +++ b/app/Repositories/ObjectGroup/CreatesObjectGroups.php @@ -33,7 +33,7 @@ trait CreatesObjectGroups { protected function findObjectGroupById(int $groupId): ?ObjectGroup { - /** @var ObjectGroup|null */ + /** @var null|ObjectGroup */ return $this->user->objectGroups()->where('id', $groupId)->first(); } @@ -67,7 +67,7 @@ trait CreatesObjectGroups protected function findObjectGroup(string $title): ?ObjectGroup { - /** @var ObjectGroup|null */ + /** @var null|ObjectGroup */ return $this->user->objectGroups()->where('title', $title)->first(); } } diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 31bb7c8cdb..3458c52652 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -55,9 +55,10 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface Log::channel('audit')->info('Delete all piggy banks through destroyAll'); PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id') - ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id') - ->where('accounts.user_id', $this->user->id) - ->delete(); + ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id') + ->where('accounts.user_id', $this->user->id) + ->delete() + ; } public function findPiggyBank(?int $piggyBankId, ?string $piggyBankName): ?PiggyBank @@ -313,7 +314,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface throw new FireflyException('[b] Piggy bank repetitions are EOL.'); } Log::warning('Piggy bank repetitions are EOL.'); - /** @var PiggyBankRepetition|null */ + + /** @var null|PiggyBankRepetition */ return $piggyBank->piggyBankRepetitions()->first(); } diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 9b0323bd00..dc60b57122 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -96,7 +96,7 @@ class RuleRepository implements RuleRepositoryInterface */ public function getFirstRuleGroup(): RuleGroup { - /** @var RuleGroup|null */ + /** @var null|RuleGroup */ return $this->user->ruleGroups()->first(); } @@ -277,7 +277,7 @@ class RuleRepository implements RuleRepositoryInterface public function find(int $ruleId): ?Rule { - /** @var Rule|null */ + /** @var null|Rule */ return $this->user->rules()->find($ruleId); } diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index 830fe2d018..26c8096039 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -208,13 +208,13 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface public function find(int $ruleGroupId): ?RuleGroup { - /** @var RuleGroup|null */ + /** @var null|RuleGroup */ return $this->user->ruleGroups()->find($ruleGroupId); } public function findByTitle(string $title): ?RuleGroup { - /** @var RuleGroup|null */ + /** @var null|RuleGroup */ return $this->user->ruleGroups()->where('title', $title)->first(); } diff --git a/app/Repositories/Tag/OperationsRepository.php b/app/Repositories/Tag/OperationsRepository.php index ba3c8ec738..20ee0ad654 100644 --- a/app/Repositories/Tag/OperationsRepository.php +++ b/app/Repositories/Tag/OperationsRepository.php @@ -28,7 +28,6 @@ use Carbon\Carbon; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; -use FireflyIII\Models\TransactionType; use FireflyIII\User; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index ca945090d0..8d8a9e2f97 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -31,7 +31,6 @@ use FireflyIII\Models\Attachment; use FireflyIII\Models\Location; use FireflyIII\Models\Note; use FireflyIII\Models\Tag; -use FireflyIII\Models\TransactionType; use FireflyIII\User; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; @@ -101,19 +100,19 @@ class TagRepository implements TagRepositoryInterface public function find(int $tagId): ?Tag { - /** @var Tag|null */ + /** @var null|Tag */ return $this->user->tags()->find($tagId); } public function findByTag(string $tag): ?Tag { - /** @var Tag|null */ + /** @var null|Tag */ return $this->user->tags()->where('tag', $tag)->first(); } public function firstUseDate(Tag $tag): ?Carbon { - /** @var Carbon|null */ + /** @var null|Carbon */ return $tag->transactionJournals()->orderBy('date', 'ASC')->first()?->date; } @@ -181,7 +180,7 @@ class TagRepository implements TagRepositoryInterface public function lastUseDate(Tag $tag): ?Carbon { - /** @var Carbon|null */ + /** @var null|Carbon */ return $tag->transactionJournals()->orderBy('date', 'DESC')->first()?->date; } @@ -190,13 +189,13 @@ class TagRepository implements TagRepositoryInterface */ public function newestTag(): ?Tag { - /** @var Tag|null */ + /** @var null|Tag */ return $this->user->tags()->whereNotNull('date')->orderBy('date', 'DESC')->first(); } public function oldestTag(): ?Tag { - /** @var Tag|null */ + /** @var null|Tag */ return $this->user->tags()->whereNotNull('date')->orderBy('date', 'ASC')->first(); } @@ -262,10 +261,10 @@ class TagRepository implements TagRepositoryInterface } $currencyId = (int) $journal['currency_id']; $sums[$currencyId] ??= [ - 'currency_id' => $currencyId, - 'currency_name' => $journal['currency_name'], - 'currency_symbol' => $journal['currency_symbol'], - 'currency_decimal_places' => $journal['currency_decimal_places'], + 'currency_id' => $currencyId, + 'currency_name' => $journal['currency_name'], + 'currency_symbol' => $journal['currency_symbol'], + 'currency_decimal_places' => $journal['currency_decimal_places'], TransactionTypeEnum::WITHDRAWAL->value => '0', TransactionTypeEnum::DEPOSIT->value => '0', TransactionTypeEnum::TRANSFER->value => '0', @@ -284,10 +283,10 @@ class TagRepository implements TagRepositoryInterface $foreignCurrencyId = $journal['foreign_currency_id']; if (null !== $foreignCurrencyId && 0 !== $foreignCurrencyId) { $sums[$foreignCurrencyId] ??= [ - 'currency_id' => $foreignCurrencyId, - 'currency_name' => $journal['foreign_currency_name'], - 'currency_symbol' => $journal['foreign_currency_symbol'], - 'currency_decimal_places' => $journal['foreign_currency_decimal_places'], + 'currency_id' => $foreignCurrencyId, + 'currency_name' => $journal['foreign_currency_name'], + 'currency_symbol' => $journal['foreign_currency_symbol'], + 'currency_decimal_places' => $journal['foreign_currency_decimal_places'], TransactionTypeEnum::WITHDRAWAL->value => '0', TransactionTypeEnum::DEPOSIT->value => '0', TransactionTypeEnum::TRANSFER->value => '0', @@ -381,7 +380,7 @@ class TagRepository implements TagRepositoryInterface public function getLocation(Tag $tag): ?Location { - /** @var Location|null */ + /** @var null|Location */ return $tag->locations()->first(); } } diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index 0e3fffa009..21e95f023f 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -39,7 +39,6 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService; use FireflyIII\Services\Internal\Update\GroupUpdateService; @@ -69,7 +68,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface */ public function find(int $groupId): ?TransactionGroup { - /** @var TransactionGroup|null */ + /** @var null|TransactionGroup */ return $this->user->transactionGroups()->find($groupId); } @@ -291,7 +290,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface /** @var TransactionJournal $journal */ $journal = $this->user->transactionJournals()->find($journalId); - /** @var Location|null */ + /** @var null|Location */ return $journal->locations()->first(); } diff --git a/app/Repositories/UserGroups/Account/AccountRepository.php b/app/Repositories/UserGroups/Account/AccountRepository.php index 58ac999d95..3811e3293c 100644 --- a/app/Repositories/UserGroups/Account/AccountRepository.php +++ b/app/Repositories/UserGroups/Account/AccountRepository.php @@ -76,7 +76,7 @@ class AccountRepository implements AccountRepositoryInterface $dbQuery->whereIn('account_types.type', $types); } - /** @var Account|null */ + /** @var null|Account */ return $dbQuery->first(['accounts.*']); } @@ -90,7 +90,7 @@ class AccountRepository implements AccountRepositoryInterface $query->whereIn('account_types.type', $types); } - /** @var Account|null */ + /** @var null|Account */ return $query->where('iban', $iban)->first(['accounts.*']); } @@ -167,7 +167,8 @@ class AccountRepository implements AccountRepositoryInterface if (null === $account) { $account = $this->userGroup->accounts()->find($accountId); } - /** @var Account|null */ + + /** @var null|Account */ return $account; } diff --git a/app/Repositories/UserGroups/Budget/OperationsRepository.php b/app/Repositories/UserGroups/Budget/OperationsRepository.php index 22542fffe1..349daf0a71 100644 --- a/app/Repositories/UserGroups/Budget/OperationsRepository.php +++ b/app/Repositories/UserGroups/Budget/OperationsRepository.php @@ -28,7 +28,6 @@ use Carbon\Carbon; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; -use FireflyIII\Models\TransactionType; use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait; use Illuminate\Support\Collection; diff --git a/app/Repositories/UserGroups/Currency/CurrencyRepository.php b/app/Repositories/UserGroups/Currency/CurrencyRepository.php index 1d1a5a4bef..96ecb4d4e7 100644 --- a/app/Repositories/UserGroups/Currency/CurrencyRepository.php +++ b/app/Repositories/UserGroups/Currency/CurrencyRepository.php @@ -199,6 +199,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface return $current; }); + /** @var Collection */ return $all; } diff --git a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php index 713b07f3e4..9c153d9b9c 100644 --- a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php +++ b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php @@ -61,7 +61,7 @@ class ExchangeRateRepository implements ExchangeRateRepositoryInterface #[\Override] public function getSpecificRateOnDate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): ?CurrencyExchangeRate { - /** @var CurrencyExchangeRate|null */ + /** @var null|CurrencyExchangeRate */ return $this->userGroup->currencyExchangeRates() ->where('from_currency_id', $from->id) @@ -105,10 +105,8 @@ class ExchangeRateRepository implements ExchangeRateRepositoryInterface return $object; } - /** - * @return Collection - */ - #[\Override] public function getAll(): Collection + #[\Override] + public function getAll(): Collection { return $this->userGroup->currencyExchangeRates()->get(); } diff --git a/app/Rules/Account/IsUniqueAccount.php b/app/Rules/Account/IsUniqueAccount.php index d60a1b3954..da2a94849d 100644 --- a/app/Rules/Account/IsUniqueAccount.php +++ b/app/Rules/Account/IsUniqueAccount.php @@ -42,6 +42,7 @@ class IsUniqueAccount implements ValidationRule, DataAwareRule public function setData(array $data): self // @phpstan-ignore-line { $this->data = $data; + return $this; } diff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.php index d5b44d4aef..7eb128dbaf 100644 --- a/app/Rules/IsAssetAccountId.php +++ b/app/Rules/IsAssetAccountId.php @@ -25,7 +25,6 @@ namespace FireflyIII\Rules; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use Illuminate\Contracts\Validation\ValidationRule; /** diff --git a/app/Rules/IsTransferAccount.php b/app/Rules/IsTransferAccount.php index ae678863db..ef78af6d98 100644 --- a/app/Rules/IsTransferAccount.php +++ b/app/Rules/IsTransferAccount.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Rules; use FireflyIII\Enums\TransactionTypeEnum; -use FireflyIII\Models\TransactionType; use FireflyIII\Validation\AccountValidator; use Illuminate\Contracts\Validation\ValidationRule; diff --git a/app/Rules/UniqueAccountNumber.php b/app/Rules/UniqueAccountNumber.php index c44ffb87b5..422ed44604 100644 --- a/app/Rules/UniqueAccountNumber.php +++ b/app/Rules/UniqueAccountNumber.php @@ -27,7 +27,6 @@ namespace FireflyIII\Rules; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Models\Account; use FireflyIII\Models\AccountMeta; -use FireflyIII\Models\AccountType; use Illuminate\Contracts\Validation\ValidationRule; /** diff --git a/app/Rules/UniqueIban.php b/app/Rules/UniqueIban.php index 54b71a44d1..5c7282648f 100644 --- a/app/Rules/UniqueIban.php +++ b/app/Rules/UniqueIban.php @@ -26,7 +26,6 @@ namespace FireflyIII\Rules; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Support\Facades\Steam; use Illuminate\Contracts\Validation\ValidationRule; @@ -127,7 +126,7 @@ class UniqueIban implements ValidationRule AccountTypeEnum::ASSET->value => 0, AccountTypeEnum::EXPENSE->value => 0, AccountTypeEnum::REVENUE->value => 0, - 'liabilities' => 0, + 'liabilities' => 0, ]; if (in_array('expense', $this->expectedTypes, true) || in_array(AccountTypeEnum::EXPENSE->value, $this->expectedTypes, true)) { diff --git a/app/Services/Internal/Destroy/AccountDestroyService.php b/app/Services/Internal/Destroy/AccountDestroyService.php index f3faa1ef67..0eee97065e 100644 --- a/app/Services/Internal/Destroy/AccountDestroyService.php +++ b/app/Services/Internal/Destroy/AccountDestroyService.php @@ -30,7 +30,6 @@ use FireflyIII\Models\PiggyBank; use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use Illuminate\Database\Eloquent\Builder; /** diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index d1963563e9..a827e97311 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -32,7 +32,6 @@ use FireflyIII\Factory\AccountMetaFactory; use FireflyIII\Factory\TransactionCurrencyFactory; use FireflyIII\Factory\TransactionGroupFactory; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; diff --git a/app/Services/Internal/Support/CreditRecalculateService.php b/app/Services/Internal/Support/CreditRecalculateService.php index ead0369f79..514697e911 100644 --- a/app/Services/Internal/Support/CreditRecalculateService.php +++ b/app/Services/Internal/Support/CreditRecalculateService.php @@ -32,7 +32,6 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Support\Facades\Log; diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index a98436f2a5..53c264ef7e 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -30,10 +30,8 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\AccountMetaFactory; use FireflyIII\Factory\TagFactory; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index e772e57d85..2199468a02 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -33,7 +33,6 @@ use FireflyIII\Factory\CategoryFactory; use FireflyIII\Factory\PiggyBankFactory; use FireflyIII\Factory\TransactionCurrencyFactory; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Note; use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceMeta; diff --git a/app/Services/Internal/Update/BillUpdateService.php b/app/Services/Internal/Update/BillUpdateService.php index a419499f5d..df7823e038 100644 --- a/app/Services/Internal/Update/BillUpdateService.php +++ b/app/Services/Internal/Update/BillUpdateService.php @@ -250,7 +250,7 @@ class BillUpdateService private function getRuleTrigger(Rule $rule, string $key): ?RuleTrigger { - /** @var RuleTrigger|null */ + /** @var null|RuleTrigger */ return $rule->ruleTriggers()->where('trigger_type', $key)->first(); } } diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 66c970eda2..b156b2705f 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -35,10 +35,8 @@ use FireflyIII\Factory\TransactionJournalMetaFactory; use FireflyIII\Factory\TransactionTypeFactory; use FireflyIII\Models\Account; use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; @@ -238,8 +236,8 @@ class JournalUpdateService private function getSourceTransaction(): Transaction { if (null === $this->sourceTransaction) { - /** @var Transaction|null $result */ - $result = $this->transactionJournal->transactions()->with(['account'])->where('amount', '<', 0)->first(); + /** @var null|Transaction $result */ + $result = $this->transactionJournal->transactions()->with(['account'])->where('amount', '<', 0)->first(); $this->sourceTransaction = $result; } Log::debug(sprintf('getSourceTransaction: %s', $this->sourceTransaction->amount)); @@ -319,8 +317,8 @@ class JournalUpdateService private function getDestinationTransaction(): Transaction { if (null === $this->destinationTransaction) { - /** @var Transaction|null $result */ - $result = $this->transactionJournal->transactions()->where('amount', '>', 0)->first(); + /** @var null|Transaction $result */ + $result = $this->transactionJournal->transactions()->where('amount', '>', 0)->first(); $this->destinationTransaction = $result; } diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php index bd47aefbc8..0503647bb0 100644 --- a/app/Services/Internal/Update/RecurrenceUpdateService.php +++ b/app/Services/Internal/Update/RecurrenceUpdateService.php @@ -169,7 +169,7 @@ class RecurrenceUpdateService if (1 === $originalCount) { app('log')->debug('Return the first one'); - /** @var RecurrenceRepetition|null */ + /** @var null|RecurrenceRepetition */ return $recurrence->recurrenceRepetitions()->first(); } // find it: @@ -187,7 +187,7 @@ class RecurrenceUpdateService } } - /** @var RecurrenceRepetition|null */ + /** @var null|RecurrenceRepetition */ return $query->first(); } diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 7f3d33ee85..d4469cc698 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -106,6 +106,7 @@ class Amount /** * This method will properly format the given number, in color or "black and white", * as a currency, given two things: the currency required and the current locale. + * * @throws FireflyException */ public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string @@ -175,6 +176,7 @@ class Amount if ($cache->has()) { return $cache->get(); } + /** @var TransactionCurrency $default */ $default = $userGroup->currencies()->where('group_default', true)->first(); if (null === $default) { diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php index 6628fdb6d5..314a0c025f 100644 --- a/app/Support/Binder/AccountList.php +++ b/app/Support/Binder/AccountList.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Binder; use FireflyIII\Enums\AccountTypeEnum; -use FireflyIII\Models\AccountType; use Illuminate\Routing\Route; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php index f2e1309b57..5eadcc587a 100644 --- a/app/Support/Binder/JournalList.php +++ b/app/Support/Binder/JournalList.php @@ -25,7 +25,6 @@ namespace FireflyIII\Support\Binder; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Helpers\Collector\GroupCollectorInterface; -use FireflyIII\Models\TransactionType; use Illuminate\Routing\Route; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/app/Support/Facades/Amount.php b/app/Support/Facades/Amount.php index 81f8e95c7e..df49a954a5 100644 --- a/app/Support/Facades/Amount.php +++ b/app/Support/Facades/Amount.php @@ -23,9 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; -use FireflyIII\Models\TransactionCurrency; -use FireflyIII\User; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; class Amount extends Facade diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/FireflyConfig.php index f2b705d579..3db565a466 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/FireflyConfig.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; -use FireflyIII\Models\Configuration; use Illuminate\Support\Facades\Facade; class FireflyConfig extends Facade diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index 2a653b3cd8..694e94ec96 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -23,9 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; -use FireflyIII\Models\Preference; -use FireflyIII\User; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; class Preferences extends Facade diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php index 710cb83004..e2420fbdfb 100644 --- a/app/Support/Facades/Steam.php +++ b/app/Support/Facades/Steam.php @@ -23,9 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; -use Carbon\Carbon; -use FireflyIII\Models\Account; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; class Steam extends Facade diff --git a/app/Support/Form/AccountForm.php b/app/Support/Form/AccountForm.php index 2bfb98b673..348983ed23 100644 --- a/app/Support/Form/AccountForm.php +++ b/app/Support/Form/AccountForm.php @@ -27,7 +27,6 @@ namespace FireflyIII\Support\Form; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; /** diff --git a/app/Support/Http/Api/AccountBalanceGrouped.php b/app/Support/Http/Api/AccountBalanceGrouped.php index a65069d593..95c5e2ea69 100644 --- a/app/Support/Http/Api/AccountBalanceGrouped.php +++ b/app/Support/Http/Api/AccountBalanceGrouped.php @@ -28,7 +28,6 @@ use Carbon\Carbon; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Models\TransactionType; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; diff --git a/app/Support/Http/Api/AccountFilter.php b/app/Support/Http/Api/AccountFilter.php index 9bfcbc350b..b44dc3df6a 100644 --- a/app/Support/Http/Api/AccountFilter.php +++ b/app/Support/Http/Api/AccountFilter.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Api; use FireflyIII\Enums\AccountTypeEnum; -use FireflyIII\Models\AccountType; /** * Trait AccountFilter @@ -34,7 +33,7 @@ trait AccountFilter { protected array $types = [ - 'all' => [ + 'all' => [ AccountTypeEnum::DEFAULT->value, AccountTypeEnum::CASH->value, AccountTypeEnum::ASSET->value, @@ -48,14 +47,14 @@ trait AccountFilter AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, ], - 'asset' => [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value], - 'cash' => [AccountTypeEnum::CASH->value], - 'expense' => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::BENEFICIARY->value], - 'revenue' => [AccountTypeEnum::REVENUE->value], - 'special' => [AccountTypeEnum::CASH->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::RECONCILIATION->value], - 'hidden' => [AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::RECONCILIATION->value], - 'liability' => [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value], - 'liabilities' => [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value], + 'asset' => [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value], + 'cash' => [AccountTypeEnum::CASH->value], + 'expense' => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::BENEFICIARY->value], + 'revenue' => [AccountTypeEnum::REVENUE->value], + 'special' => [AccountTypeEnum::CASH->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::RECONCILIATION->value], + 'hidden' => [AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::RECONCILIATION->value], + 'liability' => [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value], + 'liabilities' => [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value], AccountTypeEnum::DEFAULT->value => [AccountTypeEnum::DEFAULT->value], AccountTypeEnum::CASH->value => [AccountTypeEnum::CASH->value], AccountTypeEnum::ASSET->value => [AccountTypeEnum::ASSET->value], @@ -69,20 +68,20 @@ trait AccountFilter AccountTypeEnum::MORTGAGE->value => [AccountTypeEnum::MORTGAGE->value], AccountTypeEnum::DEBT->value => [AccountTypeEnum::DEBT->value], AccountTypeEnum::CREDITCARD->value => [AccountTypeEnum::CREDITCARD->value], - 'default account' => [AccountTypeEnum::DEFAULT->value], - 'cash account' => [AccountTypeEnum::CASH->value], - 'asset account' => [AccountTypeEnum::ASSET->value], - 'expense account' => [AccountTypeEnum::EXPENSE->value], - 'revenue account' => [AccountTypeEnum::REVENUE->value], - 'initial balance account' => [AccountTypeEnum::INITIAL_BALANCE->value], - 'reconciliation' => [AccountTypeEnum::RECONCILIATION->value], - 'loan' => [AccountTypeEnum::LOAN->value], - 'mortgage' => [AccountTypeEnum::MORTGAGE->value], - 'debt' => [AccountTypeEnum::DEBT->value], - 'credit card' => [AccountTypeEnum::CREDITCARD->value], - 'credit-card' => [AccountTypeEnum::CREDITCARD->value], - 'creditcard' => [AccountTypeEnum::CREDITCARD->value], - 'cc' => [AccountTypeEnum::CREDITCARD->value], + 'default account' => [AccountTypeEnum::DEFAULT->value], + 'cash account' => [AccountTypeEnum::CASH->value], + 'asset account' => [AccountTypeEnum::ASSET->value], + 'expense account' => [AccountTypeEnum::EXPENSE->value], + 'revenue account' => [AccountTypeEnum::REVENUE->value], + 'initial balance account' => [AccountTypeEnum::INITIAL_BALANCE->value], + 'reconciliation' => [AccountTypeEnum::RECONCILIATION->value], + 'loan' => [AccountTypeEnum::LOAN->value], + 'mortgage' => [AccountTypeEnum::MORTGAGE->value], + 'debt' => [AccountTypeEnum::DEBT->value], + 'credit card' => [AccountTypeEnum::CREDITCARD->value], + 'credit-card' => [AccountTypeEnum::CREDITCARD->value], + 'creditcard' => [AccountTypeEnum::CREDITCARD->value], + 'cc' => [AccountTypeEnum::CREDITCARD->value], ]; /** diff --git a/app/Support/Http/Api/CollectsAccountsFromFilter.php b/app/Support/Http/Api/CollectsAccountsFromFilter.php index 8dd2be7a53..db304c5e7e 100644 --- a/app/Support/Http/Api/CollectsAccountsFromFilter.php +++ b/app/Support/Http/Api/CollectsAccountsFromFilter.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Api; use FireflyIII\Enums\AccountTypeEnum; -use FireflyIII\Models\AccountType; use Illuminate\Support\Collection; trait CollectsAccountsFromFilter diff --git a/app/Support/Http/Api/TransactionFilter.php b/app/Support/Http/Api/TransactionFilter.php index db603b31c8..f6f13d77a7 100644 --- a/app/Support/Http/Api/TransactionFilter.php +++ b/app/Support/Http/Api/TransactionFilter.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Api; use FireflyIII\Enums\TransactionTypeEnum; -use FireflyIII\Models\TransactionType; /** * Trait TransactionFilter diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.php index 01c046d227..dc47cd4711 100644 --- a/app/Support/Http/Controllers/AugumentData.php +++ b/app/Support/Http/Controllers/AugumentData.php @@ -29,10 +29,8 @@ use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.php index 73988e1d2a..ca96315934 100644 --- a/app/Support/Http/Controllers/GetConfigurationData.php +++ b/app/Support/Http/Controllers/GetConfigurationData.php @@ -40,9 +40,9 @@ trait GetConfigurationData { $array = [ -1 => 'ALL errors', - E_ALL & ~E_NOTICE & ~E_DEPRECATED => 'E_ALL & ~E_NOTICE & ~E_DEPRECATED', + E_ALL & ~E_NOTICE & ~E_DEPRECATED => 'E_ALL & ~E_NOTICE & ~E_DEPRECATED', E_ALL => 'E_ALL', - E_ALL & ~E_DEPRECATED => 'E_ALL & ~E_DEPRECATED ', + E_ALL & ~E_DEPRECATED => 'E_ALL & ~E_DEPRECATED ', E_ALL & ~E_NOTICE => 'E_ALL & ~E_NOTICE', E_COMPILE_ERROR | E_RECOVERABLE_ERROR | E_ERROR | E_CORE_ERROR => 'E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR', ]; diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php index 644c5a74b0..f9b54c09a7 100644 --- a/app/Support/Http/Controllers/PeriodOverview.php +++ b/app/Support/Http/Controllers/PeriodOverview.php @@ -31,7 +31,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\Category; use FireflyIII\Models\Tag; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; diff --git a/app/Support/Http/Controllers/RenderPartialViews.php b/app/Support/Http/Controllers/RenderPartialViews.php index 07cc47d2dc..4bb800469f 100644 --- a/app/Support/Http/Controllers/RenderPartialViews.php +++ b/app/Support/Http/Controllers/RenderPartialViews.php @@ -28,7 +28,6 @@ use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleAction; diff --git a/app/Support/Http/Controllers/TransactionCalculation.php b/app/Support/Http/Controllers/TransactionCalculation.php index cb9527f9a0..17df264ce8 100644 --- a/app/Support/Http/Controllers/TransactionCalculation.php +++ b/app/Support/Http/Controllers/TransactionCalculation.php @@ -27,7 +27,6 @@ namespace FireflyIII\Support\Http\Controllers; use Carbon\Carbon; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Helpers\Collector\GroupCollectorInterface; -use FireflyIII\Models\TransactionType; use Illuminate\Support\Collection; /** diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.php index 47ce038d6c..8fac232ad0 100644 --- a/app/Support/Http/Controllers/UserNavigation.php +++ b/app/Support/Http/Controllers/UserNavigation.php @@ -27,11 +27,9 @@ namespace FireflyIII\Support\Http\Controllers; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use Illuminate\Http\RedirectResponse; use Illuminate\Routing\Redirector; diff --git a/app/Support/Report/Summarizer/TransactionSummarizer.php b/app/Support/Report/Summarizer/TransactionSummarizer.php index d0d076e3d7..b9ed46e74d 100644 --- a/app/Support/Report/Summarizer/TransactionSummarizer.php +++ b/app/Support/Report/Summarizer/TransactionSummarizer.php @@ -53,14 +53,14 @@ class TransactionSummarizer { $array = []; foreach ($journals as $journal) { - $field = 'amount'; + $field = 'amount'; // grab default currency information. - $currencyId = (int) $journal['currency_id']; - $currencyName = $journal['currency_name']; - $currencySymbol = $journal['currency_symbol']; - $currencyCode = $journal['currency_code']; - $currencyDecimalPlaces = $journal['currency_decimal_places']; + $currencyId = (int) $journal['currency_id']; + $currencyName = $journal['currency_name']; + $currencySymbol = $journal['currency_symbol']; + $currencyCode = $journal['currency_code']; + $currencyDecimalPlaces = $journal['currency_decimal_places']; if ($this->convertToNative) { // if convert to native, use the native amount yes or no? $useNative = $this->default->id !== (int) $journal['currency_id']; @@ -87,7 +87,7 @@ class TransactionSummarizer if (!$this->convertToNative) { // default to the normal amount, but also } - $amount = (string) ($journal[$field] ?? '0'); + $amount = (string) ($journal[$field] ?? '0'); $array[$currencyId] ??= [ 'sum' => '0', 'currency_id' => $currencyId, @@ -96,10 +96,10 @@ class TransactionSummarizer 'currency_code' => $currencyCode, 'currency_decimal_places' => $currencyDecimalPlaces, ]; - if('positive' === $method) { + if ('positive' === $method) { $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->positive($amount)); } - if('negative' === $method) { + if ('negative' === $method) { $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($amount)); } // $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->{$method}($amount)); diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index c636e68d2f..53fce8cef9 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -32,7 +32,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountMeta; -use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index 7b3a49488a..8579025abc 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -27,11 +27,9 @@ namespace FireflyIII\Support\Twig; use Carbon\Carbon; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Models\TransactionType; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; @@ -166,6 +164,7 @@ class TransactionGroupTwig extends AbstractExtension private function normalJournalObjectAmount(TransactionJournal $journal): string { $type = $journal->transactionType->type; + /** @var Transaction $first */ $first = $journal->transactions()->where('amount', '<', 0)->first(); $currency = $journal->transactionCurrency; diff --git a/app/TransactionRules/Actions/ConvertToDeposit.php b/app/TransactionRules/Actions/ConvertToDeposit.php index d4a82febee..3dd9e68621 100644 --- a/app/TransactionRules/Actions/ConvertToDeposit.php +++ b/app/TransactionRules/Actions/ConvertToDeposit.php @@ -31,7 +31,6 @@ use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\AccountFactory; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; diff --git a/app/TransactionRules/Actions/ConvertToWithdrawal.php b/app/TransactionRules/Actions/ConvertToWithdrawal.php index 67edc3783d..3c6547bcdd 100644 --- a/app/TransactionRules/Actions/ConvertToWithdrawal.php +++ b/app/TransactionRules/Actions/ConvertToWithdrawal.php @@ -31,7 +31,6 @@ use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\AccountFactory; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; diff --git a/app/TransactionRules/Actions/LinkToBill.php b/app/TransactionRules/Actions/LinkToBill.php index 3c6c08850b..65189801cc 100644 --- a/app/TransactionRules/Actions/LinkToBill.php +++ b/app/TransactionRules/Actions/LinkToBill.php @@ -28,7 +28,6 @@ use FireflyIII\Events\Model\Rule\RuleActionFailedOnArray; use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Models\RuleAction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\User; diff --git a/app/TransactionRules/Actions/SetBudget.php b/app/TransactionRules/Actions/SetBudget.php index 17d64dfdd3..c5a7bf9c10 100644 --- a/app/TransactionRules/Actions/SetBudget.php +++ b/app/TransactionRules/Actions/SetBudget.php @@ -28,7 +28,6 @@ use FireflyIII\Events\Model\Rule\RuleActionFailedOnArray; use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Models\RuleAction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\User; /** diff --git a/app/TransactionRules/Actions/SetDestinationAccount.php b/app/TransactionRules/Actions/SetDestinationAccount.php index afcbb5ddc9..494636802d 100644 --- a/app/TransactionRules/Actions/SetDestinationAccount.php +++ b/app/TransactionRules/Actions/SetDestinationAccount.php @@ -30,7 +30,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; diff --git a/app/TransactionRules/Actions/SetDestinationToCashAccount.php b/app/TransactionRules/Actions/SetDestinationToCashAccount.php index 6094d84a72..366d4a9171 100644 --- a/app/TransactionRules/Actions/SetDestinationToCashAccount.php +++ b/app/TransactionRules/Actions/SetDestinationToCashAccount.php @@ -30,7 +30,6 @@ use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; diff --git a/app/TransactionRules/Actions/SetSourceAccount.php b/app/TransactionRules/Actions/SetSourceAccount.php index 3355fee4be..09dbeca8ab 100644 --- a/app/TransactionRules/Actions/SetSourceAccount.php +++ b/app/TransactionRules/Actions/SetSourceAccount.php @@ -30,7 +30,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; diff --git a/app/TransactionRules/Actions/SetSourceToCashAccount.php b/app/TransactionRules/Actions/SetSourceToCashAccount.php index d994b2b4ee..0f4bb5bcf5 100644 --- a/app/TransactionRules/Actions/SetSourceToCashAccount.php +++ b/app/TransactionRules/Actions/SetSourceToCashAccount.php @@ -30,7 +30,6 @@ use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; diff --git a/app/TransactionRules/Actions/SwitchAccounts.php b/app/TransactionRules/Actions/SwitchAccounts.php index 4ec66d0d06..585a934281 100644 --- a/app/TransactionRules/Actions/SwitchAccounts.php +++ b/app/TransactionRules/Actions/SwitchAccounts.php @@ -30,7 +30,6 @@ use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; /** * Class SwitchAccounts diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index 760459a1dc..9fd1189871 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -30,7 +30,6 @@ use FireflyIII\Models\Bill; use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Bill\BillRepositoryInterface; -use FireflyIII\Support\Facades\Amount; use FireflyIII\Support\Models\BillDateCalculator; use Illuminate\Support\Collection; diff --git a/app/Transformers/BudgetTransformer.php b/app/Transformers/BudgetTransformer.php index 9e5f065687..84699c07f2 100644 --- a/app/Transformers/BudgetTransformer.php +++ b/app/Transformers/BudgetTransformer.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; use FireflyIII\Enums\AutoBudgetType; -use FireflyIII\Models\AutoBudget; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\OperationsRepositoryInterface; diff --git a/app/Transformers/TransactionGroupTransformer.php b/app/Transformers/TransactionGroupTransformer.php index 3fbe4773a6..1d063bb852 100644 --- a/app/Transformers/TransactionGroupTransformer.php +++ b/app/Transformers/TransactionGroupTransformer.php @@ -34,7 +34,6 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Support\NullArrayObject; use Illuminate\Support\Collection; @@ -247,7 +246,7 @@ class TransactionGroupTransformer extends AbstractTransformer private function getLocation(TransactionJournal $journal): ?Location { - /** @var Location|null */ + /** @var null|Location */ return $journal->locations()->first(); } diff --git a/app/Transformers/V2/AccountTransformer.php b/app/Transformers/V2/AccountTransformer.php index 4308e106ba..54e351bc9c 100644 --- a/app/Transformers/V2/AccountTransformer.php +++ b/app/Transformers/V2/AccountTransformer.php @@ -56,7 +56,7 @@ class AccountTransformer extends AbstractTransformer public function collectMetaData(Collection $objects): Collection { $this->currencies = []; - $this->balances = []; + $this->balances = []; $this->accountMeta = []; $this->accountTypes = []; $this->fullTypes = []; diff --git a/app/Transformers/V2/TransactionGroupTransformer.php b/app/Transformers/V2/TransactionGroupTransformer.php index a78c645d57..d4e4b3ba83 100644 --- a/app/Transformers/V2/TransactionGroupTransformer.php +++ b/app/Transformers/V2/TransactionGroupTransformer.php @@ -36,7 +36,6 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Models\TransactionType; use FireflyIII\Support\Http\Api\ExchangeRateConverter; use FireflyIII\Support\NullArrayObject; use Illuminate\Support\Collection; @@ -56,10 +55,10 @@ class TransactionGroupTransformer extends AbstractTransformer // private array $currencies = []; // private array $transactionTypes = []; - private array $meta = []; - private array $notes = []; + private array $meta = []; + private array $notes = []; // private array $locations = []; - private array $tags = []; + private array $tags = []; // private array $amounts = []; // private array $foreignAmounts = []; // private array $journalCurrencies = []; diff --git a/app/Validation/Account/WithdrawalValidation.php b/app/Validation/Account/WithdrawalValidation.php index c2b758e917..649f795f86 100644 --- a/app/Validation/Account/WithdrawalValidation.php +++ b/app/Validation/Account/WithdrawalValidation.php @@ -26,7 +26,6 @@ namespace FireflyIII\Validation\Account; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; /** * Trait WithdrawalValidation diff --git a/app/Validation/AccountValidator.php b/app/Validation/AccountValidator.php index 093fa479a9..48d953c9b1 100644 --- a/app/Validation/AccountValidator.php +++ b/app/Validation/AccountValidator.php @@ -27,7 +27,6 @@ namespace FireflyIII\Validation; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Models\Account; -use FireflyIII\Models\TransactionType; use FireflyIII\Models\UserGroup; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as UserGroupAccountRepositoryInterface; diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index edeb5907b9..250ccd7c4f 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -28,11 +28,9 @@ use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Models\UserGroup; use FireflyIII\Repositories\Account\AccountRepository; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -62,8 +60,8 @@ trait TransactionValidation app('log')->debug(sprintf('Going to loop %d transaction(s)', count($transactions))); /** - * @var string|int $index - * @var array $transaction + * @var int|string $index + * @var array $transaction */ foreach ($transactions as $index => $transaction) { $transaction['user'] = $user; @@ -348,8 +346,8 @@ trait TransactionValidation $transactions = $this->getTransactionsArray($validator); /** - * @var string|int $index - * @var array $transaction + * @var int|string $index + * @var array $transaction */ foreach ($transactions as $index => $transaction) { if (!is_int($index)) { diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php index a1feed229d..b55259c8c7 100644 --- a/tests/integration/TestCase.php +++ b/tests/integration/TestCase.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace Tests\integration; -use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\UserGroup; use FireflyIII\User; use Illuminate\Foundation\Testing\RefreshDatabase; @@ -40,7 +39,7 @@ abstract class TestCase extends BaseTestCase use RefreshDatabase; protected const MAX_ITERATIONS = 2; - protected $seed = true; + protected $seed = true; public function dateRangeProvider(): array {