Code cleanup

app/Models/Account.php

@@ -32,6 +32,12 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\JoinClause;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Log;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\User;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\PiggyBank;
 
 /**
  * Class Account.
@@ -126,7 +132,7 @@ class Account extends Model
      */
     public function accountMeta(): HasMany
     {
-        return $this->hasMany('FireflyIII\Models\AccountMeta');
+        return $this->hasMany(AccountMeta::class);
     }
 
     /**
@@ -135,7 +141,7 @@ class Account extends Model
      */
     public function accountType(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\Models\AccountType');
+        return $this->belongsTo(AccountType::class);
     }
 
     /**
@@ -162,12 +168,14 @@ class Account extends Model
      */
     public function getIbanAttribute($value): string
     {
-        if (null === $value || 0 === strlen((string)$value)) {
+        if (null === $value || '' === (string)$value) {
             return '';
         }
         try {
             $result = Crypt::decrypt($value);
         } catch (DecryptException $e) {
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             throw new FireflyException('Cannot decrypt value "' . $value . '" for account #' . $this->id);
         }
         if (null === $result) {
@@ -246,7 +254,7 @@ class Account extends Model
      */
     public function piggyBanks(): HasMany
     {
-        return $this->hasMany('FireflyIII\Models\PiggyBank');
+        return $this->hasMany(PiggyBank::class);
     }
 
     /**
@@ -330,7 +338,7 @@ class Account extends Model
      */
     public function transactions(): HasMany
     {
-        return $this->hasMany('FireflyIII\Models\Transaction');
+        return $this->hasMany(Transaction::class);
     }
 
     /**
@@ -339,6 +347,6 @@ class Account extends Model
      */
     public function user(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/AccountMeta.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use FireflyIII\Models\Account;
 
 /**
  * Class AccountMeta.
@@ -53,7 +54,7 @@ class AccountMeta extends Model
      */
     public function account(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\Models\Account');
+        return $this->belongsTo(Account::class);
     }
 
     /**

app/Models/AccountType.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use FireflyIII\Models\Account;
 
 /**
  * Class AccountType.
@@ -89,6 +90,6 @@ class AccountType extends Model
      */
     public function accounts(): HasMany
     {
-        return $this->hasMany('FireflyIII\Models\Account');
+        return $this->hasMany(Account::class);
     }
 }

app/Models/Attachment.php

@@ -28,6 +28,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\User;
 
 /**
  * Class Attachment.
@@ -101,7 +102,7 @@ class Attachment extends Model
      */
     public function getDescriptionAttribute($value)
     {
-        if (null === $value || 0 === strlen($value)) {
+        if (null === $value || 0 === \strlen($value)) {
             return null;
         }
 
@@ -117,7 +118,7 @@ class Attachment extends Model
      */
     public function getFilenameAttribute($value)
     {
-        if (null === $value || 0 === strlen($value)) {
+        if (null === $value || 0 === \strlen($value)) {
             return null;
         }
 
@@ -133,7 +134,7 @@ class Attachment extends Model
      */
     public function getMimeAttribute($value)
     {
-        if (null === $value || 0 === strlen($value)) {
+        if (null === $value || 0 === \strlen($value)) {
             return null;
         }
 
@@ -149,7 +150,7 @@ class Attachment extends Model
      */
     public function getTitleAttribute($value)
     {
-        if (null === $value || 0 === strlen($value)) {
+        if (null === $value || 0 === \strlen($value)) {
             return null;
         }
 
@@ -219,6 +220,6 @@ class Attachment extends Model
      */
     public function user(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/AvailableBudget.php

@@ -25,6 +25,8 @@ namespace FireflyIII\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use FireflyIII\User;
+use FireflyIII\Models\TransactionCurrency;
 
 /**
  * Class AvailableBudget.
@@ -54,7 +56,7 @@ class AvailableBudget extends Model
      */
     public function transactionCurrency()
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionCurrency');
+        return $this->belongsTo(TransactionCurrency::class);
     }
 
     /**
@@ -63,6 +65,6 @@ class AvailableBudget extends Model
      */
     public function user(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/Bill.php

@@ -29,6 +29,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Models\Attachment;
 
 /**
  * Class Bill.
@@ -88,7 +89,7 @@ class Bill extends Model
      */
     public function attachments()
     {
-        return $this->morphMany('FireflyIII\Models\Attachment', 'attachable');
+        return $this->morphMany(Attachment::class, 'attachable');
     }
 
     /**

app/Models/Budget.php

@@ -27,6 +27,10 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\User;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\BudgetLimit;
 
 /**
  * Class Budget.
@@ -105,7 +109,7 @@ class Budget extends Model
      */
     public function budgetlimits()
     {
-        return $this->hasMany('FireflyIII\Models\BudgetLimit');
+        return $this->hasMany(BudgetLimit::class);
     }
 
     /**
@@ -145,7 +149,7 @@ class Budget extends Model
      */
     public function transactionJournals()
     {
-        return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'budget_transaction_journal', 'budget_id');
+        return $this->belongsToMany(TransactionJournal::class, 'budget_transaction_journal', 'budget_id');
     }
 
     /**
@@ -154,7 +158,7 @@ class Budget extends Model
      */
     public function transactions()
     {
-        return $this->belongsToMany('FireflyIII\Models\Transaction', 'budget_transaction', 'budget_id');
+        return $this->belongsToMany(Transaction::class, 'budget_transaction', 'budget_id');
     }
 
     /**
@@ -163,6 +167,6 @@ class Budget extends Model
      */
     public function user(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/BudgetLimit.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Models\Budget;
 
 /**
  * Class BudgetLimit.
@@ -71,7 +72,7 @@ class BudgetLimit extends Model
      */
     public function budget()
     {
-        return $this->belongsTo('FireflyIII\Models\Budget');
+        return $this->belongsTo(Budget::class);
     }
 
     /**

app/Models/Category.php

@@ -27,6 +27,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\User;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
 
 /**
  * Class Category.
@@ -135,7 +138,7 @@ class Category extends Model
      */
     public function transactionJournals()
     {
-        return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'category_transaction_journal', 'category_id');
+        return $this->belongsToMany(TransactionJournal::class, 'category_transaction_journal', 'category_id');
     }
 
     /**
@@ -144,7 +147,7 @@ class Category extends Model
      */
     public function transactions()
     {
-        return $this->belongsToMany('FireflyIII\Models\Transaction', 'category_transaction', 'category_id');
+        return $this->belongsToMany(Transaction::class, 'category_transaction', 'category_id');
     }
 
     /**
@@ -153,6 +156,6 @@ class Category extends Model
      */
     public function user(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/ExportJob.php

@@ -77,6 +77,6 @@ class ExportJob extends Model
      */
     public function user()
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/ImportJob.php

@@ -75,7 +75,7 @@ class ImportJob extends Model
             $importJob = auth()->user()->importJobs()->where('key', $key)->first();
             if (null !== $importJob) {
                 // must have valid status:
-                if (!in_array($importJob->status, $importJob->validStatus)) {
+                if (!\in_array($importJob->status, $importJob->validStatus)) {
                     throw new FireflyException(sprintf('ImportJob with key "%s" has invalid status "%s"', $importJob->key, $importJob->status));
                 }
 
@@ -104,7 +104,7 @@ class ImportJob extends Model
      */
     public function change(string $status): void
     {
-        if (in_array($status, $this->validStatus)) {
+        if (\in_array($status, $this->validStatus)) {
             Log::debug(sprintf('Job status set (in model) to "%s"', $status));
             $this->status = $status;
             $this->save();
@@ -125,7 +125,7 @@ class ImportJob extends Model
         if (null === $value) {
             return [];
         }
-        if (0 === strlen($value)) {
+        if (0 === \strlen($value)) {
             return [];
         }
 
@@ -139,7 +139,7 @@ class ImportJob extends Model
      */
     public function getExtendedStatusAttribute($value)
     {
-        if (0 === strlen((string)$value)) {
+        if (0 === \strlen((string)$value)) {
             return [];
         }
 
@@ -171,7 +171,7 @@ class ImportJob extends Model
      */
     public function setStatusAttribute(string $value)
     {
-        if (in_array($value, $this->validStatus)) {
+        if (\in_array($value, $this->validStatus)) {
             $this->attributes['status'] = $value;
         }
     }
@@ -189,7 +189,7 @@ class ImportJob extends Model
         $encryptedContent = $disk->get($fileName);
         $content          = Crypt::decrypt($encryptedContent);
         $content          = trim($content);
-        Log::debug(sprintf('Content size is %d bytes.', strlen($content)));
+        Log::debug(sprintf('Content size is %d bytes.', \strlen($content)));
 
         return $content;
     }
@@ -200,6 +200,6 @@ class ImportJob extends Model
      */
     public function user()
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/PiggyBank.php

@@ -29,6 +29,10 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Steam;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\Note;
+use FireflyIII\Models\Account;
 
 /**
  * Class PiggyBank.
@@ -86,7 +90,7 @@ class PiggyBank extends Model
      */
     public function account(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\Models\Account');
+        return $this->belongsTo(Account::class);
     }
 
     /**
@@ -179,7 +183,7 @@ class PiggyBank extends Model
      */
     public function notes()
     {
-        return $this->morphMany('FireflyIII\Models\Note', 'noteable');
+        return $this->morphMany(Note::class, 'noteable');
     }
 
     /**
@@ -188,7 +192,7 @@ class PiggyBank extends Model
      */
     public function piggyBankEvents()
     {
-        return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
+        return $this->hasMany(PiggyBankEvent::class);
     }
 
     /**
@@ -197,7 +201,7 @@ class PiggyBank extends Model
      */
     public function piggyBankRepetitions()
     {
-        return $this->hasMany('FireflyIII\Models\PiggyBankRepetition');
+        return $this->hasMany(PiggyBankRepetition::class);
     }
 
     /**

app/Models/PiggyBankEvent.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\PiggyBank;
 
 /**
  * Class PiggyBankEvent.
@@ -59,7 +61,7 @@ class PiggyBankEvent extends Model
      */
     public function piggyBank()
     {
-        return $this->belongsTo('FireflyIII\Models\PiggyBank');
+        return $this->belongsTo(PiggyBank::class);
     }
 
     /**
@@ -78,6 +80,6 @@ class PiggyBankEvent extends Model
      */
     public function transactionJournal()
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionJournal');
+        return $this->belongsTo(TransactionJournal::class);
     }
 }

app/Models/PiggyBankRepetition.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Models;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
+use FireflyIII\Models\PiggyBank;
 
 /**
  * Class PiggyBankRepetition.
@@ -55,7 +56,7 @@ class PiggyBankRepetition extends Model
      */
     public function piggyBank()
     {
-        return $this->belongsTo('FireflyIII\Models\PiggyBank');
+        return $this->belongsTo(PiggyBank::class);
     }
 
     /**

app/Models/Role.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use FireflyIII\User;
 
 /**
  * Class Role.
@@ -52,6 +53,6 @@ class Role extends Model
      */
     public function users(): BelongsToMany
     {
-        return $this->belongsToMany('FireflyIII\User');
+        return $this->belongsToMany(User::class);
     }
 }

app/Models/Rule.php

@@ -25,6 +25,10 @@ namespace FireflyIII\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\User;
+use FireflyIII\Models\RuleTrigger;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Models\RuleAction;
 
 /**
  * Class Rule.
@@ -75,7 +79,7 @@ class Rule extends Model
      */
     public function ruleActions()
     {
-        return $this->hasMany('FireflyIII\Models\RuleAction');
+        return $this->hasMany(RuleAction::class);
     }
 
     /**
@@ -84,7 +88,7 @@ class Rule extends Model
      */
     public function ruleGroup()
     {
-        return $this->belongsTo('FireflyIII\Models\RuleGroup');
+        return $this->belongsTo(RuleGroup::class);
     }
 
     /**
@@ -93,7 +97,7 @@ class Rule extends Model
      */
     public function ruleTriggers()
     {
-        return $this->hasMany('FireflyIII\Models\RuleTrigger');
+        return $this->hasMany(RuleTrigger::class);
     }
 
     /**
@@ -110,6 +114,6 @@ class Rule extends Model
      */
     public function user()
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/RuleAction.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use FireflyIII\Models\Rule;
 
 /**
  * Class RuleAction.
@@ -52,6 +53,6 @@ class RuleAction extends Model
      */
     public function rule()
     {
-        return $this->belongsTo('FireflyIII\Models\Rule');
+        return $this->belongsTo(Rule::class);
     }
 }

app/Models/RuleGroup.php

@@ -25,6 +25,8 @@ namespace FireflyIII\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\User;
+use FireflyIII\Models\Rule;
 
 /**
  * Class RuleGroup.
@@ -75,7 +77,7 @@ class RuleGroup extends Model
      */
     public function rules()
     {
-        return $this->hasMany('FireflyIII\Models\Rule');
+        return $this->hasMany(Rule::class);
     }
 
     /**
@@ -84,6 +86,6 @@ class RuleGroup extends Model
      */
     public function user()
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/RuleTrigger.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use FireflyIII\Models\Rule;
 
 /**
  * Class RuleTrigger.
@@ -52,6 +53,6 @@ class RuleTrigger extends Model
      */
     public function rule()
     {
-        return $this->belongsTo('FireflyIII\Models\Rule');
+        return $this->belongsTo(Rule::class);
     }
 }

app/Models/Tag.php

@@ -26,6 +26,8 @@ use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\User;
+use FireflyIII\Models\TransactionJournal;
 
 /**
  * Class Tag.
@@ -166,7 +168,7 @@ class Tag extends Model
      */
     public function transactionJournals()
     {
-        return $this->belongsToMany('FireflyIII\Models\TransactionJournal');
+        return $this->belongsToMany(TransactionJournal::class);
     }
 
     /**
@@ -175,6 +177,6 @@ class Tag extends Model
      */
     public function user()
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/Transaction.php

@@ -27,6 +27,11 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Account;
 
 /**
  * Class Transaction.
@@ -149,7 +154,7 @@ class Transaction extends Model
      */
     public function account()
     {
-        return $this->belongsTo('FireflyIII\Models\Account');
+        return $this->belongsTo(Account::class);
     }
 
     /**
@@ -158,7 +163,7 @@ class Transaction extends Model
      */
     public function budgets()
     {
-        return $this->belongsToMany('FireflyIII\Models\Budget');
+        return $this->belongsToMany(Budget::class);
     }
 
     /**
@@ -167,7 +172,7 @@ class Transaction extends Model
      */
     public function categories()
     {
-        return $this->belongsToMany('FireflyIII\Models\Category');
+        return $this->belongsToMany(Category::class);
     }
 
     /**
@@ -176,7 +181,7 @@ class Transaction extends Model
      */
     public function foreignCurrency()
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionCurrency', 'foreign_currency_id');
+        return $this->belongsTo(TransactionCurrency::class, 'foreign_currency_id');
     }
 
     /**
@@ -253,7 +258,7 @@ class Transaction extends Model
      */
     public function transactionCurrency()
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionCurrency');
+        return $this->belongsTo(TransactionCurrency::class);
     }
 
     /**
@@ -262,6 +267,6 @@ class Transaction extends Model
      */
     public function transactionJournal()
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionJournal');
+        return $this->belongsTo(TransactionJournal::class);
     }
 }

app/Models/TransactionCurrency.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Models\TransactionJournal;
 
 /**
  * Class TransactionCurrency.
@@ -77,6 +78,6 @@ class TransactionCurrency extends Model
      */
     public function transactionJournals()
     {
-        return $this->hasMany('FireflyIII\Models\TransactionJournal');
+        return $this->hasMany(TransactionJournal::class);
     }
 }

app/Models/TransactionJournal.php

@@ -35,6 +35,17 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Log;
 use Preferences;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Models\TransactionJournalMeta;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\Note;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Attachment;
 
 /**
  * Class TransactionJournal.
@@ -99,7 +110,7 @@ class TransactionJournal extends Model
      */
     public function attachments()
     {
-        return $this->morphMany('FireflyIII\Models\Attachment', 'attachable');
+        return $this->morphMany(Attachment::class, 'attachable');
     }
 
     /**
@@ -108,7 +119,7 @@ class TransactionJournal extends Model
      */
     public function bill()
     {
-        return $this->belongsTo('FireflyIII\Models\Bill');
+        return $this->belongsTo(Bill::class);
     }
 
     /**
@@ -117,7 +128,7 @@ class TransactionJournal extends Model
      */
     public function budgets(): BelongsToMany
     {
-        return $this->belongsToMany('FireflyIII\Models\Budget');
+        return $this->belongsToMany(Budget::class);
     }
 
     /**
@@ -126,7 +137,7 @@ class TransactionJournal extends Model
      */
     public function categories(): BelongsToMany
     {
-        return $this->belongsToMany('FireflyIII\Models\Category');
+        return $this->belongsToMany(Category::class);
     }
 
     /**
@@ -279,7 +290,7 @@ class TransactionJournal extends Model
      */
     public function notes()
     {
-        return $this->morphMany('FireflyIII\Models\Note', 'noteable');
+        return $this->morphMany(Note::class, 'noteable');
     }
 
     /**
@@ -288,7 +299,7 @@ class TransactionJournal extends Model
      */
     public function piggyBankEvents(): HasMany
     {
-        return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
+        return $this->hasMany(PiggyBankEvent::class);
     }
 
     /**
@@ -328,7 +339,7 @@ class TransactionJournal extends Model
         if (!self::isJoined($query, 'transaction_types')) {
             $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
         }
-        if (count($types) > 0) {
+        if (\count($types) > 0) {
             $query->whereIn('transaction_types.type', $types);
         }
     }
@@ -362,7 +373,7 @@ class TransactionJournal extends Model
 
             return new TransactionJournalMeta();
         }
-        if (is_string($value) && 0 === strlen($value)) {
+        if (\is_string($value) && 0 === \strlen($value)) {
             $this->deleteMeta($name);
 
             return new TransactionJournalMeta();
@@ -401,7 +412,7 @@ class TransactionJournal extends Model
      */
     public function tags()
     {
-        return $this->belongsToMany('FireflyIII\Models\Tag');
+        return $this->belongsToMany(Tag::class);
     }
 
     /**
@@ -410,7 +421,7 @@ class TransactionJournal extends Model
      */
     public function transactionCurrency()
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionCurrency');
+        return $this->belongsTo(TransactionCurrency::class);
     }
 
     /**
@@ -419,7 +430,7 @@ class TransactionJournal extends Model
      */
     public function transactionJournalMeta(): HasMany
     {
-        return $this->hasMany('FireflyIII\Models\TransactionJournalMeta');
+        return $this->hasMany(TransactionJournalMeta::class);
     }
 
     /**
@@ -428,7 +439,7 @@ class TransactionJournal extends Model
      */
     public function transactionType()
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionType');
+        return $this->belongsTo(TransactionType::class);
     }
 
     /**
@@ -437,7 +448,7 @@ class TransactionJournal extends Model
      */
     public function transactions(): HasMany
     {
-        return $this->hasMany('FireflyIII\Models\Transaction');
+        return $this->hasMany(Transaction::class);
     }
 
     /**
@@ -446,6 +457,6 @@ class TransactionJournal extends Model
      */
     public function user()
     {
-        return $this->belongsTo('FireflyIII\User');
+        return $this->belongsTo(User::class);
     }
 }

app/Models/TransactionJournalLink.php

@@ -113,7 +113,7 @@ class TransactionJournalLink extends Model
      */
     public function setCommentAttribute($value): void
     {
-        if (null !== $value && strlen($value) > 0) {
+        if (null !== $value && \strlen($value) > 0) {
             $this->attributes['comment'] = Crypt::encrypt($value);
 
             return;

app/Models/TransactionJournalMeta.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use FireflyIII\Models\TransactionJournal;
 
 /**
  * Class TransactionJournalMeta.
@@ -78,6 +79,6 @@ class TransactionJournalMeta extends Model
      */
     public function transactionJournal(): BelongsTo
     {
-        return $this->belongsTo('FireflyIII\Models\TransactionJournal');
+        return $this->belongsTo(TransactionJournal::class);
     }
 }

app/Models/TransactionType.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Models\TransactionJournal;
 
 /**
  * Class TransactionType.
@@ -127,6 +128,6 @@ class TransactionType extends Model
      */
     public function transactionJournals()
     {
-        return $this->hasMany('FireflyIII\Models\TransactionJournal');
+        return $this->hasMany(TransactionJournal::class);
     }
 }