Code cleanup that (hopefully) matches style CI

2025-02-25 18:45:27 -06:00 · 2020-03-17 16:46:00 +01:00 · 2020-03-17 16:46:00 +01:00 · 9a25d6a741
commit 9a25d6a741
parent 91c067ac9f
42 changed files with 1395 additions and 1262 deletions
--- a/app/Factory/TransactionJournalFactory.php
+++ b/app/Factory/TransactionJournalFactory.php
@ -220,6 +220,26 @@ class TransactionJournalFactory
        $factory->updateOrCreate($set);
    }

+    /**
+     * Set foreign currency to NULL if it's the same as the normal currency:
+     *
+     * @param TransactionCurrency      $currency
+     * @param TransactionCurrency|null $foreignCurrency
+     *
+     * @return TransactionCurrency|null
+     */
+    private function compareCurrencies(?TransactionCurrency $currency, ?TransactionCurrency $foreignCurrency): ?TransactionCurrency
+    {
+        if (null === $currency) {
+            return null;
+        }
+        if (null !== $foreignCurrency && $foreignCurrency->id === $currency->id) {
+            return null;
+        }
+
+        return $foreignCurrency;
+    }
+
    /**
     * @param NullArrayObject $row
     *
@ -246,9 +266,6 @@ class TransactionJournalFactory
        /** Manipulate basic fields */
        $carbon->setTimezone(config('app.timezone'));

-        /** Get source + destination account */
-        Log::debug(sprintf('Currency is #%d (%s)', $currency->id, $currency->code));
-
        try {
            // validate source and destination using a new Validator.
            $this->validateAccounts($row);
@ -279,55 +296,10 @@ class TransactionJournalFactory

        $sourceAccount      = $this->getAccount($type->type, 'source', $sourceInfo);
        $destinationAccount = $this->getAccount($type->type, 'destination', $destInfo);
-
-        // TODO AFTER 4.8,0 better handling below:
-
-        /** double check currencies. */
-        $sourceCurrency        = $currency;
-        $destCurrency          = $currency;
-        $sourceForeignCurrency = $foreignCurrency;
-        $destForeignCurrency   = $foreignCurrency;
-
-        if (TransactionType::WITHDRAWAL === $type->type) {
-            // make sure currency is correct.
-            $currency = $this->getCurrency($currency, $sourceAccount);
-            // make sure foreign currency != currency.
-            if (null !== $foreignCurrency && $foreignCurrency->id === $currency->id) {
-                $foreignCurrency = null;
-            }
-            $sourceCurrency        = $currency;
-            $destCurrency          = $currency;
-            $sourceForeignCurrency = $foreignCurrency;
-            $destForeignCurrency   = $foreignCurrency;
-        }
-        if (TransactionType::DEPOSIT === $type->type) {
-            // make sure currency is correct.
-            $currency = $this->getCurrency($currency, $destinationAccount);
-            // make sure foreign currency != currency.
-            if (null !== $foreignCurrency && $foreignCurrency->id === $currency->id) {
-                $foreignCurrency = null;
-            }
-
-            $sourceCurrency        = $currency;
-            $destCurrency          = $currency;
-            $sourceForeignCurrency = $foreignCurrency;
-            $destForeignCurrency   = $foreignCurrency;
-        }
-
-        if (TransactionType::TRANSFER === $type->type) {
-            // get currencies
-            $currency        = $this->getCurrency($currency, $sourceAccount);
-            $foreignCurrency = $this->getCurrency($foreignCurrency, $destinationAccount);
-
-            $sourceCurrency        = $currency;
-            $destCurrency          = $currency;
-            $sourceForeignCurrency = $foreignCurrency;
-            $destForeignCurrency   = $foreignCurrency;
-        }
-
-        $description = '' === $description ? '(empty description)' : $description;
-        $description = substr($description, 0, 255);
-
+        $currency           = $this->getCurrencyByAccount($type->type, $currency, $sourceAccount, $destinationAccount);
+        $foreignCurrency    = $this->compareCurrencies($currency, $foreignCurrency);
+        $foreignCurrency    = $this->getForeignByAccount($type->type, $foreignCurrency, $destinationAccount);
+        $description        = $this->getDescription($description);

        /** Create a basic journal. */
        $journal = TransactionJournal::create(
@ -351,8 +323,8 @@ class TransactionJournalFactory
        $transactionFactory->setUser($this->user);
        $transactionFactory->setJournal($journal);
        $transactionFactory->setAccount($sourceAccount);
-        $transactionFactory->setCurrency($sourceCurrency);
-        $transactionFactory->setForeignCurrency($sourceForeignCurrency);
+        $transactionFactory->setCurrency($currency);
+        $transactionFactory->setForeignCurrency($foreignCurrency);
        $transactionFactory->setReconciled($row['reconciled'] ?? false);
        try {
            $negative = $transactionFactory->createNegative((string) $row['amount'], (string) $row['foreign_amount']);
@ -370,8 +342,8 @@ class TransactionJournalFactory
        $transactionFactory->setUser($this->user);
        $transactionFactory->setJournal($journal);
        $transactionFactory->setAccount($destinationAccount);
-        $transactionFactory->setCurrency($destCurrency);
-        $transactionFactory->setForeignCurrency($destForeignCurrency);
+        $transactionFactory->setCurrency($currency);
+        $transactionFactory->setForeignCurrency($foreignCurrency);
        $transactionFactory->setReconciled($row['reconciled'] ?? false);
        try {
            $transactionFactory->createPositive((string) $row['amount'], (string) $row['foreign_amount']);
@ -504,6 +476,55 @@ class TransactionJournalFactory
        return $result;
    }

+    /**
+     * @param string                   $type
+     * @param TransactionCurrency|null $currency
+     * @param Account                  $source
+     * @param Account                  $destination
+     *
+     * @return TransactionCurrency
+     */
+    private function getCurrencyByAccount(string $type, ?TransactionCurrency $currency, Account $source, Account $destination): TransactionCurrency
+    {
+        switch ($type) {
+            default:
+            case TransactionType::WITHDRAWAL:
+            case TransactionType::TRANSFER:
+                return $this->getCurrency($currency, $source);
+            case TransactionType::DEPOSIT:
+                return $this->getCurrency($currency, $destination);
+
+        }
+    }
+
+    /**
+     * @param string $description
+     *
+     * @return string
+     */
+    private function getDescription(string $description): string
+    {
+        $description = '' === $description ? '(empty description)' : $description;
+
+        return substr($description, 0, 255);
+    }
+
+    /**
+     * @param string                   $type
+     * @param TransactionCurrency|null $foreignCurrency
+     * @param Account                  $destination
+     *
+     * @return TransactionCurrency|null
+     */
+    private function getForeignByAccount(string $type, ?TransactionCurrency $foreignCurrency, Account $destination): ?TransactionCurrency
+    {
+        if (TransactionType::TRANSFER === $type) {
+            return $this->getCurrency($foreignCurrency, $destination);
+        }
+
+        return $foreignCurrency;
+    }
+
    /**
     * @param NullArrayObject $row
     *
--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@ -126,8 +126,10 @@ class CreateAutoBudgetLimits implements ShouldQueue
        Log::debug(
            sprintf(
                'Current period is %s-%s, so previous period is %s-%s',
-                $start->format('Y-m-d'), $end->format('Y-m-d'),
-                $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d')
+                $start->format('Y-m-d'),
+                $end->format('Y-m-d'),
+                $previousStart->format('Y-m-d'),
+                $previousEnd->format('Y-m-d')
            )
        );

@ -176,7 +178,10 @@ class CreateAutoBudgetLimits implements ShouldQueue
    {
        Log::debug(
            sprintf(
-                'Going to find a budget limit for budget #%d ("%s") between %s and %s', $budget->id, $budget->name, $start->format('Y-m-d'),
+                'Going to find a budget limit for budget #%d ("%s") between %s and %s',
+                $budget->id,
+                $budget->name,
+                $start->format('Y-m-d'),
                $end->format('Y-m-d')
            )
        );
@ -197,16 +202,25 @@ class CreateAutoBudgetLimits implements ShouldQueue
            Log::info(
                sprintf(
                    'Today (%s) is not a magic day for %s auto-budget #%d (part of budget #%d "%s")',
-                    $this->date->format('Y-m-d'), $autoBudget->period, $autoBudget->id, $autoBudget->budget->id, $autoBudget->budget->name
+                    $this->date->format('Y-m-d'),
+                    $autoBudget->period,
+                    $autoBudget->id,
+                    $autoBudget->budget->id,
+                    $autoBudget->budget->name
                )
            );
            Log::debug(sprintf('Done with auto budget #%d', $autoBudget->id));
+
            return;
        }
        Log::info(
            sprintf(
                'Today (%s) is a magic day for %s auto-budget #%d (part of budget #%d "%s")',
-                $this->date->format('Y-m-d'), $autoBudget->period, $autoBudget->id, $autoBudget->budget->id, $autoBudget->budget->name
+                $this->date->format('Y-m-d'),
+                $autoBudget->period,
+                $autoBudget->id,
+                $autoBudget->budget->id,
+                $autoBudget->budget->name
            )
        );

@ -239,8 +253,8 @@ class CreateAutoBudgetLimits implements ShouldQueue
    /**
     * @param AutoBudget $autoBudget
     *
-     * @return bool
     * @throws FireflyException
+     * @return bool
     */
    private function isMagicDay(AutoBudget $autoBudget): bool
    {
--- a/app/Jobs/CreateRecurringTransactions.php
+++ b/app/Jobs/CreateRecurringTransactions.php
@ -52,35 +52,26 @@ class CreateRecurringTransactions implements ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

-    /** @var Carbon The current date */
-    private $date;
-    /** @var JournalRepositoryInterface Journal repository */
-    private $journalRepository;
-    /** @var TransactionGroupRepositoryInterface */
-    private $groupRepository;
-    /** @var RecurringRepositoryInterface Recurring transactions repository. */
-    private $repository;
-    /** @var bool Force the transaction to be created no matter what. */
-    private $force;
-
-    /** @var int Number of recurrences submitted */
-    public $submitted;
-    /** @var int Number of recurrences actually fired */
-    public $executed;
    /** @var int Transaction groups created */
    public $created;
-
-    /**
-     * @param Carbon $date
-     */
-    public function setDate(Carbon $date): void
-    {
-        $date->startOfDay();
-        $this->date = $date;
-    }
+    /** @var int Number of recurrences actually fired */
+    public $executed;
+    /** @var int Number of recurrences submitted */
+    public $submitted;
+    /** @var Carbon The current date */
+    private $date;
+    /** @var bool Force the transaction to be created no matter what. */
+    private $force;
+    /** @var TransactionGroupRepositoryInterface */
+    private $groupRepository;
+    /** @var JournalRepositoryInterface Journal repository */
+    private $journalRepository;
+    /** @var RecurringRepositoryInterface Recurring transactions repository. */
+    private $repository;

    /**
     * Create a new job instance.
+     *
     * @codeCoverageIgnore
     *
     * @param Carbon $date
@ -100,15 +91,6 @@ class CreateRecurringTransactions implements ShouldQueue
        $this->created           = 0;

        Log::debug(sprintf('Created new CreateRecurringTransactions("%s")', $this->date->format('Y-m-d')));
-
-    }
-
-    /**
-     * @param bool $force
-     */
-    public function setForce(bool $force): void
-    {
-        $this->force = $force;
    }

    /**
@ -157,6 +139,23 @@ class CreateRecurringTransactions implements ShouldQueue
        app('preferences')->mark();
    }

+    /**
+     * @param Carbon $date
+     */
+    public function setDate(Carbon $date): void
+    {
+        $date->startOfDay();
+        $this->date = $date;
+    }
+
+    /**
+     * @param bool $force
+     */
+    public function setForce(bool $force): void
+    {
+        $this->force = $force;
+    }
+
    /**
     * Return recurring transaction is active.
     *
@ -186,6 +185,20 @@ class CreateRecurringTransactions implements ShouldQueue
        return $return;
    }

+    /**
+     * @param Collection $recurrences
+     *
+     * @return Collection
+     */
+    private function filterRecurrences(Collection $recurrences): Collection
+    {
+        return $recurrences->filter(
+            function (Recurrence $recurrence) {
+                return $this->validRecurrence($recurrence);
+            }
+        );
+    }
+
    /**
     * Get the start date of a recurrence.
     *
@ -254,31 +267,10 @@ class CreateRecurringTransactions implements ShouldQueue
        return $return;
    }

-    /**
-     * Check if the occurences should be executed.
-     *
-     * @param Recurrence $recurrence
-     * @param array $occurrences
-     *
-     * @return Collection
-     */
-    private function handleOccurrences(Recurrence $recurrence, array $occurrences): Collection
-    {
-        $collection = new Collection;
-        /** @var Carbon $date */
-        foreach ($occurrences as $date) {
-            $result = $this->handleOccurrence($recurrence, $date);
-            if (null !== $result) {
-                $collection->push($result);
-            }
-        }
-
-        return $collection;
-    }
-
    /**
     * @param Recurrence $recurrence
     * @param Carbon     $date
+     *
     * @return TransactionGroup|null
     */
    private function handleOccurrence(Recurrence $recurrence, Carbon $date): ?TransactionGroup
@ -336,6 +328,28 @@ class CreateRecurringTransactions implements ShouldQueue
        return $group;
    }

+    /**
+     * Check if the occurences should be executed.
+     *
+     * @param Recurrence $recurrence
+     * @param array      $occurrences
+     *
+     * @return Collection
+     */
+    private function handleOccurrences(Recurrence $recurrence, array $occurrences): Collection
+    {
+        $collection = new Collection;
+        /** @var Carbon $date */
+        foreach ($occurrences as $date) {
+            $result = $this->handleOccurrence($recurrence, $date);
+            if (null !== $result) {
+                $collection->push($result);
+            }
+        }
+
+        return $collection;
+    }
+
    /**
     * Separate method that will loop all repetitions and do something with it. Will return
     * all created transaction journals.
@ -351,7 +365,9 @@ class CreateRecurringTransactions implements ShouldQueue
        foreach ($recurrence->recurrenceRepetitions as $repetition) {
            Log::debug(
                sprintf(
-                    'Now repeating %s with value "%s", skips every %d time(s)', $repetition->repetition_type, $repetition->repetition_moment,
+                    'Now repeating %s with value "%s", skips every %d time(s)',
+                    $repetition->repetition_type,
+                    $repetition->repetition_moment,
                    $repetition->repetition_skip
                )
            );
@ -367,7 +383,8 @@ class CreateRecurringTransactions implements ShouldQueue
                    count($occurrences),
                    $recurrence->first_date->format('Y-m-d'),
                    $includeWeekend->format('Y-m-d')
-                ), $this->debugArray($occurrences)
+                ),
+                $this->debugArray($occurrences)
            );
            unset($includeWeekend);

@ -404,6 +421,24 @@ class CreateRecurringTransactions implements ShouldQueue
        return $startDate->gt($this->date);
    }

+    /***
+     * @param Recurrence       $recurrence
+     * @param TransactionGroup $group
+     */
+    private function linkGroupToPiggies(Recurrence $recurrence, TransactionGroup $group): void
+    {
+        /** @var TransactionJournal $journal */
+        foreach ($group->transactionJournals as $journal) {
+            // get piggy bank ID from meta data:
+            $piggyBank = $this->repository->getPiggyBank($recurrence);
+            if (null !== $piggyBank) {
+                /** @var PiggyBankEventFactory $factory */
+                $factory = app(PiggyBankEventFactory::class);
+                $factory->create($journal, $piggyBank);
+            }
+        }
+    }
+
    /**
     * Return true if the $repeat_until date is in the past.
     *
@ -479,39 +514,5 @@ class CreateRecurringTransactions implements ShouldQueue
        }

        return true;
-
-    }
-
-    /**
-     * @param Collection $recurrences
-     * @return Collection
-     */
-    private function filterRecurrences(Collection $recurrences): Collection
-    {
-        return $recurrences->filter(
-            function (Recurrence $recurrence) {
-                return $this->validRecurrence($recurrence);
-            }
-        );
-    }
-
-    /***
-     * @param Recurrence $recurrence
-     * @param TransactionGroup $group
-     */
-    private function linkGroupToPiggies(Recurrence $recurrence, TransactionGroup $group): void
-    {
-        /** @var TransactionJournal $journal */
-        foreach ($group->transactionJournals as $journal) {
-            // get piggy bank ID from meta data:
-            $piggyBank = $this->repository->getPiggyBank($recurrence);
-            if (null !== $piggyBank) {
-                /** @var PiggyBankEventFactory $factory */
-                $factory = app(PiggyBankEventFactory::class);
-                $factory->create($journal, $piggyBank);
-            }
-
-        }
-
    }
 }
--- a/app/Jobs/MailError.php
+++ b/app/Jobs/MailError.php
@ -32,6 +32,7 @@ use Mail;

 /**
 * Class MailError.
+ *
 * @codeCoverageIgnore
 */
 class MailError extends Job implements ShouldQueue
--- a/app/Mail/ReportNewJournalsMail.php
+++ b/app/Mail/ReportNewJournalsMail.php
@ -42,12 +42,10 @@ class ReportNewJournalsMail extends Mailable

    /** @var string Email address of the user */
    public $email;
-    /** @var string IP address of user (if known) */
-    public $ipAddress;
-
    /** @var Collection A collection of groups */
    public $groups;
-
+    /** @var string IP address of user (if known) */
+    public $ipAddress;
    /** @var array All groups, transformed to array. */
    public $transformed;

@ -75,7 +73,8 @@ class ReportNewJournalsMail extends Mailable
        $subject = 1 === $this->groups->count()
            ? 'Firefly III has created a new transaction'
            : sprintf(
-                'Firefly III has created new %d transactions', $this->groups->count()
+                'Firefly III has created new %d transactions',
+                $this->groups->count()
            );
        $this->transform();

--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
@ -30,6 +31,7 @@ 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 Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

@ -60,29 +62,29 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property \Illuminate\Support\Carbon|null                             $deleted_at
 * @property int                                                         $user_id
 * @property-read string                                                 $edit_name
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[]        $notes
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account accountTypeIn($types)
+ * @property-read \Illuminate\Database\Eloquent\Collection|Note[]        $notes
+ * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[] $transactions
+ * @method static EloquentBuilder|Account accountTypeIn($types)
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account query()
+ * @method static EloquentBuilder|Account newModelQuery()
+ * @method static EloquentBuilder|Account newQuery()
+ * @method static Builder|Account onlyTrashed()
+ * @method static EloquentBuilder|Account query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereAccountTypeId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereIban($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereUserId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Account whereVirtualBalance($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account withoutTrashed()
- * @mixin \Eloquent
+ * @method static EloquentBuilder|Account whereAccountTypeId($value)
+ * @method static EloquentBuilder|Account whereActive($value)
+ * @method static EloquentBuilder|Account whereCreatedAt($value)
+ * @method static EloquentBuilder|Account whereDeletedAt($value)
+ * @method static EloquentBuilder|Account whereEncrypted($value)
+ * @method static EloquentBuilder|Account whereIban($value)
+ * @method static EloquentBuilder|Account whereId($value)
+ * @method static EloquentBuilder|Account whereName($value)
+ * @method static EloquentBuilder|Account whereUpdatedAt($value)
+ * @method static EloquentBuilder|Account whereUserId($value)
+ * @method static EloquentBuilder|Account whereVirtualBalance($value)
+ * @method static Builder|Account withTrashed()
+ * @method static Builder|Account withoutTrashed()
+ * @mixin Eloquent
 */
 class Account extends Model
 {
@ -114,8 +116,8 @@ class Account extends Model
     *
     * @param string $value
     *
-     * @return Account
     * @throws NotFoundHttpException
+     * @return Account
     */
    public static function routeBinder(string $value): Account
    {
@ -150,15 +152,6 @@ class Account extends Model
        return $this->belongsTo(AccountType::class);
    }

-    /**
-     * @codeCoverageIgnore
-     * @return MorphMany
-     */
-    public function locations(): MorphMany
-    {
-        return $this->morphMany(Location::class, 'locatable');
-    }
-
    /**
     * Get the account number.
     *
@ -189,6 +182,15 @@ class Account extends Model
        return $name;
    }

+    /**
+     * @codeCoverageIgnore
+     * @return MorphMany
+     */
+    public function locations(): MorphMany
+    {
+        return $this->morphMany(Location::class, 'locatable');
+    }
+
    /**
     * @codeCoverageIgnore
     * Get all of the notes.
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@ -22,8 +22,11 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Eloquent;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;

 /**
 * Class AccountMeta.
@ -32,19 +35,19 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 * @property string                          $name
 * @property int                             $account_id
 * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \FireflyIII\Models\Account $account
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereAccountId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereData($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property-read Account                    $account
+ * @method static Builder|AccountMeta newModelQuery()
+ * @method static Builder|AccountMeta newQuery()
+ * @method static Builder|AccountMeta query()
+ * @method static Builder|AccountMeta whereAccountId($value)
+ * @method static Builder|AccountMeta whereCreatedAt($value)
+ * @method static Builder|AccountMeta whereData($value)
+ * @method static Builder|AccountMeta whereId($value)
+ * @method static Builder|AccountMeta whereName($value)
+ * @method static Builder|AccountMeta whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class AccountMeta extends Model
 {
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@ -22,8 +22,12 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Eloquent;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Carbon;

 /**
 * Class AccountType.
@ -31,16 +35,16 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 * @property string                                                  $type
 * @method whereType(string $type)
 * @property int                                                     $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @property Carbon|null                         $created_at
+ * @property Carbon|null                         $updated_at
+ * @property-read Collection|Account[] $accounts
+ * @method static Builder|AccountType newModelQuery()
+ * @method static Builder|AccountType newQuery()
+ * @method static Builder|AccountType query()
+ * @method static Builder|AccountType whereCreatedAt($value)
+ * @method static Builder|AccountType whereId($value)
+ * @method static Builder|AccountType whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class AccountType extends Model
 {
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@ -23,12 +23,15 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
+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;

 /**
@ -51,30 +54,30 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property \Illuminate\Support\Carbon|null                            $deleted_at
 * @property int                                                        $user_id
 * @property int                                                        $attachable_id
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachable
+ * @property-read Collection|Attachment[] $attachable
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment newQuery()
+ * @method static Builder|Attachment onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereAttachableId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereAttachableType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereFilename($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereMd5($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereMime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereSize($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereTitle($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereUploaded($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Attachment whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereAttachableId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereAttachableType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereFilename($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereMd5($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereMime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereSize($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUploaded($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUserId($value)
+ * @method static Builder|Attachment withTrashed()
+ * @method static Builder|Attachment withoutTrashed()
+ * @mixin Eloquent
 */
 class Attachment extends Model
 {
@ -100,8 +103,8 @@ class Attachment extends Model
     *
     * @param string $value
     *
-     * @return Attachment
     * @throws NotFoundHttpException
+     * @return Attachment
     */
    public static function routeBinder(string $value): Attachment
    {
--- a/app/Models/AvailableBudget.php
+++ b/app/Models/AvailableBudget.php
@ -23,10 +23,12 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
 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;

 /**
@ -44,23 +46,23 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property \Illuminate\Support\Carbon|null $deleted_at
 * @property int                             $user_id
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AvailableBudget onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget newQuery()
+ * @method static Builder|AvailableBudget onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereAmount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereEndDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereStartDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\AvailableBudget whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AvailableBudget withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AvailableBudget withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereAmount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereEndDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereStartDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereTransactionCurrencyId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereUserId($value)
+ * @method static Builder|AvailableBudget withTrashed()
+ * @method static Builder|AvailableBudget withoutTrashed()
+ * @mixin Eloquent
 */
 class AvailableBudget extends Model
 {
@ -87,8 +89,8 @@ class AvailableBudget extends Model
     *
     * @param string $value
     *
-     * @return AvailableBudget
     * @throws NotFoundHttpException
+     * @return AvailableBudget
     */
    public static function routeBinder(string $value): AvailableBudget
    {
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@ -23,12 +23,14 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
 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 Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

@ -58,34 +60,34 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property int                                                                $user_id
 * @property bool                                                               $name_encrypted
 * @property bool                                                               $match_encrypted
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
+ * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[]         $attachments
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill newQuery()
+ * @method static Builder|Bill onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereAmountMax($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereAmountMin($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereAutomatch($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereMatch($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereRepeatFreq($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereSkip($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Bill whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereActive($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAmountMax($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAmountMin($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAutomatch($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereMatch($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereMatchEncrypted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereNameEncrypted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereRepeatFreq($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereSkip($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereTransactionCurrencyId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereUserId($value)
+ * @method static Builder|Bill withTrashed()
+ * @method static Builder|Bill withoutTrashed()
+ * @mixin Eloquent
 */
 class Bill extends Model
 {
@ -120,8 +122,8 @@ class Bill extends Model
     *
     * @param string $value
     *
-     * @return Bill
     * @throws NotFoundHttpException
+     * @return Bill
     */
    public static function routeBinder(string $value): Bill
    {
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@ -23,12 +23,14 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
 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\SoftDeletes;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

@ -47,26 +49,26 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Carbon                                                             updated_at
 * @property User                                                               $user
 * @property \Illuminate\Support\Carbon|null                                    $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
+ * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[]        $transactions
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget newQuery()
+ * @method static Builder|Budget onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Budget whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereActive($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereEncrypted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereOrder($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Budget whereUserId($value)
+ * @method static Builder|Budget withTrashed()
+ * @method static Builder|Budget withoutTrashed()
+ * @mixin Eloquent
 */
 class Budget extends Model
 {
@ -95,8 +97,8 @@ class Budget extends Model
     *
     * @param string $value
     *
-     * @return Budget
     * @throws NotFoundHttpException
+     * @return Budget
     */
    public static function routeBinder(string $value): Budget
    {
@ -117,19 +119,18 @@ class Budget extends Model
     * @codeCoverageIgnore
     * @return HasMany
     */
-    public function budgetlimits(): HasMany
+    public function autoBudgets(): HasMany
    {
-        return $this->hasMany(BudgetLimit::class);
+        return $this->hasMany(AutoBudget::class);
    }

-
    /**
     * @codeCoverageIgnore
     * @return HasMany
     */
-    public function autoBudgets(): HasMany
+    public function budgetlimits(): HasMany
    {
-        return $this->hasMany(AutoBudget::class);
+        return $this->hasMany(BudgetLimit::class);
    }

    /**
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@ -23,6 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -41,18 +43,18 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property string              spent
 * @property int                 $transaction_currency_id
 * @property TransactionCurrency $transactionCurrency
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereAmount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereBudgetId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereEndDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereStartDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @method static Builder|BudgetLimit newModelQuery()
+ * @method static Builder|BudgetLimit newQuery()
+ * @method static Builder|BudgetLimit query()
+ * @method static Builder|BudgetLimit whereAmount($value)
+ * @method static Builder|BudgetLimit whereBudgetId($value)
+ * @method static Builder|BudgetLimit whereCreatedAt($value)
+ * @method static Builder|BudgetLimit whereEndDate($value)
+ * @method static Builder|BudgetLimit whereId($value)
+ * @method static Builder|BudgetLimit whereStartDate($value)
+ * @method static Builder|BudgetLimit whereTransactionCurrencyId($value)
+ * @method static Builder|BudgetLimit whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class BudgetLimit extends Model
 {
@ -77,8 +79,8 @@ class BudgetLimit extends Model
     *
     * @param string $value
     *
-     * @return mixed
     * @throws NotFoundHttpException
+     * @return mixed
     */
    public static function routeBinder(string $value): BudgetLimit
    {
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@ -24,11 +24,14 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 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\SoftDeletes;
+use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
@ -45,24 +48,24 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property \Illuminate\Support\Carbon|null      $deleted_at
 * @property int                                  $user_id
 * @property bool                                 $encrypted
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property-read Collection|Transaction[]        $transactions
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Category newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Category newQuery()
+ * @method static Builder|Category onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Category query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Category whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Category whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Category whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Category whereEncrypted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Category whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Category whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Category whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Category whereUserId($value)
+ * @method static Builder|Category withTrashed()
+ * @method static Builder|Category withoutTrashed()
+ * @mixin Eloquent
 */
 class Category extends Model
 {
@ -90,8 +93,8 @@ class Category extends Model
     *
     * @param string $value
     *
-     * @return Category
     * @throws NotFoundHttpException
+     * @return Category
     */
    public static function routeBinder(string $value): Category
    {
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@ -22,8 +22,11 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Eloquent;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Carbon;

 /**
 * Class Configuration.
@ -31,24 +34,24 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property string                          $data
 * @property string                          $name
 * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration newQuery()
+ * @method static Builder|Configuration onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereData($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Configuration whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereData($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereUpdatedAt($value)
+ * @method static Builder|Configuration withTrashed()
+ * @method static Builder|Configuration withoutTrashed()
+ * @mixin Eloquent
 */
 class Configuration extends Model
 {
--- a/app/Models/CurrencyExchangeRate.php
+++ b/app/Models/CurrencyExchangeRate.php
@ -23,7 +23,9 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;

@ -42,21 +44,21 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 * @property string|null         $deleted_at
 * @property int                 $user_id
 * @property float|null          $user_rate
- * @property-read \FireflyIII\User $user
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereFromCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereRate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereToCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereUserId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\CurrencyExchangeRate whereUserRate($value)
- * @mixin \Eloquent
+ * @property-read User           $user
+ * @method static Builder|CurrencyExchangeRate newModelQuery()
+ * @method static Builder|CurrencyExchangeRate newQuery()
+ * @method static Builder|CurrencyExchangeRate query()
+ * @method static Builder|CurrencyExchangeRate whereCreatedAt($value)
+ * @method static Builder|CurrencyExchangeRate whereDate($value)
+ * @method static Builder|CurrencyExchangeRate whereDeletedAt($value)
+ * @method static Builder|CurrencyExchangeRate whereFromCurrencyId($value)
+ * @method static Builder|CurrencyExchangeRate whereId($value)
+ * @method static Builder|CurrencyExchangeRate whereRate($value)
+ * @method static Builder|CurrencyExchangeRate whereToCurrencyId($value)
+ * @method static Builder|CurrencyExchangeRate whereUpdatedAt($value)
+ * @method static Builder|CurrencyExchangeRate whereUserId($value)
+ * @method static Builder|CurrencyExchangeRate whereUserRate($value)
+ * @mixin Eloquent
 */
 class CurrencyExchangeRate extends Model
 {
--- a/app/Models/ImportJob.php
+++ b/app/Models/ImportJob.php
@ -23,7 +23,10 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 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\MorphMany;
@ -31,6 +34,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
 * Class ImportJob.
+ *
 * @codeCoverageIgnore
 * @deprecated
 * @property array                                                                         $transactions
@ -49,25 +53,25 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property int                                                        id
 * @property Carbon                                                     $created_at
 * @property Carbon                                                     $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereConfiguration($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereErrors($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereExtendedStatus($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereFileType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereKey($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereProvider($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereStage($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereStatus($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereTagId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereTransactions($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob whereUserId($value)
- * @mixin \Eloquent
+ * @property-read Collection|Attachment[] $attachments
+ * @method static Builder|ImportJob newModelQuery()
+ * @method static Builder|ImportJob newQuery()
+ * @method static Builder|ImportJob query()
+ * @method static Builder|ImportJob whereConfiguration($value)
+ * @method static Builder|ImportJob whereCreatedAt($value)
+ * @method static Builder|ImportJob whereErrors($value)
+ * @method static Builder|ImportJob whereExtendedStatus($value)
+ * @method static Builder|ImportJob whereFileType($value)
+ * @method static Builder|ImportJob whereId($value)
+ * @method static Builder|ImportJob whereKey($value)
+ * @method static Builder|ImportJob whereProvider($value)
+ * @method static Builder|ImportJob whereStage($value)
+ * @method static Builder|ImportJob whereStatus($value)
+ * @method static Builder|ImportJob whereTagId($value)
+ * @method static Builder|ImportJob whereTransactions($value)
+ * @method static Builder|ImportJob whereUpdatedAt($value)
+ * @method static Builder|ImportJob whereUserId($value)
+ * @mixin Eloquent
 */
 class ImportJob extends Model
 {
@ -95,9 +99,9 @@ class ImportJob extends Model
     *
     * @param $value
     *
+     * @throws NotFoundHttpException
     * @return mixed
     *
-     * @throws NotFoundHttpException
     */
    public static function routeBinder(string $value): ImportJob
    {
--- a/app/Models/LinkType.php
+++ b/app/Models/LinkType.php
@ -23,9 +23,12 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+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;

 /**
@ -41,24 +44,24 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property int                                                                    $id
 * Class LinkType
 * @property \Illuminate\Support\Carbon|null                                        $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalLink[] $transactionJournalLinks
+ * @property-read Collection|TransactionJournalLink[] $transactionJournalLinks
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LinkType onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType query()
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType newQuery()
+ * @method static Builder|LinkType onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereEditable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereInward($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereOutward($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\LinkType whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LinkType withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LinkType withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereEditable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereInward($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereOutward($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereUpdatedAt($value)
+ * @method static Builder|LinkType withTrashed()
+ * @method static Builder|LinkType withoutTrashed()
+ * @mixin Eloquent
 */
 class LinkType extends Model
 {
@ -84,9 +87,9 @@ class LinkType extends Model
     *
     * @param $value
     *
+     * @throws NotFoundHttpException
     * @return LinkType
     *
-     * @throws NotFoundHttpException
     */
    public static function routeBinder(string $value): LinkType
    {
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@ -49,6 +49,22 @@ class Location extends Model
    /** @var array Fields that can be filled */
    protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level'];

+    /**
+     * Add rules for locations.
+     *
+     * @param array $rules
+     *
+     * @return array
+     */
+    public static function requestRules(array $rules): array
+    {
+        $rules['latitude']   = 'numeric|min:-90|max:90|nullable|required_with:longitude';
+        $rules['longitude']  = 'numeric|min:-180|max:180|nullable|required_with:latitude';
+        $rules['zoom_level'] = 'numeric|min:0|max:80|nullable|required_with:latitude';
+
+        return $rules;
+    }
+
    /**
     * @codeCoverageIgnore
     * Get all of the accounts.
@ -70,20 +86,4 @@ class Location extends Model
        return $this->morphTo();
    }

-    /**
-     * Add rules for locations.
-     *
-     * @param array $rules
-     *
-     * @return array
-     */
-    public static function requestRules(array $rules): array
-    {
-        $rules['latitude']   = 'numeric|min:-90|max:90|nullable|required_with:longitude';
-        $rules['longitude']  = 'numeric|min:-180|max:180|nullable|required_with:latitude';
-        $rules['zoom_level'] = 'numeric|min:0|max:80|nullable|required_with:latitude';
-
-        return $rules;
-    }
-
 }
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@ -23,9 +23,12 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;

 /**
 * Class Note.
@ -38,24 +41,24 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property int                                                  $noteable_id
 * @property \Illuminate\Support\Carbon|null                      $deleted_at
 * @property string                                               $noteable_type
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $noteable
+ * @property-read Collection|Note[] $noteable
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Note newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Note newQuery()
+ * @method static Builder|Note onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Note query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereNoteableId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereNoteableType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereText($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereTitle($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Note whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereNoteableId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereNoteableType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereText($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Note whereUpdatedAt($value)
+ * @method static Builder|Note withTrashed()
+ * @method static Builder|Note withoutTrashed()
+ * @mixin Eloquent
 */
 class Note extends Model
 {
@ -74,6 +77,16 @@ class Note extends Model
    /** @var array Fields that can be filled */
    protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type'];

+    /**
+     * @param string|null $value
+     *
+     * @return string|null
+     */
+    public function getTextAttribute(?string $value): ?string
+    {
+        return null === $value ? null : htmlspecialchars_decode($value, ENT_QUOTES);
+    }
+
    /**
     * @codeCoverageIgnore
     *
@ -93,14 +106,4 @@ class Note extends Model
    {
        $this->attributes['text'] = e($value);
    }
-
-    /**
-     * @param string|null $value
-     *
-     * @return string|null
-     */
-    public function getTextAttribute(?string $value): ?string
-    {
-        return null === $value ? null : htmlspecialchars_decode($value, ENT_QUOTES);
-    }
 }
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@ -23,11 +23,14 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+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;

 /**
@ -47,30 +50,30 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property bool                                  encrypted
 * @property \Illuminate\Support\Carbon|null       $deleted_at
 * @property bool                                  $encrypted
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions
+ * @property-read Collection|Note[]                $notes
+ * @property-read Collection|PiggyBankEvent[]      $piggyBankEvents
+ * @property-read Collection|PiggyBankRepetition[] $piggyBankRepetitions
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank query()
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank newQuery()
+ * @method static Builder|PiggyBank onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereAccountId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereStartdate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereTargetamount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereTargetdate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereAccountId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereActive($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereEncrypted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereOrder($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereStartdate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereTargetamount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereTargetdate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereUpdatedAt($value)
+ * @method static Builder|PiggyBank withTrashed()
+ * @method static Builder|PiggyBank withoutTrashed()
+ * @mixin Eloquent
 */
 class PiggyBank extends Model
 {
@ -102,8 +105,8 @@ class PiggyBank extends Model
     *
     * @param string $value
     *
-     * @return PiggyBank
     * @throws NotFoundHttpException
+     * @return PiggyBank
     */
    public static function routeBinder(string $value): PiggyBank
    {
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@ -23,6 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;

@ -38,17 +40,17 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 * @property string             $amount
 * @property Carbon             created_at
 * @property Carbon             updated_at
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereAmount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent wherePiggyBankId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereTransactionJournalId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @method static Builder|PiggyBankEvent newModelQuery()
+ * @method static Builder|PiggyBankEvent newQuery()
+ * @method static Builder|PiggyBankEvent query()
+ * @method static Builder|PiggyBankEvent whereAmount($value)
+ * @method static Builder|PiggyBankEvent whereCreatedAt($value)
+ * @method static Builder|PiggyBankEvent whereDate($value)
+ * @method static Builder|PiggyBankEvent whereId($value)
+ * @method static Builder|PiggyBankEvent wherePiggyBankId($value)
+ * @method static Builder|PiggyBankEvent whereTransactionJournalId($value)
+ * @method static Builder|PiggyBankEvent whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class PiggyBankEvent extends Model
 {
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -37,20 +38,20 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property int                             $piggy_bank_id
- * @property-read \FireflyIII\Models\PiggyBank $piggyBank
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition onDates(\Carbon\Carbon $start, \Carbon\Carbon $target)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition relevantOnDate(\Carbon\Carbon $date)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition wherePiggyBankId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereStartdate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereTargetdate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @property-read PiggyBank                  $piggyBank
+ * @method static EloquentBuilder|PiggyBankRepetition newModelQuery()
+ * @method static EloquentBuilder|PiggyBankRepetition newQuery()
+ * @method static EloquentBuilder|PiggyBankRepetition onDates(Carbon $start, Carbon $target)
+ * @method static EloquentBuilder|PiggyBankRepetition query()
+ * @method static EloquentBuilder|PiggyBankRepetition relevantOnDate(Carbon $date)
+ * @method static EloquentBuilder|PiggyBankRepetition whereCreatedAt($value)
+ * @method static EloquentBuilder|PiggyBankRepetition whereCurrentamount($value)
+ * @method static EloquentBuilder|PiggyBankRepetition whereId($value)
+ * @method static EloquentBuilder|PiggyBankRepetition wherePiggyBankId($value)
+ * @method static EloquentBuilder|PiggyBankRepetition whereStartdate($value)
+ * @method static EloquentBuilder|PiggyBankRepetition whereTargetdate($value)
+ * @method static EloquentBuilder|PiggyBankRepetition whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class PiggyBankRepetition extends Model
 {
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@ -23,7 +23,9 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 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;
@ -38,16 +40,16 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property int    $id
 * @property User   user
 * @property int    $user_id
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereData($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Preference whereUserId($value)
- * @mixin \Eloquent
+ * @method static Builder|Preference newModelQuery()
+ * @method static Builder|Preference newQuery()
+ * @method static Builder|Preference query()
+ * @method static Builder|Preference whereCreatedAt($value)
+ * @method static Builder|Preference whereData($value)
+ * @method static Builder|Preference whereId($value)
+ * @method static Builder|Preference whereName($value)
+ * @method static Builder|Preference whereUpdatedAt($value)
+ * @method static Builder|Preference whereUserId($value)
+ * @mixin Eloquent
 */
 class Preference extends Model
 {
@ -71,8 +73,8 @@ class Preference extends Model
     *
     * @param string $value
     *
-     * @return Preference
     * @throws NotFoundHttpException
+     * @return Preference
     */
    public static function routeBinder(string $value): Preference
    {
--- a/app/Models/Recurrence.php
+++ b/app/Models/Recurrence.php
@ -24,12 +24,16 @@ declare(strict_types=1);
 namespace FireflyIII\Models;


+use Eloquent;
 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\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
@ -52,37 +56,37 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property int                            $repetitions
 * @property bool                           $active
 * @property bool                           $apply_rules
- * @property \FireflyIII\User                   $user
+ * @property User                           $user
 * @property \Illuminate\Support\Collection $recurrenceRepetitions
 * @property \Illuminate\Support\Collection $recurrenceMeta
 * @property \Illuminate\Support\Collection $recurrenceTransactions
- * @property \FireflyIII\Models\TransactionType $transactionType
- * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
- * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency
+ * @property TransactionType                $transactionType
+ * @property Carbon|null                    $deleted_at
+ * @property-read Collection|Note[]         $notes
+ * @property-read TransactionCurrency       $transactionCurrency
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Recurrence onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence newQuery()
+ * @method static Builder|Recurrence onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereApplyRules($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereFirstDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereLatestDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereRepeatUntil($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereRepetitions($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereTitle($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereTransactionTypeId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Recurrence whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Recurrence withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Recurrence withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereActive($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereApplyRules($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereFirstDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereLatestDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereRepeatUntil($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereRepetitions($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereTransactionTypeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereUserId($value)
+ * @method static Builder|Recurrence withTrashed()
+ * @method static Builder|Recurrence withoutTrashed()
+ * @mixin Eloquent
 */
 class Recurrence extends Model
 {
@ -118,8 +122,8 @@ class Recurrence extends Model
     *
     * @param string $value
     *
-     * @return Recurrence
     * @throws NotFoundHttpException
+     * @return Recurrence
     */
    public static function routeBinder(string $value): Recurrence
    {
--- a/app/Models/RecurrenceMeta.php
+++ b/app/Models/RecurrenceMeta.php
@ -24,9 +24,12 @@ declare(strict_types=1);
 namespace FireflyIII\Models;


+use Eloquent;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Carbon;

 /**
 * Class RecurrenceMeta
@ -34,27 +37,27 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property string                          $name
 * @property string                          $value
 * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
 * @property int                             $recurrence_id
- * @property-read \FireflyIII\Models\Recurrence $recurrence
+ * @property-read Recurrence                 $recurrence
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceMeta onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta query()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta newQuery()
+ * @method static Builder|RecurrenceMeta onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereRecurrenceId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceMeta whereValue($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceMeta withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceMeta withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereRecurrenceId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereValue($value)
+ * @method static Builder|RecurrenceMeta withTrashed()
+ * @method static Builder|RecurrenceMeta withoutTrashed()
+ * @mixin Eloquent
 */
 class RecurrenceMeta extends Model
 {
--- a/app/Models/RecurrenceRepetition.php
+++ b/app/Models/RecurrenceRepetition.php
@ -24,9 +24,12 @@ declare(strict_types=1);
 namespace FireflyIII\Models;


+use Carbon\Carbon;
+use Eloquent;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;

 /**
 * Class RecurrenceRepetition
@ -35,30 +38,30 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property string          $repetition_moment
 * @property int             $repetition_skip
 * @property int             $weekend
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $deleted_at
- * @property \Carbon\Carbon $updated_at
+ * @property Carbon  $created_at
+ * @property Carbon  $deleted_at
+ * @property Carbon  $updated_at
 * @property int             $id
 * @property int             $recurrence_id
- * @property-read \FireflyIII\Models\Recurrence $recurrence
+ * @property-read Recurrence $recurrence
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceRepetition onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition query()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition newQuery()
+ * @method static Builder|RecurrenceRepetition onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRecurrenceId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRepetitionMoment($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRepetitionSkip($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereRepetitionType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceRepetition whereWeekend($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceRepetition withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceRepetition withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRecurrenceId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRepetitionMoment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRepetitionSkip($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereRepetitionType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereWeekend($value)
+ * @method static Builder|RecurrenceRepetition withTrashed()
+ * @method static Builder|RecurrenceRepetition withoutTrashed()
+ * @mixin Eloquent
 */
 class RecurrenceRepetition extends Model
 {
--- a/app/Models/RecurrenceTransaction.php
+++ b/app/Models/RecurrenceTransaction.php
@ -24,10 +24,14 @@ declare(strict_types=1);
 namespace FireflyIII\Models;


+use Eloquent;
 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 Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;

 /**
 * Class RecurrenceTransaction
@ -39,38 +43,38 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property string              $amount
 * @property string              $foreign_amount
 * @property string              $description
- * @property \FireflyIII\Models\TransactionCurrency $transactionCurrency
- * @property \FireflyIII\Models\TransactionCurrency $foreignCurrency
- * @property \FireflyIII\Models\Account             $sourceAccount
- * @property \FireflyIII\Models\Account             $destinationAccount
- * @property \Illuminate\Support\Collection         $recurrenceTransactionMeta
+ * @property TransactionCurrency $transactionCurrency
+ * @property TransactionCurrency $foreignCurrency
+ * @property Account             $sourceAccount
+ * @property Account             $destinationAccount
+ * @property Collection          $recurrenceTransactionMeta
 * @property int                 $id
 * @property Recurrence          $recurrence
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property Carbon|null         $created_at
+ * @property Carbon|null         $updated_at
+ * @property Carbon|null         $deleted_at
 * @property int                 $recurrence_id
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransaction onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction query()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction newQuery()
+ * @method static Builder|RecurrenceTransaction onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereAmount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereDestinationId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereForeignAmount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereForeignCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereRecurrenceId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereSourceId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransaction whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransaction withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransaction withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereAmount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereDestinationId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereForeignAmount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereForeignCurrencyId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereRecurrenceId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereSourceId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereTransactionCurrencyId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereUpdatedAt($value)
+ * @method static Builder|RecurrenceTransaction withTrashed()
+ * @method static Builder|RecurrenceTransaction withoutTrashed()
+ * @mixin Eloquent
 */
 class RecurrenceTransaction extends Model
 {
--- a/app/Models/RecurrenceTransactionMeta.php
+++ b/app/Models/RecurrenceTransactionMeta.php
@ -24,9 +24,12 @@ declare(strict_types=1);
 namespace FireflyIII\Models;


+use Eloquent;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Carbon;

 /**
 * Class RecurrenceTransactionMeta
@ -34,27 +37,27 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property string                          $name
 * @property string                          $value
 * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
 * @property int                             $rt_id
- * @property-read \FireflyIII\Models\RecurrenceTransaction $recurrenceTransaction
+ * @property-read RecurrenceTransaction      $recurrenceTransaction
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransactionMeta onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta query()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta newQuery()
+ * @method static Builder|RecurrenceTransactionMeta onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereRtId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RecurrenceTransactionMeta whereValue($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransactionMeta withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RecurrenceTransactionMeta withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereRtId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereValue($value)
+ * @method static Builder|RecurrenceTransactionMeta withTrashed()
+ * @method static Builder|RecurrenceTransactionMeta withoutTrashed()
+ * @mixin Eloquent
 */
 class RecurrenceTransactionMeta extends Model
 {
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@ -22,30 +22,34 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Eloquent;
 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\Support\Carbon;

 /**
 * Class Role.
 *
 * @property int                                                  $id
 * @property string                                               $name
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property Carbon|null                      $created_at
+ * @property Carbon|null                      $updated_at
 * @property string|null                                          $display_name
 * @property string|null                                          $description
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\User[] $users
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereDisplayName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Role whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @property-read Collection|User[] $users
+ * @method static Builder|Role newModelQuery()
+ * @method static Builder|Role newQuery()
+ * @method static Builder|Role query()
+ * @method static Builder|Role whereCreatedAt($value)
+ * @method static Builder|Role whereDescription($value)
+ * @method static Builder|Role whereDisplayName($value)
+ * @method static Builder|Role whereId($value)
+ * @method static Builder|Role whereName($value)
+ * @method static Builder|Role whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class Role extends Model
 {
--- a/app/Models/Rule.php
+++ b/app/Models/Rule.php
@ -23,11 +23,13 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
 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 Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

@ -51,26 +53,26 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property \Illuminate\Support\Carbon|null $deleted_at
 * @property int                             $user_id
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule newQuery()
+ * @method static Builder|Rule onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereRuleGroupId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereStopProcessing($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereStrict($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereTitle($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Rule whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereActive($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereOrder($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereRuleGroupId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereStopProcessing($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereStrict($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Rule whereUserId($value)
+ * @method static Builder|Rule withTrashed()
+ * @method static Builder|Rule withoutTrashed()
+ * @mixin Eloquent
 */
 class Rule extends Model
 {
@ -100,8 +102,8 @@ class Rule extends Model
     *
     * @param string $value
     *
-     * @return Rule
     * @throws NotFoundHttpException
+     * @return Rule
     */
    public static function routeBinder(string $value): Rule
    {
@ -147,6 +149,7 @@ class Rule extends Model

    /**
     * @param $value
+     *
     * @codeCoverageIgnore
     */
    public function setDescriptionAttribute($value): void
--- a/app/Models/RuleAction.php
+++ b/app/Models/RuleAction.php
@ -23,6 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;

@ -39,19 +41,19 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 * @property bool   $stop_processing
 * @property Rule   $rule
 * @property int    $rule_id
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereActionType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereActionValue($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereRuleId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereStopProcessing($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleAction whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @method static Builder|RuleAction newModelQuery()
+ * @method static Builder|RuleAction newQuery()
+ * @method static Builder|RuleAction query()
+ * @method static Builder|RuleAction whereActionType($value)
+ * @method static Builder|RuleAction whereActionValue($value)
+ * @method static Builder|RuleAction whereActive($value)
+ * @method static Builder|RuleAction whereCreatedAt($value)
+ * @method static Builder|RuleAction whereId($value)
+ * @method static Builder|RuleAction whereOrder($value)
+ * @method static Builder|RuleAction whereRuleId($value)
+ * @method static Builder|RuleAction whereStopProcessing($value)
+ * @method static Builder|RuleAction whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class RuleAction extends Model
 {
--- a/app/Models/RuleGroup.php
+++ b/app/Models/RuleGroup.php
@ -23,11 +23,13 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
 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 Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

@ -47,24 +49,24 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property \Illuminate\Support\Carbon|null $deleted_at
 * @property int                             $user_id
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup query()
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup newQuery()
+ * @method static Builder|RuleGroup onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereTitle($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleGroup whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup withoutTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereActive($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereOrder($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUserId($value)
+ * @method static Builder|RuleGroup withTrashed()
+ * @method static Builder|RuleGroup withoutTrashed()
 * @property bool                            $stop_processing
- * @mixin \Eloquent
+ * @mixin Eloquent
 */
 class RuleGroup extends Model
 {
@ -92,8 +94,8 @@ class RuleGroup extends Model
     *
     * @param string $value
     *
-     * @return RuleGroup
     * @throws NotFoundHttpException
+     * @return RuleGroup
     */
    public static function routeBinder(string $value): RuleGroup
    {
--- a/app/Models/RuleTrigger.php
+++ b/app/Models/RuleTrigger.php
@ -23,6 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;

@ -38,20 +40,20 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 * @property bool      $active
 * @property bool      $stop_processing
 * @property int       $rule_id
- * @property-read \FireflyIII\Models\Rule $rule
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereActive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereRuleId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereStopProcessing($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereTriggerType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereTriggerValue($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\RuleTrigger whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @property-read Rule $rule
+ * @method static Builder|RuleTrigger newModelQuery()
+ * @method static Builder|RuleTrigger newQuery()
+ * @method static Builder|RuleTrigger query()
+ * @method static Builder|RuleTrigger whereActive($value)
+ * @method static Builder|RuleTrigger whereCreatedAt($value)
+ * @method static Builder|RuleTrigger whereId($value)
+ * @method static Builder|RuleTrigger whereOrder($value)
+ * @method static Builder|RuleTrigger whereRuleId($value)
+ * @method static Builder|RuleTrigger whereStopProcessing($value)
+ * @method static Builder|RuleTrigger whereTriggerType($value)
+ * @method static Builder|RuleTrigger whereTriggerValue($value)
+ * @method static Builder|RuleTrigger whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class RuleTrigger extends Model
 {
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@ -23,12 +23,14 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\User;
 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 Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

@ -38,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Collection                      $transactionJournals
 * @property string                          $tag
 * @property int                             $id
- * @property \Carbon\Carbon $date
+ * @property Carbon                          $date
 * @property int                             zoomLevel
 * @property float                           latitude
 * @property float                           longitude
@ -49,28 +51,28 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Carbon                          updated_at
 * @property \Illuminate\Support\Carbon|null $deleted_at
 * @property int                             $user_id
- * @property-read \FireflyIII\User $user
+ * @property-read User                       $user
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag newQuery()
+ * @method static Builder|Tag onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereLatitude($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereLongitude($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereTag($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereTagMode($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereUserId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Tag whereZoomLevel($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereLatitude($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereLongitude($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereTag($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereTagMode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Tag whereZoomLevel($value)
+ * @method static Builder|Tag withTrashed()
+ * @method static Builder|Tag withoutTrashed()
+ * @mixin Eloquent
 */
 class Tag extends Model
 {
@ -96,22 +98,13 @@ class Tag extends Model

    protected $hidden = ['zoomLevel', 'latitude', 'longitude'];

-    /**
-     * @codeCoverageIgnore
-     * @return MorphMany
-     */
-    public function locations(): MorphMany
-    {
-        return $this->morphMany(Location::class, 'locatable');
-    }
-
    /**
     * Route binder. Converts the key in the URL to the specified object (or throw 404).
     *
     * @param string $value
     *
-     * @return Tag
     * @throws NotFoundHttpException
+     * @return Tag
     */
    public static function routeBinder(string $value): Tag
    {
@ -128,6 +121,14 @@ class Tag extends Model
        throw new NotFoundHttpException;
    }

+    /**
+     * @codeCoverageIgnore
+     * @return MorphMany
+     */
+    public function locations(): MorphMany
+    {
+        return $this->morphMany(Location::class, 'locatable');
+    }

    /**
     * @codeCoverageIgnore
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@ -23,7 +23,9 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 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\BelongsToMany;
@ -101,33 +103,33 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property string                          foreign_currency_code
 * @SuppressWarnings (PHPMD.TooManyPublicMethods)
 * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction after(\Carbon\Carbon $date)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction before(\Carbon\Carbon $date)
+ * @property-read Collection|Budget[]        $budgets
+ * @property-read Collection|Category[]      $categories
+ * @method static Builder|Transaction after(Carbon $date)
+ * @method static Builder|Transaction before(Carbon $date)
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction query()
+ * @method static Builder|Transaction newModelQuery()
+ * @method static Builder|Transaction newQuery()
+ * @method static \Illuminate\Database\Query\Builder|Transaction onlyTrashed()
+ * @method static Builder|Transaction query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction transactionTypes($types)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereAccountId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereAmount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereForeignAmount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereForeignCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereIdentifier($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereReconciled($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereTransactionJournalId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction withoutTrashed()
- * @mixin \Eloquent
+ * @method static Builder|Transaction transactionTypes($types)
+ * @method static Builder|Transaction whereAccountId($value)
+ * @method static Builder|Transaction whereAmount($value)
+ * @method static Builder|Transaction whereCreatedAt($value)
+ * @method static Builder|Transaction whereDeletedAt($value)
+ * @method static Builder|Transaction whereDescription($value)
+ * @method static Builder|Transaction whereForeignAmount($value)
+ * @method static Builder|Transaction whereForeignCurrencyId($value)
+ * @method static Builder|Transaction whereId($value)
+ * @method static Builder|Transaction whereIdentifier($value)
+ * @method static Builder|Transaction whereReconciled($value)
+ * @method static Builder|Transaction whereTransactionCurrencyId($value)
+ * @method static Builder|Transaction whereTransactionJournalId($value)
+ * @method static Builder|Transaction whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|Transaction withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|Transaction withoutTrashed()
+ * @mixin Eloquent
 */
 class Transaction extends Model
 {
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@ -23,9 +23,12 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+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;

 /**
@ -40,27 +43,27 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Carbon                               $created_at
 * @property Carbon                               $updated_at
 * @property \Illuminate\Support\Carbon|null      $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetLimits
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read Collection|BudgetLimit[]        $budgetLimits
+ * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property-read Collection|Transaction[]        $transactions
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency query()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency newQuery()
+ * @method static Builder|TransactionCurrency onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereCode($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereDecimalPlaces($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereEnabled($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereSymbol($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereDecimalPlaces($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereEnabled($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereSymbol($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereUpdatedAt($value)
+ * @method static Builder|TransactionCurrency withTrashed()
+ * @method static Builder|TransactionCurrency withoutTrashed()
+ * @mixin Eloquent
 */
 class TransactionCurrency extends Model
 {
@ -87,8 +90,8 @@ class TransactionCurrency extends Model
     *
     * @param string $value
     *
-     * @return TransactionCurrency
     * @throws NotFoundHttpException
+     * @return TransactionCurrency
     */
    public static function routeBinder(string $value): TransactionCurrency
    {
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@ -22,11 +22,15 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Eloquent;
 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 Illuminate\Support\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;


@ -34,28 +38,28 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * Class TransactionGroup.
 *
 * @property int                                                                $id
- * @property \Illuminate\Support\Carbon|null                                                       $created_at
- * @property \Illuminate\Support\Carbon|null                                                       $updated_at
- * @property \Illuminate\Support\Carbon|null                                                       $deleted_at
+ * @property Carbon|null                                    $created_at
+ * @property Carbon|null                                    $updated_at
+ * @property Carbon|null                                    $deleted_at
 * @property int                                                                $user_id
 * @property string|null                                                        $title
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @property-read \FireflyIII\User                                                                 $user
+ * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property-read User                                                          $user
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup query()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup newQuery()
+ * @method static Builder|TransactionGroup onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereTitle($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionGroup whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereUserId($value)
+ * @method static Builder|TransactionGroup withTrashed()
+ * @method static Builder|TransactionGroup withoutTrashed()
+ * @mixin Eloquent
 * @property string                                                                                amount
 * @property string                                                                                foreign_amount
 * @property int                                                                                   transaction_group_id
@ -89,8 +93,8 @@ class TransactionGroup extends Model
     *
     * @param string $value
     *
-     * @return TransactionGroup
     * @throws NotFoundHttpException
+     * @return TransactionGroup
     */
    public static function routeBinder(string $value): TransactionGroup
    {
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
@ -74,40 +75,40 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property \Illuminate\Support\Carbon|null                                        $updated_at
 * @property \Illuminate\Support\Carbon|null                                        $deleted_at
 * @property int                                                                    $tag_count
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[]             $attachments
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[]                   $notes
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[]         $piggyBankEvents
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalLink[] $sourceJournalLinks
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[]               $transactionGroups
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal after(\Carbon\Carbon $date)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal before(\Carbon\Carbon $date)
+ * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[]             $attachments
+ * @property-read \Illuminate\Database\Eloquent\Collection|Note[]                   $notes
+ * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[]         $piggyBankEvents
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournalLink[] $sourceJournalLinks
+ * @property-read \Illuminate\Database\Eloquent\Collection|Category[]               $transactionGroups
+ * @method static EloquentBuilder|TransactionJournal after(Carbon $date)
+ * @method static EloquentBuilder|TransactionJournal before(Carbon $date)
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal query()
+ * @method static EloquentBuilder|TransactionJournal newModelQuery()
+ * @method static EloquentBuilder|TransactionJournal newQuery()
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal onlyTrashed()
+ * @method static EloquentBuilder|TransactionJournal query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal transactionTypes($types)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereBillId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereBookDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereCompleted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereDescription($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereInterestDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereProcessDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereTagCount($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereTransactionTypeId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournal whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withoutTrashed()
- * @mixin \Eloquent
+ * @method static EloquentBuilder|TransactionJournal transactionTypes($types)
+ * @method static EloquentBuilder|TransactionJournal whereBillId($value)
+ * @method static EloquentBuilder|TransactionJournal whereBookDate($value)
+ * @method static EloquentBuilder|TransactionJournal whereCompleted($value)
+ * @method static EloquentBuilder|TransactionJournal whereCreatedAt($value)
+ * @method static EloquentBuilder|TransactionJournal whereDate($value)
+ * @method static EloquentBuilder|TransactionJournal whereDeletedAt($value)
+ * @method static EloquentBuilder|TransactionJournal whereDescription($value)
+ * @method static EloquentBuilder|TransactionJournal whereEncrypted($value)
+ * @method static EloquentBuilder|TransactionJournal whereId($value)
+ * @method static EloquentBuilder|TransactionJournal whereInterestDate($value)
+ * @method static EloquentBuilder|TransactionJournal whereOrder($value)
+ * @method static EloquentBuilder|TransactionJournal whereProcessDate($value)
+ * @method static EloquentBuilder|TransactionJournal whereTagCount($value)
+ * @method static EloquentBuilder|TransactionJournal whereTransactionCurrencyId($value)
+ * @method static EloquentBuilder|TransactionJournal whereTransactionTypeId($value)
+ * @method static EloquentBuilder|TransactionJournal whereUpdatedAt($value)
+ * @method static EloquentBuilder|TransactionJournal whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal withoutTrashed()
+ * @mixin Eloquent
 */
 class TransactionJournal extends Model
 {
@ -142,6 +143,7 @@ class TransactionJournal extends Model

    /**
     * Checks if tables are joined.
+     *
     * @codeCoverageIgnore
     *
     * @param Builder $query
@ -169,9 +171,9 @@ class TransactionJournal extends Model
     *
     * @param string $value
     *
-     * @return TransactionJournal
     * @throws NotFoundHttpException
     * @throws FireflyException
+     * @return TransactionJournal
     */
    public static function routeBinder(string $value): TransactionJournal
    {
@ -225,6 +227,15 @@ class TransactionJournal extends Model
        return $this->belongsToMany(Category::class);
    }

+    /**
+     * @codeCoverageIgnore
+     * @return HasMany
+     */
+    public function destJournalLinks(): HasMany
+    {
+        return $this->hasMany(TransactionJournalLink::class, 'destination_id');
+    }
+
    /**
     * @codeCoverageIgnore
     * @return bool
@ -346,15 +357,6 @@ class TransactionJournal extends Model
        return $this->hasMany(TransactionJournalLink::class, 'source_id');
    }

-    /**
-     * @codeCoverageIgnore
-     * @return HasMany
-     */
-    public function destJournalLinks(): HasMany
-    {
-        return $this->hasMany(TransactionJournalLink::class, 'destination_id');
-    }
-
    /**
     * @codeCoverageIgnore
     * @return BelongsToMany
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@ -23,6 +23,9 @@ declare(strict_types=1);
 namespace FireflyIII\Models;

 use Carbon\Carbon;
+use Eloquent;
+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\MorphMany;
@ -41,18 +44,18 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property int                                                  $link_type_id
 * @property int                                                  $source_id
 * @property int                                                  $destination_id
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink query()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereComment($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereDestinationId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereLinkTypeId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereSourceId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalLink whereUpdatedAt($value)
- * @mixin \Eloquent
+ * @property-read Collection|Note[] $notes
+ * @method static Builder|TransactionJournalLink newModelQuery()
+ * @method static Builder|TransactionJournalLink newQuery()
+ * @method static Builder|TransactionJournalLink query()
+ * @method static Builder|TransactionJournalLink whereComment($value)
+ * @method static Builder|TransactionJournalLink whereCreatedAt($value)
+ * @method static Builder|TransactionJournalLink whereDestinationId($value)
+ * @method static Builder|TransactionJournalLink whereId($value)
+ * @method static Builder|TransactionJournalLink whereLinkTypeId($value)
+ * @method static Builder|TransactionJournalLink whereSourceId($value)
+ * @method static Builder|TransactionJournalLink whereUpdatedAt($value)
+ * @mixin Eloquent
 */
 class TransactionJournalLink extends Model
 {
@ -74,9 +77,9 @@ class TransactionJournalLink extends Model
     *
     * @param string $value
     *
+     * @throws NotFoundHttpException
     * @return mixed
     *
-     * @throws NotFoundHttpException
     */
    public static function routeBinder(string $value): TransactionJournalLink
    {
--- a/app/Models/TransactionJournalMeta.php
+++ b/app/Models/TransactionJournalMeta.php
@ -22,9 +22,12 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Eloquent;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Carbon;

 /**
 * Class TransactionJournalMeta.
@ -34,27 +37,27 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property TransactionJournal              $transactionJournal
 * @property string                          $data
 * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
 * @property string                          $hash
- * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property Carbon|null $deleted_at
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta query()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta newQuery()
+ * @method static Builder|TransactionJournalMeta onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereData($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereHash($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereTransactionJournalId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionJournalMeta whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereData($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereHash($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereTransactionJournalId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereUpdatedAt($value)
+ * @method static Builder|TransactionJournalMeta withTrashed()
+ * @method static Builder|TransactionJournalMeta withoutTrashed()
+ * @mixin Eloquent
 */
 class TransactionJournalMeta extends Model
 {
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@ -22,9 +22,13 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Eloquent;
+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 Illuminate\Support\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
@ -32,24 +36,24 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 *
 * @property string                                                             $type
 * @property int                                                                $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
+ * @property Carbon|null                                    $created_at
+ * @property Carbon|null                                    $updated_at
+ * @property Carbon|null                                    $deleted_at
+ * @property-read Collection|TransactionJournal[] $transactionJournals
 * @method static bool|null forceDelete()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType newQuery()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType onlyTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType query()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType newQuery()
+ * @method static Builder|TransactionType onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType query()
 * @method static bool|null restore()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType withTrashed()
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType withoutTrashed()
- * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereUpdatedAt($value)
+ * @method static Builder|TransactionType withTrashed()
+ * @method static Builder|TransactionType withoutTrashed()
+ * @mixin Eloquent
 */
 class TransactionType extends Model
 {
@ -94,8 +98,8 @@ class TransactionType extends Model
     *
     * @param string $type
     *
-     * @return Model|null|static
     * @throws NotFoundHttpException
+     * @return Model|null|static
     */
    public static function routeBinder(string $type): TransactionType
    {