diff --git a/app/Console/Commands/Integrity/AddTimezonesToDates.php b/app/Console/Commands/Integrity/AddTimezonesToDates.php index bf5001c5e4..87b46a625f 100644 --- a/app/Console/Commands/Integrity/AddTimezonesToDates.php +++ b/app/Console/Commands/Integrity/AddTimezonesToDates.php @@ -1,4 +1,6 @@ ['date'], // done @@ -90,17 +92,19 @@ class AddTimezonesToDates extends Command private function addTimezoneToModelField(string $model, string $field): void { - $shortModel = str_replace('FireflyIII\\Models\\','', $model); + $shortModel = str_replace('FireflyIII\Models\\', '', $model); $timezoneField = sprintf('%s_tz', $field); $items = new Collection(); + try { $items = $model::whereNull($timezoneField)->get(); } catch (QueryException $e) { $this->friendlyError(sprintf('Cannot add timezone to field "%s" of model "%s". Field does not exist.', $field, $shortModel)); Log::error($e->getMessage()); } - if(0 === $items->count()) { + if (0 === $items->count()) { $this->friendlyPositive(sprintf('Timezone is present in field "%s" of model "%s".', $field, $shortModel)); + return; } $this->friendlyInfo(sprintf('Adding timezone to field "%s" of model "%s".', $field, $shortModel)); diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 49fccbd0d8..7a2087bf05 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -35,19 +35,33 @@ class AccountType extends Model { use ReturnsIntegerIdTrait; + /** @deprecated */ public const string ASSET = 'Asset account'; + /** @deprecated */ public const string BENEFICIARY = 'Beneficiary account'; + /** @deprecated */ public const string CASH = 'Cash account'; + /** @deprecated */ public const string CREDITCARD = 'Credit card'; + /** @deprecated */ public const string DEBT = 'Debt'; + /** @deprecated */ public const string DEFAULT = 'Default account'; + /** @deprecated */ public const string EXPENSE = 'Expense account'; + /** @deprecated */ public const string IMPORT = 'Import account'; + /** @deprecated */ public const string INITIAL_BALANCE = 'Initial balance account'; + /** @deprecated */ public const string LIABILITY_CREDIT = 'Liability credit account'; + /** @deprecated */ public const string LOAN = 'Loan'; + /** @deprecated */ public const string MORTGAGE = 'Mortgage'; + /** @deprecated */ public const string RECONCILIATION = 'Reconciliation account'; + /** @deprecated */ public const string REVENUE = 'Revenue account'; protected $casts diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index be76370f1a..d8c4513669 100644 --- a/app/Models/AutoBudget.php +++ b/app/Models/AutoBudget.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Models; -use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\AutoBudgetType; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 3815d8aff2..a218c1eda0 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Models; -use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\RecurrenceRepetitionWeekend; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Casts\Attribute; diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 7b7eb1ac3d..6ac40dc390 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -54,7 +54,6 @@ class TransactionType extends Model ]; protected $fillable = ['type']; - protected function casts(): array { return [ @@ -62,7 +61,6 @@ class TransactionType extends Model ]; } - /** * Route binder. Converts the key in the URL to the specified object (or throw 404). * diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index ecddb731e1..63e732d346 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -142,10 +142,10 @@ class Webhook extends Model $webhookId = (int) $value; /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); /** @var null|Webhook $webhook */ - $webhook = $user->webhooks()->find($webhookId); + $webhook = $user->webhooks()->find($webhookId); if (null !== $webhook) { return $webhook; } diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index e3c6be6637..2766d36bfa 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) { @@ -580,7 +580,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, @@ -599,7 +599,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; @@ -628,19 +628,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. @@ -656,7 +656,7 @@ class JournalUpdateService return; } - $value = $this->data['amount'] ?? ''; + $value = $this->data['amount'] ?? ''; app('log')->debug(sprintf('Amount is now "%s"', $value)); try { @@ -671,9 +671,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(); @@ -749,8 +749,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/Http/Api/AccountFilter.php b/app/Support/Http/Api/AccountFilter.php index baf326748a..697df4c5b9 100644 --- a/app/Support/Http/Api/AccountFilter.php +++ b/app/Support/Http/Api/AccountFilter.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Api; +use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Models\AccountType; /** @@ -32,7 +33,7 @@ trait AccountFilter { protected array $types = [ 'all' => [ - AccountType::DEFAULT, + AccountTypeEnum::DEFAULT->value, AccountType::CASH, AccountType::ASSET, AccountType::EXPENSE, diff --git a/app/Support/Http/Controllers/ModelInformation.php b/app/Support/Http/Controllers/ModelInformation.php index 68a31bcc7a..2988f32db3 100644 --- a/app/Support/Http/Controllers/ModelInformation.php +++ b/app/Support/Http/Controllers/ModelInformation.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Controllers; +use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\AccountType; use FireflyIII\Models\Bill; @@ -84,9 +85,9 @@ trait ModelInformation /** @var AccountType $mortgage */ $mortgage = $repository->getAccountTypeByType(AccountType::MORTGAGE); $liabilityTypes = [ - $debt->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::DEBT)), - $loan->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::LOAN)), - $mortgage->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::MORTGAGE)), + $debt->id => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::DEBT->value)), + $loan->id => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::LOAN->value)), + $mortgage->id => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::MORTGAGE->value)), ]; asort($liabilityTypes);