Fix and undo some enums

app/Console/Commands/Integrity/AddTimezonesToDates.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  * AddTimezonesToDates.php
  * Copyright (c) 2024 james@firefly-iii.org.
@@ -60,7 +62,7 @@ class AddTimezonesToDates extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): void
     {
         $models = [
             AccountBalance::class       => ['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));

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

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;

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;

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).
      *

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
@@ -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;

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,

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)),
+            $debt->id     => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::DEBT->value)),
-            $loan->id     => (string)trans(sprintf('firefly.account_type_%s', AccountType::LOAN)),
+            $loan->id     => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::LOAN->value)),
-            $mortgage->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::MORTGAGE)),
+            $mortgage->id => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::MORTGAGE->value)),
         ];
         asort($liabilityTypes);