From b2954658d85cf9cebec4f9b96130bc6a5112b583 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 31 Jul 2024 08:31:20 +0200 Subject: [PATCH] Various code cleanup [skip ci] --- .ci/phpstan.neon | 1 - .../Commands/Correction/FixUnevenAmount.php | 84 +++++++++++-------- .../Upgrade/CorrectAccountBalance.php | 3 +- app/Factory/TransactionJournalFactory.php | 12 +-- app/JsonApi/V2/Accounts/AccountSchema.php | 2 +- app/JsonApi/V2/Server.php | 2 +- app/Models/Account.php | 4 - app/Models/AccountBalance.php | 1 - app/Models/AccountMeta.php | 4 - app/Models/AccountType.php | 5 -- app/Models/Attachment.php | 4 - app/Models/AuditLogEntry.php | 4 - app/Models/AutoBudget.php | 3 - app/Models/AvailableBudget.php | 4 - app/Models/Bill.php | 4 - app/Models/Budget.php | 5 -- app/Models/BudgetLimit.php | 4 - app/Models/Category.php | 5 -- app/Models/Configuration.php | 3 - app/Models/CurrencyExchangeRate.php | 4 - app/Models/GroupMembership.php | 3 - app/Models/InvitedUser.php | 4 - app/Models/LinkType.php | 4 - app/Models/Location.php | 5 -- app/Models/Note.php | 4 - app/Models/ObjectGroup.php | 5 -- app/Models/PiggyBank.php | 4 - app/Models/PiggyBankEvent.php | 4 - app/Models/PiggyBankRepetition.php | 2 - app/Models/Preference.php | 4 - app/Models/Recurrence.php | 4 - app/Models/RecurrenceMeta.php | 3 - app/Models/RecurrenceRepetition.php | 3 - app/Models/RecurrenceTransaction.php | 4 - app/Models/RecurrenceTransactionMeta.php | 3 - app/Models/Role.php | 4 - app/Models/Rule.php | 5 -- app/Models/RuleAction.php | 4 - app/Models/RuleGroup.php | 5 -- app/Models/RuleTrigger.php | 4 - app/Models/Tag.php | 4 - app/Models/Transaction.php | 6 +- app/Models/TransactionCurrency.php | 4 - app/Models/TransactionGroup.php | 4 - app/Models/TransactionJournal.php | 2 - app/Models/TransactionJournalLink.php | 5 -- app/Models/TransactionJournalMeta.php | 4 - app/Models/TransactionType.php | 5 -- app/Models/UserGroup.php | 5 -- app/Models/UserRole.php | 5 -- app/Models/Webhook.php | 5 -- app/Models/WebhookAttempt.php | 4 - app/Models/WebhookMessage.php | 5 -- .../Internal/Update/JournalUpdateService.php | 69 ++++++++------- .../Models/AccountBalanceCalculator.php | 63 +++++++------- app/User.php | 6 -- .../2024_07_28_145631_add_running_balance.php | 9 +- 57 files changed, 132 insertions(+), 309 deletions(-) diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon index 7e804a9a43..272b8604b4 100644 --- a/.ci/phpstan.neon +++ b/.ci/phpstan.neon @@ -3,7 +3,6 @@ parameters: - Illuminate\Database\Eloquent\Model # TODO: slowly remove these parameters and fix the issues found. reportUnmatchedIgnoredErrors: false - checkGenericClassInNonGenericObjectType: false # remove this rule when all other issues are solved. ignoreErrors: # TODO: slowly remove these exceptions and fix the issues found. - '#Dynamic call to static method#' # all the Laravel ORM things depend on this. diff --git a/app/Console/Commands/Correction/FixUnevenAmount.php b/app/Console/Commands/Correction/FixUnevenAmount.php index 572b4159dc..e62e824bed 100644 --- a/app/Console/Commands/Correction/FixUnevenAmount.php +++ b/app/Console/Commands/Correction/FixUnevenAmount.php @@ -38,8 +38,8 @@ class FixUnevenAmount extends Command { use ShowsFriendlyMessages; - protected $description = 'Fix journals with uneven amounts.'; - protected $signature = 'firefly-iii:fix-uneven-amount'; + protected $description = 'Fix journals with uneven amounts.'; + protected $signature = 'firefly-iii:fix-uneven-amount'; private int $count; /** @@ -59,13 +59,13 @@ class FixUnevenAmount extends Command private function fixJournal(int $param): void { // one of the transactions is bad. - $journal = TransactionJournal::find($param); + $journal = TransactionJournal::find($param); if (null === $journal) { return; } /** @var null|Transaction $source */ - $source = $journal->transactions()->where('amount', '<', 0)->first(); + $source = $journal->transactions()->where('amount', '<', 0)->first(); if (null === $source) { $this->friendlyError( @@ -78,14 +78,15 @@ class FixUnevenAmount extends Command Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete(); TransactionJournal::where('id', $journal->id ?? 0)->forceDelete(); ++$this->count; + return; } - $amount = bcmul('-1', $source->amount); + $amount = bcmul('-1', $source->amount); // fix amount of destination: /** @var null|Transaction $destination */ - $destination = $journal->transactions()->where('amount', '>', 0)->first(); + $destination = $journal->transactions()->where('amount', '>', 0)->first(); if (null === $destination) { $this->friendlyError( @@ -99,16 +100,18 @@ class FixUnevenAmount extends Command Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete(); TransactionJournal::where('id', $journal->id ?? 0)->forceDelete(); ++$this->count; + return; } // may still be able to salvage this journal if it is a transfer with foreign currency info if ($this->isForeignCurrencyTransfer($journal)) { Log::debug(sprintf('Can skip foreign currency transfer #%d.', $journal->id)); + return; } - $message = sprintf('Sum of journal #%d is not zero, journal is broken and now fixed.', $journal->id); + $message = sprintf('Sum of journal #%d is not zero, journal is broken and now fixed.', $journal->id); $this->friendlyWarning($message); app('log')->warning($message); @@ -116,7 +119,7 @@ class FixUnevenAmount extends Command $destination->amount = $amount; $destination->save(); - $message = sprintf('Corrected amount in transaction journal #%d', $param); + $message = sprintf('Corrected amount in transaction journal #%d', $param); $this->friendlyInfo($message); ++$this->count; } @@ -124,9 +127,10 @@ class FixUnevenAmount extends Command private function fixUnevenAmounts(): void { $journals = \DB::table('transactions') - ->groupBy('transaction_journal_id') - ->whereNull('deleted_at') - ->get(['transaction_journal_id', \DB::raw('SUM(amount) AS the_sum')]); + ->groupBy('transaction_journal_id') + ->whereNull('deleted_at') + ->get(['transaction_journal_id', \DB::raw('SUM(amount) AS the_sum')]) + ; /** @var \stdClass $entry */ foreach ($journals as $entry) { @@ -167,15 +171,18 @@ class FixUnevenAmount extends Command private function matchCurrencies(): void { $journals = TransactionJournal::leftJoin('transactions', 'transaction_journals.id', 'transactions.transaction_journal_id') - ->where('transactions.transaction_currency_id', '!=', \DB::raw('transaction_journals.transaction_currency_id')) - ->get(['transaction_journals.*']); + ->where('transactions.transaction_currency_id', '!=', \DB::raw('transaction_journals.transaction_currency_id')) + ->get(['transaction_journals.*']) + ; + + $count = 0; - $count = 0; /** @var TransactionJournal $journal */ foreach ($journals as $journal) { if (!$this->isForeignCurrencyTransfer($journal)) { Transaction::where('transaction_journal_id', $journal->id)->update(['transaction_currency_id' => $journal->transaction_currency_id]); - $count++; + ++$count; + continue; } Log::debug(sprintf('Can skip foreign currency transfer #%d.', $journal->id)); @@ -194,10 +201,12 @@ class FixUnevenAmount extends Command if (TransactionType::TRANSFER !== $journal->transactionType->type) { return false; } + /** @var Transaction $destination */ $destination = $journal->transactions()->where('amount', '>', 0)->first(); + /** @var Transaction $source */ - $source = $journal->transactions()->where('amount', '<', 0)->first(); + $source = $journal->transactions()->where('amount', '<', 0)->first(); // safety catch on NULL should not be necessary, we just had that catch. // source amount = dest foreign amount @@ -205,20 +214,20 @@ class FixUnevenAmount extends Command // dest amount = source foreign currency // dest currency = source foreign currency -// Log::debug(sprintf('[a] %s', bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount)))); -// Log::debug(sprintf('[b] %s', bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount)))); -// Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true))); -// Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int) $source->foreign_currency_id, true))); + // Log::debug(sprintf('[a] %s', bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount)))); + // Log::debug(sprintf('[b] %s', bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount)))); + // Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true))); + // Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int) $source->foreign_currency_id, true))); - if (0 === bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount)) && - $source->transaction_currency_id === $destination->foreign_currency_id && - 0 === bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount)) && - (int) $destination->transaction_currency_id === (int) $source->foreign_currency_id + if (0 === bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount)) + && $source->transaction_currency_id === $destination->foreign_currency_id + && 0 === bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount)) + && (int) $destination->transaction_currency_id === (int) $source->foreign_currency_id ) { return true; } - return false; + return false; } private function convertOldStyleTransfers(): void @@ -226,30 +235,37 @@ class FixUnevenAmount extends Command Log::debug('convertOldStyleTransfers()'); // select transactions with a foreign amount and a foreign currency. and it's a transfer. and they are different. $transactions = Transaction::distinct() - ->whereNotNull('foreign_currency_id') - ->whereNotNull('foreign_amount')->get(['transactions.transaction_journal_id']); - $count = 0; + ->whereNotNull('foreign_currency_id') + ->whereNotNull('foreign_amount')->get(['transactions.transaction_journal_id']) + ; + $count = 0; Log::debug(sprintf('Found %d potential journal(s)', $transactions->count())); + /** @var Transaction $transaction */ foreach ($transactions as $transaction) { - /** @var TransactionJournal|null $journal */ - $journal = TransactionJournal::find($transaction->transaction_journal_id); + /** @var null|TransactionJournal $journal */ + $journal = TransactionJournal::find($transaction->transaction_journal_id); if (null === $journal) { Log::debug('Found no journal, continue.'); + continue; } // needs to be a transfer. if (TransactionType::TRANSFER !== $journal->transactionType->type) { Log::debug('Must be a transfer, continue.'); + continue; } - /** @var Transaction|null $destination */ + + /** @var null|Transaction $destination */ $destination = $journal->transactions()->where('amount', '>', 0)->first(); - /** @var Transaction|null $source */ - $source = $journal->transactions()->where('amount', '<', 0)->first(); + + /** @var null|Transaction $source */ + $source = $journal->transactions()->where('amount', '<', 0)->first(); if (null === $destination || null === $source) { Log::debug('Source or destination transaction is NULL, continue.'); + // will be picked up later. continue; } @@ -264,7 +280,7 @@ class FixUnevenAmount extends Command $destination->save(); $source->save(); $this->friendlyWarning(sprintf('Corrected foreign amounts of transfer #%d.', $journal->id)); - $count++; + ++$count; } } if (0 === $count) { diff --git a/app/Console/Commands/Upgrade/CorrectAccountBalance.php b/app/Console/Commands/Upgrade/CorrectAccountBalance.php index f74281e5f2..75227d8f8c 100644 --- a/app/Console/Commands/Upgrade/CorrectAccountBalance.php +++ b/app/Console/Commands/Upgrade/CorrectAccountBalance.php @@ -46,7 +46,8 @@ class CorrectAccountBalance extends Command } $this->friendlyWarning('This command has been disabled.'); $this->markAsExecuted(); -// $this->correctBalanceAmounts(); + + // $this->correctBalanceAmounts(); return 0; } diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 063ce5eeb4..0ec07b2ba4 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -266,17 +266,17 @@ class TransactionJournalFactory // Firefly III will save the foreign currency information in such a way that both // asset accounts can look at the "amount" and "transaction_currency_id" column and // see the currency they expect to see. - $amount = (string)$row['amount']; - $foreignAmount = (string)$row['foreign_amount']; - if(null !== $foreignCurrency && $foreignCurrency->id !== $currency->id && - TransactionType::TRANSFER === $type->type + $amount = (string)$row['amount']; + $foreignAmount = (string)$row['foreign_amount']; + if (null !== $foreignCurrency && $foreignCurrency->id !== $currency->id + && TransactionType::TRANSFER === $type->type ) { $transactionFactory->setCurrency($foreignCurrency); $transactionFactory->setForeignCurrency($currency); - $amount = (string)$row['foreign_amount']; + $amount = (string)$row['foreign_amount']; $foreignAmount = (string)$row['amount']; Log::debug('Swap native/foreign amounts in transfer for new save method.'); - } + } try { $transactionFactory->createPositive($amount, $foreignAmount); diff --git a/app/JsonApi/V2/Accounts/AccountSchema.php b/app/JsonApi/V2/Accounts/AccountSchema.php index b59d70ee76..6aebb3be82 100644 --- a/app/JsonApi/V2/Accounts/AccountSchema.php +++ b/app/JsonApi/V2/Accounts/AccountSchema.php @@ -67,7 +67,7 @@ class AccountSchema extends Schema */ public function filters(): array { -// Log::debug(__METHOD__); + // Log::debug(__METHOD__); return [ Filter::make('id'), diff --git a/app/JsonApi/V2/Server.php b/app/JsonApi/V2/Server.php index 440c4b477a..e175deb8ef 100644 --- a/app/JsonApi/V2/Server.php +++ b/app/JsonApi/V2/Server.php @@ -42,7 +42,7 @@ class Server extends BaseServer */ protected function allSchemas(): array { - //Log::debug(__METHOD__); + // Log::debug(__METHOD__); return [ AccountSchema::class, diff --git a/app/Models/Account.php b/app/Models/Account.php index c415b5cbdf..4f6930cad9 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -23,15 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use GeneaLabs\LaravelModelCaching\Traits\Cachable; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -39,7 +36,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphToMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/AccountBalance.php b/app/Models/AccountBalance.php index 19236502d2..f89fa8de68 100644 --- a/app/Models/AccountBalance.php +++ b/app/Models/AccountBalance.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; - /** * @mixin IdeHelperAccountBalance */ diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 74778ee72a..4beb609874 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -23,14 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; - /** * @mixin IdeHelperAccountMeta */ diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 680b8e0c21..81cfbdc197 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -23,15 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; - /** * @mixin IdeHelperAccountType */ diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index d3b8732b0f..21552e0a19 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -23,19 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/AuditLogEntry.php b/app/Models/AuditLogEntry.php index 5d060775e2..9490d7302e 100644 --- a/app/Models/AuditLogEntry.php +++ b/app/Models/AuditLogEntry.php @@ -24,16 +24,12 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; - /** * @mixin IdeHelperAuditLogEntry */ diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index 7c2eb6861f..a61eaa6a1f 100644 --- a/app/Models/AutoBudget.php +++ b/app/Models/AutoBudget.php @@ -24,14 +24,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; /** * @mixin IdeHelperAutoBudget diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 9efb1e4a9c..682e9ee650 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; @@ -32,10 +30,8 @@ use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperAvailableBudget */ diff --git a/app/Models/Bill.php b/app/Models/Bill.php index d9139be79e..4a120765f8 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -23,20 +23,16 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphToMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/Budget.php b/app/Models/Budget.php index eafba85965..6293c5de8e 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -23,23 +23,18 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperBudget */ diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 3dfca03398..379f095dfa 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -23,19 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Events\Model\BudgetLimit\Created; use FireflyIII\Events\Model\BudgetLimit\Deleted; use FireflyIII\Events\Model\BudgetLimit\Updated; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperBudgetLimit */ diff --git a/app/Models/Category.php b/app/Models/Category.php index 65169dff2b..ec192fe49e 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -23,21 +23,16 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperCategory */ diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index 294ee5d07a..dafa629ea5 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -23,12 +23,9 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; /** * @mixin IdeHelperConfiguration diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index 0d5ff806a0..f451c82da6 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/app/Models/CurrencyExchangeRate.php @@ -23,18 +23,14 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; - /** * @mixin IdeHelperCurrencyExchangeRate */ diff --git a/app/Models/GroupMembership.php b/app/Models/GroupMembership.php index ed7bedc8f5..208476f09d 100644 --- a/app/Models/GroupMembership.php +++ b/app/Models/GroupMembership.php @@ -24,12 +24,9 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php index 223e0a6516..edc06b8f2b 100644 --- a/app/Models/InvitedUser.php +++ b/app/Models/InvitedUser.php @@ -24,17 +24,13 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperInvitedUser */ diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index 085b13c998..23f4982e08 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -23,14 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/Location.php b/app/Models/Location.php index ec9fa6051f..fc5d4639c3 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -24,17 +24,12 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphTo; - /** * @mixin IdeHelperLocation */ diff --git a/app/Models/Note.php b/app/Models/Note.php index e2eeb7057d..5afbfbed76 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -23,15 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; - /** * @mixin IdeHelperNote diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index 0164e04e48..7ec9a91ad3 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -24,20 +24,15 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphToMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperObjectGroup */ diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 371bcca45e..7410d2138d 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -23,18 +23,14 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphToMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 6e3c03143a..2e06cb55a4 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -23,15 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; - /** * @mixin IdeHelperPiggyBankEvent */ diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 3c10048fc7..b85e494b73 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -24,14 +24,12 @@ declare(strict_types=1); namespace FireflyIII\Models; use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; - /** * @mixin IdeHelperPiggyBankRepetition */ diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 54db359c4e..233d11dc79 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -23,17 +23,13 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperPreference */ diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index f39f2b4105..b4cc775bd4 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -23,19 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index d085f5553b..84b5caf309 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -23,14 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; /** * @mixin IdeHelperRecurrenceMeta diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index ab88026d75..e669ed02a3 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -23,14 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; /** * @mixin IdeHelperRecurrenceRepetition diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index 60c6544343..90870e737f 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -23,16 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; /** * @mixin IdeHelperRecurrenceTransaction diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index d815ed00ca..9cb8c0c0d6 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -23,14 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; /** * @mixin IdeHelperRecurrenceTransactionMeta diff --git a/app/Models/Role.php b/app/Models/Role.php index 8539cc8afa..b491a5de91 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -23,12 +23,8 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; diff --git a/app/Models/Rule.php b/app/Models/Rule.php index d97760ba76..804772e1de 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -23,21 +23,16 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperRule */ diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 9d9da5b0f7..6e63d55374 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -23,18 +23,14 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\TransactionRules\Expressions\ActionExpression; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Support\Facades\Log; use Symfony\Component\ExpressionLanguage\SyntaxError; - /** * @mixin IdeHelperRuleAction */ diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index a8552a24ec..0e5df95266 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -23,21 +23,16 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperRuleGroup */ diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 18d2020934..3a83d72246 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -23,15 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; - /** * @mixin IdeHelperRuleTrigger */ diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 3e91d85364..b8f19ad4e3 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -23,18 +23,14 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 41414b7775..87f7b139e2 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -24,12 +24,10 @@ declare(strict_types=1); namespace FireflyIII\Models; use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use GeneaLabs\LaravelModelCaching\Traits\Cachable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -55,7 +53,7 @@ class Transaction extends Model 'encrypted' => 'boolean', // model does not have these fields though 'bill_name_encrypted' => 'boolean', 'reconciled' => 'boolean', - 'balance_dirty' => 'boolean', + 'balance_dirty' => 'boolean', 'date' => 'datetime', ]; @@ -184,7 +182,7 @@ class Transaction extends Model protected function balanceDirty(): Attribute { return Attribute::make( - get: static fn ($value) => (int)$value === 1, + get: static fn ($value) => 1 === (int)$value, ); } diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 79cc1e8020..96c8a8ea5b 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -23,17 +23,13 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index a563af2e4d..36022272df 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -23,17 +23,13 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 5ae49a2a6b..83f3d47df8 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -24,14 +24,12 @@ declare(strict_types=1); namespace FireflyIII\Models; use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index d30188a524..c50a422b7a 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -23,18 +23,13 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperTransactionJournalLink */ diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index ade466c9a1..cd7608a8e4 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -23,15 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; - /** * @mixin IdeHelperTransactionJournalMeta diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index c2eb579c45..5f9b5f7111 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -23,17 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperTransactionType */ diff --git a/app/Models/UserGroup.php b/app/Models/UserGroup.php index d38d0cfa3c..e161c89c4b 100644 --- a/app/Models/UserGroup.php +++ b/app/Models/UserGroup.php @@ -24,20 +24,15 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasManyThrough; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperUserGroup */ diff --git a/app/Models/UserRole.php b/app/Models/UserRole.php index 177f0f103f..84ef0ab124 100644 --- a/app/Models/UserRole.php +++ b/app/Models/UserRole.php @@ -24,15 +24,10 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; - /** * @mixin IdeHelperUserRole */ diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index 358722e29a..11bceb0f04 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -23,23 +23,18 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Enums\WebhookDelivery; use FireflyIII\Enums\WebhookResponse; use FireflyIII\Enums\WebhookTrigger; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperWebhook */ diff --git a/app/Models/WebhookAttempt.php b/app/Models/WebhookAttempt.php index 264a1a05ee..69f4d7e5d3 100644 --- a/app/Models/WebhookAttempt.php +++ b/app/Models/WebhookAttempt.php @@ -23,18 +23,14 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperWebhookAttempt */ diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php index 5db9a43837..35f4ebedd7 100644 --- a/app/Models/WebhookMessage.php +++ b/app/Models/WebhookMessage.php @@ -23,19 +23,14 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - /** * @mixin IdeHelperWebhookMessage */ diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 8d4974caee..cd52a9d92e 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -101,7 +101,7 @@ class JournalUpdateService 'external_url', ]; $this->metaDate = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', - 'invoice_date',]; + 'invoice_date', ]; } public function setData(array $data): void @@ -111,7 +111,7 @@ class JournalUpdateService public function setTransactionGroup(TransactionGroup $transactionGroup): void { - $this->transactionGroup = $transactionGroup; + $this->transactionGroup = $transactionGroup; $this->billRepository->setUser($transactionGroup->user); $this->categoryRepository->setUser($transactionGroup->user); $this->budgetRepository->setUser($transactionGroup->user); @@ -179,8 +179,8 @@ class JournalUpdateService private function hasValidSourceAccount(): bool { app('log')->debug('Now in hasValidSourceAccount().'); - $sourceId = $this->data['source_id'] ?? null; - $sourceName = $this->data['source_name'] ?? null; + $sourceId = $this->data['source_id'] ?? null; + $sourceName = $this->data['source_name'] ?? null; if (!$this->hasFields(['source_id', 'source_name'])) { $origSourceAccount = $this->getOriginalSourceAccount(); @@ -194,11 +194,11 @@ class JournalUpdateService // make a new validator. /** @var AccountValidator $validator */ - $validator = app(AccountValidator::class); + $validator = app(AccountValidator::class); $validator->setTransactionType($expectedType); $validator->setUser($this->transactionJournal->user); - $result = $validator->validateSource(['id' => $sourceId]); + $result = $validator->validateSource(['id' => $sourceId]); app('log')->debug( sprintf('hasValidSourceAccount(%d, "%s") will return %s', $sourceId, $sourceName, var_export($result, true)) ); @@ -264,8 +264,8 @@ class JournalUpdateService private function hasValidDestinationAccount(): bool { app('log')->debug('Now in hasValidDestinationAccount().'); - $destId = $this->data['destination_id'] ?? null; - $destName = $this->data['destination_name'] ?? null; + $destId = $this->data['destination_id'] ?? null; + $destName = $this->data['destination_name'] ?? null; if (!$this->hasFields(['destination_id', 'destination_name'])) { app('log')->debug('No destination info submitted, grab the original data.'); @@ -275,12 +275,12 @@ class JournalUpdateService } // make new account validator. - $expectedType = $this->getExpectedType(); + $expectedType = $this->getExpectedType(); app('log')->debug(sprintf('(b) Expected type (new or unchanged) is %s', $expectedType)); // make a new validator. /** @var AccountValidator $validator */ - $validator = app(AccountValidator::class); + $validator = app(AccountValidator::class); $validator->setTransactionType($expectedType); $validator->setUser($this->transactionJournal->user); $validator->source = $this->getValidSourceAccount(); @@ -333,7 +333,7 @@ class JournalUpdateService return $this->getOriginalSourceAccount(); } - $sourceInfo = [ + $sourceInfo = [ 'id' => (int) ($this->data['source_id'] ?? null), 'name' => $this->data['source_name'] ?? null, 'iban' => $this->data['source_iban'] ?? null, @@ -361,8 +361,8 @@ class JournalUpdateService */ private function updateAccounts(): void { - $source = $this->getValidSourceAccount(); - $destination = $this->getValidDestinationAccount(); + $source = $this->getValidSourceAccount(); + $destination = $this->getValidDestinationAccount(); // cowardly refuse to update if both accounts are the same. if ($source->id === $destination->id) { @@ -375,7 +375,7 @@ class JournalUpdateService $origSourceTransaction->account()->associate($source); $origSourceTransaction->save(); - $destTransaction = $this->getDestinationTransaction(); + $destTransaction = $this->getDestinationTransaction(); $destTransaction->account()->associate($destination); $destTransaction->save(); @@ -397,7 +397,7 @@ class JournalUpdateService return $this->getOriginalDestinationAccount(); } - $destInfo = [ + $destInfo = [ 'id' => (int) ($this->data['destination_id'] ?? null), 'name' => $this->data['destination_name'] ?? null, 'iban' => $this->data['destination_iban'] ?? null, @@ -426,7 +426,7 @@ class JournalUpdateService { app('log')->debug('Now in updateType()'); if ($this->hasFields(['type'])) { - $type = 'opening-balance' === $this->data['type'] ? 'opening balance' : $this->data['type']; + $type = 'opening-balance' === $this->data['type'] ? 'opening balance' : $this->data['type']; app('log')->debug( sprintf( 'Trying to change journal #%d from a %s to a %s.', @@ -459,9 +459,9 @@ class JournalUpdateService { $type = $this->transactionJournal->transactionType->type; if (( - array_key_exists('bill_id', $this->data) + array_key_exists('bill_id', $this->data) || array_key_exists('bill_name', $this->data) - ) + ) && TransactionType::WITHDRAWAL === $type ) { $billId = (int) ($this->data['bill_id'] ?? 0); @@ -478,7 +478,7 @@ class JournalUpdateService private function updateField(string $fieldName): void { if (array_key_exists($fieldName, $this->data) && '' !== (string) $this->data[$fieldName]) { - $value = $this->data[$fieldName]; + $value = $this->data[$fieldName]; if ('date' === $fieldName) { if ($value instanceof Carbon) { @@ -579,7 +579,7 @@ class JournalUpdateService if ($this->hasFields([$field])) { $value = '' === $this->data[$field] ? null : $this->data[$field]; app('log')->debug(sprintf('Field "%s" is present ("%s"), try to update it.', $field, $value)); - $set = [ + $set = [ 'journal' => $this->transactionJournal, 'name' => $field, 'data' => $value, @@ -598,7 +598,7 @@ class JournalUpdateService if ($this->hasFields([$field])) { try { $value = '' === (string) $this->data[$field] ? null : new Carbon($this->data[$field]); - } catch (InvalidDateException | InvalidFormatException $e) { // @phpstan-ignore-line + } catch (InvalidDateException|InvalidFormatException $e) { // @phpstan-ignore-line app('log')->debug(sprintf('%s is not a valid date value: %s', $this->data[$field], $e->getMessage())); return; @@ -620,19 +620,19 @@ class JournalUpdateService if (!$this->hasFields(['currency_id', 'currency_code'])) { return; } - $currencyId = $this->data['currency_id'] ?? null; - $currencyCode = $this->data['currency_code'] ?? null; - $currency = $this->currencyRepository->findCurrency($currencyId, $currencyCode); + $currencyId = $this->data['currency_id'] ?? null; + $currencyCode = $this->data['currency_code'] ?? null; + $currency = $this->currencyRepository->findCurrency($currencyId, $currencyCode); // update currency everywhere. $this->transactionJournal->transaction_currency_id = $currency->id; $this->transactionJournal->save(); - $source = $this->getSourceTransaction(); - $source->transaction_currency_id = $currency->id; + $source = $this->getSourceTransaction(); + $source->transaction_currency_id = $currency->id; $source->save(); - $dest = $this->getDestinationTransaction(); - $dest->transaction_currency_id = $currency->id; + $dest = $this->getDestinationTransaction(); + $dest->transaction_currency_id = $currency->id; $dest->save(); // refresh transactions. @@ -648,7 +648,7 @@ class JournalUpdateService return; } - $value = $this->data['amount'] ?? ''; + $value = $this->data['amount'] ?? ''; app('log')->debug(sprintf('Amount is now "%s"', $value)); try { @@ -663,9 +663,9 @@ class JournalUpdateService $origSourceTransaction->amount = app('steam')->negative($amount); $origSourceTransaction->balance_dirty = true; $origSourceTransaction->save(); - $destTransaction = $this->getDestinationTransaction(); - $destTransaction->amount = app('steam')->positive($amount); - $destTransaction->balance_dirty = true; + $destTransaction = $this->getDestinationTransaction(); + $destTransaction->amount = app('steam')->positive($amount); + $destTransaction->balance_dirty = true; $destTransaction->save(); // refresh transactions. $this->sourceTransaction->refresh(); @@ -719,7 +719,6 @@ class JournalUpdateService $dest->foreign_amount = app('steam')->positive($foreignAmount); } - $dest->save(); app('log')->debug( @@ -742,8 +741,8 @@ class JournalUpdateService $source->foreign_amount = null; $source->save(); - $dest->foreign_currency_id = null; - $dest->foreign_amount = null; + $dest->foreign_currency_id = null; + $dest->foreign_amount = null; $dest->save(); app('log')->debug(sprintf('Foreign amount is "%s" so remove foreign amount info.', $amount)); } diff --git a/app/Support/Models/AccountBalanceCalculator.php b/app/Support/Models/AccountBalanceCalculator.php index 515d377da3..ed21efec17 100644 --- a/app/Support/Models/AccountBalanceCalculator.php +++ b/app/Support/Models/AccountBalanceCalculator.php @@ -31,7 +31,6 @@ use FireflyIII\Models\TransactionJournal; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; - /** * Class AccountBalanceCalculator * @@ -58,11 +57,11 @@ class AccountBalanceCalculator public static function recalculateForJournal(TransactionJournal $transactionJournal): void { Log::debug(__METHOD__); - $object = new self(); + $object = new self(); // recalculate the involved accounts: - $accounts = new Collection; - foreach($transactionJournal->transactions as $transaction) { + $accounts = new Collection(); + foreach ($transactionJournal->transactions as $transaction) { $accounts->push($transaction->account); } $object->optimizedCalculation($accounts); @@ -70,9 +69,9 @@ class AccountBalanceCalculator private function getAccountBalanceByAccount(int $account, int $currency): AccountBalance { - $query = AccountBalance::where('title', 'balance')->where('account_id', $account)->where('transaction_currency_id', $currency); + $query = AccountBalance::where('title', 'balance')->where('account_id', $account)->where('transaction_currency_id', $currency); - $entry = $query->first(); + $entry = $query->first(); if (null !== $entry) { // Log::debug(sprintf('Found account balance "balance" for account #%d and currency #%d: %s', $account, $currency, $entry->balance)); @@ -89,11 +88,6 @@ class AccountBalanceCalculator return $entry; } - /** - * @param Collection $accounts - * - * @return void - */ private function optimizedCalculation(Collection $accounts): void { Log::debug('start of optimizedCalculation'); @@ -110,12 +104,13 @@ class AccountBalanceCalculator ->orderBy('transaction_journals.order', 'desc') ->orderBy('transaction_journals.id', 'asc') ->orderBy('transaction_journals.description', 'asc') - ->orderBy('transactions.amount', 'asc'); + ->orderBy('transactions.amount', 'asc') + ; if (count($accounts) > 0) { $query->whereIn('transactions.account_id', $accounts->pluck('id')->toArray()); } - $set = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']); + $set = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']); /** @var Transaction $entry */ foreach ($set as $entry) { @@ -124,15 +119,15 @@ class AccountBalanceCalculator $balances[$entry->account_id][$entry->transaction_currency_id] ??= '0'; // before and after are easy: - $before = $balances[$entry->account_id][$entry->transaction_currency_id]; - $after = bcadd($before, $entry->amount); + $before = $balances[$entry->account_id][$entry->transaction_currency_id]; + $after = bcadd($before, $entry->amount); if (true === $entry->balance_dirty) { // update the transaction: $entry->balance_before = $before; $entry->balance_after = $after; $entry->balance_dirty = false; $entry->saveQuietly(); // do not observe this change, or we get stuck in a loop. - $count++; + ++$count; } // then update the array: @@ -146,9 +141,9 @@ class AccountBalanceCalculator private function getAccountBalanceByJournal(string $title, int $account, int $journal, int $currency): AccountBalance { - $query = AccountBalance::where('title', $title)->where('account_id', $account)->where('transaction_journal_id', $journal)->where('transaction_currency_id', $currency); + $query = AccountBalance::where('title', $title)->where('account_id', $account)->where('transaction_journal_id', $journal)->where('transaction_currency_id', $currency); - $entry = $query->first(); + $entry = $query->first(); if (null !== $entry) { return $entry; } @@ -165,7 +160,7 @@ class AccountBalanceCalculator private function recalculateLatest(?Account $account): void { - $query = Transaction::groupBy(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']); + $query = Transaction::groupBy(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']); if (null !== $account) { $query->where('transactions.account_id', $account->id); @@ -186,11 +181,11 @@ class AccountBalanceCalculator $sumForeignAmount = '' === $sumForeignAmount ? '0' : $sumForeignAmount; // at this point SQLite may return scientific notation because why not. Terrible. - $sumAmount = app('steam')->floatalize($sumAmount); - $sumForeignAmount = app('steam')->floatalize($sumForeignAmount); + $sumAmount = app('steam')->floatalize($sumAmount); + $sumForeignAmount = app('steam')->floatalize($sumForeignAmount); // first create for normal currency: - $entry = $this->getAccountBalanceByAccount($account, $transactionCurrency); + $entry = $this->getAccountBalanceByAccount($account, $transactionCurrency); try { $entry->balance = bcadd((string) $entry->balance, $sumAmount); @@ -245,7 +240,7 @@ class AccountBalanceCalculator */ private function recalculateJournals(?Account $account, ?TransactionJournal $transactionJournal): void { - $query = Transaction::groupBy(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']); + $query = Transaction::groupBy(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']); $query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'); $query->orderBy('transaction_journals.date', 'asc'); $amounts = []; @@ -256,28 +251,28 @@ class AccountBalanceCalculator $query->where('transaction_journals.date', '>=', $transactionJournal->date); $amounts = $this->getStartAmounts($account, $transactionJournal); } - $result = $query->get(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id', \DB::raw('SUM(transactions.amount) as sum_amount'), \DB::raw('SUM(transactions.foreign_amount) as sum_foreign_amount')]); + $result = $query->get(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id', \DB::raw('SUM(transactions.amount) as sum_amount'), \DB::raw('SUM(transactions.foreign_amount) as sum_foreign_amount')]); /** @var \stdClass $row */ foreach ($result as $row) { - $account = (int) $row->account_id; - $transactionCurrency = (int) $row->transaction_currency_id; - $foreignCurrency = (int) $row->foreign_currency_id; - $sumAmount = (string) $row->sum_amount; - $sumForeignAmount = (string) $row->sum_foreign_amount; - $journalId = (int) $row->id; + $account = (int) $row->account_id; + $transactionCurrency = (int) $row->transaction_currency_id; + $foreignCurrency = (int) $row->foreign_currency_id; + $sumAmount = (string) $row->sum_amount; + $sumForeignAmount = (string) $row->sum_foreign_amount; + $journalId = (int) $row->id; // check for empty strings - $sumAmount = '' === $sumAmount ? '0' : $sumAmount; - $sumForeignAmount = '' === $sumForeignAmount ? '0' : $sumForeignAmount; + $sumAmount = '' === $sumAmount ? '0' : $sumAmount; + $sumForeignAmount = '' === $sumForeignAmount ? '0' : $sumForeignAmount; // new amounts: $amounts[$account][$transactionCurrency] = bcadd($amounts[$account][$transactionCurrency] ?? '0', $sumAmount); $amounts[$account][$foreignCurrency] = bcadd($amounts[$account][$foreignCurrency] ?? '0', $sumForeignAmount); // first create for normal currency: - $entry = self::getAccountBalanceByJournal('balance_after_journal', $account, $journalId, $transactionCurrency); - $entry->balance = $amounts[$account][$transactionCurrency]; + $entry = self::getAccountBalanceByJournal('balance_after_journal', $account, $journalId, $transactionCurrency); + $entry->balance = $amounts[$account][$transactionCurrency]; $entry->save(); // then do foreign amount, if present: diff --git a/app/User.php b/app/User.php index c458489aad..deb0b896ab 100644 --- a/app/User.php +++ b/app/User.php @@ -24,8 +24,6 @@ declare(strict_types=1); namespace FireflyIII; -use Carbon\Carbon; -use Eloquent; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Events\RequestedNewPassword; use FireflyIII\Exceptions\FireflyException; @@ -56,19 +54,15 @@ use FireflyIII\Notifications\Admin\TestNotification; use FireflyIII\Notifications\Admin\UserInvitation; use FireflyIII\Notifications\Admin\UserRegistration; use FireflyIII\Notifications\Admin\VersionCheckResult; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasManyThrough; use Illuminate\Foundation\Auth\User as Authenticatable; -use Illuminate\Notifications\DatabaseNotification; -use Illuminate\Notifications\DatabaseNotificationCollection; use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notification; use Illuminate\Support\Collection; use Illuminate\Support\Str; -use Laravel\Passport\Client; use Laravel\Passport\HasApiTokens; use Laravel\Passport\Token; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/database/migrations/2024_07_28_145631_add_running_balance.php b/database/migrations/2024_07_28_145631_add_running_balance.php index d1fe92cbc6..c8c07f3cc8 100644 --- a/database/migrations/2024_07_28_145631_add_running_balance.php +++ b/database/migrations/2024_07_28_145631_add_running_balance.php @@ -1,12 +1,13 @@ error(sprintf('Could not execute query: %s', $e->getMessage())); app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } + try { Schema::table( 'transactions', @@ -38,6 +40,7 @@ return new class extends Migration app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } + try { Schema::table( 'transactions', @@ -71,6 +74,7 @@ return new class extends Migration app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } + try { Schema::table( 'transactions', @@ -84,6 +88,7 @@ return new class extends Migration app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } + try { Schema::table( 'transactions',