From 3898c0c0ef68e272b28161e0741e417a16365a61 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 3 Jan 2025 18:16:27 +0100 Subject: [PATCH] Fix phpstan issues. --- app/Api/V1/Controllers/Controller.php | 2 +- app/Api/V2/Controllers/Controller.php | 2 +- app/Console/Commands/System/CreatesDatabase.php | 5 ----- app/Factory/TransactionJournalFactory.php | 2 +- app/Http/Controllers/Controller.php | 2 +- app/Models/Account.php | 1 - app/Models/AccountBalance.php | 1 - app/Models/AccountMeta.php | 1 - app/Models/AccountType.php | 1 - app/Models/Attachment.php | 1 - app/Models/AuditLogEntry.php | 1 - app/Models/AutoBudget.php | 1 - app/Models/AvailableBudget.php | 1 - app/Models/Bill.php | 1 - app/Models/Budget.php | 1 - app/Models/BudgetLimit.php | 1 - app/Models/Category.php | 1 - app/Models/Configuration.php | 1 - app/Models/CurrencyExchangeRate.php | 1 - app/Models/GroupMembership.php | 1 - app/Models/InvitedUser.php | 1 - app/Models/LinkType.php | 1 - app/Models/Location.php | 1 - app/Models/Note.php | 1 - app/Models/ObjectGroup.php | 1 - app/Models/PiggyBank.php | 1 - app/Models/PiggyBankEvent.php | 1 - app/Models/PiggyBankRepetition.php | 1 - app/Models/Preference.php | 1 - app/Models/Recurrence.php | 1 - app/Models/RecurrenceMeta.php | 1 - app/Models/RecurrenceRepetition.php | 1 - app/Models/RecurrenceTransaction.php | 1 - app/Models/RecurrenceTransactionMeta.php | 1 - app/Models/Role.php | 1 - app/Models/Rule.php | 1 - app/Models/RuleAction.php | 1 - app/Models/RuleGroup.php | 1 - app/Models/RuleTrigger.php | 1 - app/Models/Tag.php | 1 - app/Models/Transaction.php | 1 - app/Models/TransactionCurrency.php | 1 - app/Models/TransactionGroup.php | 1 - app/Models/TransactionJournal.php | 5 +++-- app/Models/TransactionJournalLink.php | 1 - app/Models/TransactionJournalMeta.php | 1 - app/Models/TransactionType.php | 1 - app/Models/UserGroup.php | 1 - app/Models/UserRole.php | 1 - app/Models/Webhook.php | 1 - app/Models/WebhookAttempt.php | 1 - app/Models/WebhookMessage.php | 1 - app/Providers/EventServiceProvider.php | 2 +- app/Providers/FireflyServiceProvider.php | 2 +- app/Repositories/Tag/TagRepository.php | 1 - app/Support/Amount.php | 5 ----- app/Support/Calendar/Calculator.php | 3 --- app/Support/Search/OperatorQuerySearch.php | 2 +- app/Support/Twig/TransactionGroupTwig.php | 5 +++-- app/User.php | 3 --- 60 files changed, 13 insertions(+), 74 deletions(-) diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index fcf5b21ef2..0def2dd2af 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -44,7 +44,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class Controller. * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings("PHPMD.CouplingBetweenObjects") * @SuppressWarnings(PHPMD.NumberOfChildren) */ abstract class Controller extends BaseController diff --git a/app/Api/V2/Controllers/Controller.php b/app/Api/V2/Controllers/Controller.php index 88f74a0e6b..2aa1462267 100644 --- a/app/Api/V2/Controllers/Controller.php +++ b/app/Api/V2/Controllers/Controller.php @@ -47,7 +47,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class Controller * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings("PHPMD.CouplingBetweenObjects") * @SuppressWarnings(PHPMD.NumberOfChildren) */ class Controller extends BaseController diff --git a/app/Console/Commands/System/CreatesDatabase.php b/app/Console/Commands/System/CreatesDatabase.php index c102c091e9..3a63396f41 100644 --- a/app/Console/Commands/System/CreatesDatabase.php +++ b/app/Console/Commands/System/CreatesDatabase.php @@ -36,11 +36,6 @@ class CreatesDatabase extends Command protected $signature = 'firefly-iii:create-database'; - /** - * Execute the console command. - * - * @suppressWarnings(PHPMD.MissingImport) - */ public function handle(): int { if ('mysql' !== config('database.default')) { diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index b77d292c11..b2826b0ab1 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -54,7 +54,7 @@ use Illuminate\Support\Facades\Log; /** * Class TransactionJournalFactory * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings("PHPMD.CouplingBetweenObjects") */ class TransactionJournalFactory { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 237b02d55a..265b2239f7 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -38,7 +38,7 @@ use Route; /** * Class Controller. * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings("PHPMD.CouplingBetweenObjects") * @SuppressWarnings(PHPMD.NumberOfChildren) */ abstract class Controller extends BaseController diff --git a/app/Models/Account.php b/app/Models/Account.php index e195b3f130..dfe33af896 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -40,7 +40,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperAccount */ class Account extends Model { diff --git a/app/Models/AccountBalance.php b/app/Models/AccountBalance.php index e6a7a8c55a..2bd418bf67 100644 --- a/app/Models/AccountBalance.php +++ b/app/Models/AccountBalance.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @mixin IdeHelperAccountBalance */ class AccountBalance extends Model { diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 23c2a340d0..782503ae8c 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -28,7 +28,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @mixin IdeHelperAccountMeta */ class AccountMeta extends Model { diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index d5eda3c24e..6056a01671 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -29,7 +29,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * @mixin IdeHelperAccountType */ class AccountType extends Model { diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 4b910caf3a..1da02dff0b 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperAttachment */ class Attachment extends Model { diff --git a/app/Models/AuditLogEntry.php b/app/Models/AuditLogEntry.php index b754804345..b13e76ea83 100644 --- a/app/Models/AuditLogEntry.php +++ b/app/Models/AuditLogEntry.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperAuditLogEntry */ class AuditLogEntry extends Model { diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index 7eea5746e1..84078ca046 100644 --- a/app/Models/AutoBudget.php +++ b/app/Models/AutoBudget.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperAutoBudget */ class AutoBudget extends Model { diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 45e2eb91bb..40341fb1ab 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperAvailableBudget */ class AvailableBudget extends Model { diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 34b934a62a..d71411edc0 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -37,7 +37,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperBill */ class Bill extends Model { diff --git a/app/Models/Budget.php b/app/Models/Budget.php index e131aead22..91387ba106 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -36,7 +36,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperBudget */ class Budget extends Model { diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 375b9e6b6c..b715ab9a98 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperBudgetLimit */ class BudgetLimit extends Model { diff --git a/app/Models/Category.php b/app/Models/Category.php index 11eb99b3ff..b07aa58e96 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperCategory */ class Category extends Model { diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index dafa629ea5..6f00839247 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -28,7 +28,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperConfiguration */ class Configuration extends Model { diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index 1bbcee0e15..0cec202e79 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/app/Models/CurrencyExchangeRate.php @@ -33,7 +33,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperCurrencyExchangeRate */ class CurrencyExchangeRate extends Model { diff --git a/app/Models/GroupMembership.php b/app/Models/GroupMembership.php index 99bd626cab..d29e028f28 100644 --- a/app/Models/GroupMembership.php +++ b/app/Models/GroupMembership.php @@ -32,7 +32,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @mixin IdeHelperGroupMembership */ class GroupMembership extends Model { diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php index c6ffed23e0..97b25074a6 100644 --- a/app/Models/InvitedUser.php +++ b/app/Models/InvitedUser.php @@ -33,7 +33,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperInvitedUser */ class InvitedUser extends Model { diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index ce7a0a9558..edce1a3f27 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -30,7 +30,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperLinkType */ class LinkType extends Model { diff --git a/app/Models/Location.php b/app/Models/Location.php index 31f97af7bb..3f5429ba8f 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphTo; /** - * @mixin IdeHelperLocation */ class Location extends Model { diff --git a/app/Models/Note.php b/app/Models/Note.php index e0ce8a0e2b..94ae3448ce 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -30,7 +30,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperNote */ class Note extends Model { diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index 1eebdba7d8..b011c18ebf 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperObjectGroup */ class ObjectGroup extends Model { diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 3af9eabe22..eb7414ae2a 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperPiggyBank */ class PiggyBank extends Model { diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 5316ecd40b..159cfe0218 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -30,7 +30,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @mixin IdeHelperPiggyBankEvent */ class PiggyBankEvent extends Model { diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 4a0a79c7cb..f1d8e3d5ac 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -32,7 +32,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @mixin IdeHelperPiggyBankRepetition */ class PiggyBankRepetition extends Model { diff --git a/app/Models/Preference.php b/app/Models/Preference.php index f8a43e5283..2f5343ed9a 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperPreference */ class Preference extends Model { diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index fdcdbf01db..6c8d4ea497 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -37,7 +37,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperRecurrence */ class Recurrence extends Model { diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index 82702a4535..d2ea3e8b0c 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperRecurrenceMeta */ class RecurrenceMeta extends Model { diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 0d1453a986..5f657bf4b6 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperRecurrenceRepetition */ class RecurrenceRepetition extends Model { diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index 777413b1eb..85d8d37c45 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -32,7 +32,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperRecurrenceTransaction */ class RecurrenceTransaction extends Model { diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index 7eadb34d98..bc59ee520a 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperRecurrenceTransactionMeta */ class RecurrenceTransactionMeta extends Model { diff --git a/app/Models/Role.php b/app/Models/Role.php index b491a5de91..e5862c51a1 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -29,7 +29,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** - * @mixin IdeHelperRole */ class Role extends Model { diff --git a/app/Models/Rule.php b/app/Models/Rule.php index fe1b0ff434..47e69b8a7e 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperRule */ class Rule extends Model { diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 69732ce0cf..1b250aedfc 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -32,7 +32,6 @@ use Illuminate\Support\Facades\Log; use Symfony\Component\ExpressionLanguage\SyntaxError; /** - * @mixin IdeHelperRuleAction */ class RuleAction extends Model { diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 753fa95341..273e1ef6ab 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperRuleGroup */ class RuleGroup extends Model { diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 3bcfe632a1..a342ccdff1 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -29,7 +29,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @mixin IdeHelperRuleTrigger */ class RuleTrigger extends Model { diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 571e15b4ac..4e17b31627 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperTag */ class Tag extends Model { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 793e0e7652..2f6876ec9d 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperTransaction */ class Transaction extends Model { diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 2b159287dd..f24d9d25ce 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -33,7 +33,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperTransactionCurrency */ class TransactionCurrency extends Model { diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 2e7024da86..fe0294f5c1 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -33,7 +33,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperTransactionGroup */ class TransactionGroup extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index edbd2c4360..371f0f6e44 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -29,7 +29,6 @@ use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait; use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -42,7 +41,9 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperTransactionJournal + * @method EloquentBuilder|static before() + * @method EloquentBuilder|static after() + * @method static EloquentBuilder|static query() */ class TransactionJournal extends Model { diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index 0ddc38d13e..a5f47481b2 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperTransactionJournalLink */ class TransactionJournalLink extends Model { diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 7c89f9f4bd..1ea70797cc 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -30,7 +30,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @mixin IdeHelperTransactionJournalMeta */ class TransactionJournalMeta extends Model { diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index aba5569a54..09b75e6d47 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperTransactionType */ class TransactionType extends Model { diff --git a/app/Models/UserGroup.php b/app/Models/UserGroup.php index 05c7509a2c..1b801b5701 100644 --- a/app/Models/UserGroup.php +++ b/app/Models/UserGroup.php @@ -36,7 +36,6 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperUserGroup */ class UserGroup extends Model { diff --git a/app/Models/UserRole.php b/app/Models/UserRole.php index 84ef0ab124..89b7b1950e 100644 --- a/app/Models/UserRole.php +++ b/app/Models/UserRole.php @@ -29,7 +29,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * @mixin IdeHelperUserRole */ class UserRole extends Model { diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index aa957a1220..a99a0244e3 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -37,7 +37,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperWebhook */ class Webhook extends Model { diff --git a/app/Models/WebhookAttempt.php b/app/Models/WebhookAttempt.php index e2249cd2fb..bfa40bf76d 100644 --- a/app/Models/WebhookAttempt.php +++ b/app/Models/WebhookAttempt.php @@ -33,7 +33,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperWebhookAttempt */ class WebhookAttempt extends Model { diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php index adc5f9de4c..134aa1b4d5 100644 --- a/app/Models/WebhookMessage.php +++ b/app/Models/WebhookMessage.php @@ -33,7 +33,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @mixin IdeHelperWebhookMessage */ class WebhookMessage extends Model { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index d66b6d8ca5..f1e9a91ead 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -105,7 +105,7 @@ use Laravel\Passport\Events\AccessTokenCreated; /** * Class EventServiceProvider. * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings("PHPMD.CouplingBetweenObjects") */ class EventServiceProvider extends ServiceProvider { diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index cbb3fd8d0c..e8283756c2 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -79,7 +79,7 @@ use Symfony\Component\ExpressionLanguage\ExpressionLanguage; /** * Class FireflyServiceProvider. * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings("PHPMD.CouplingBetweenObjects") */ class FireflyServiceProvider extends ServiceProvider { diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index b8107bef13..712dca3eba 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -214,7 +214,6 @@ class TagRepository implements TagRepositoryInterface */ public function searchTags(string $query, int $limit): Collection { - /** @var Collection $tags */ $tags = $this->user->tags()->orderBy('tag', 'ASC'); if ('' !== $query) { $search = sprintf('%%%s%%', $query); diff --git a/app/Support/Amount.php b/app/Support/Amount.php index b02ebc8ecc..754cd37161 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -106,10 +106,7 @@ class Amount /** * This method will properly format the given number, in color or "black and white", * as a currency, given two things: the currency required and the current locale. - * * @throws FireflyException - * - * @SuppressWarnings(PHPMD.MissingImport) */ public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string { @@ -229,8 +226,6 @@ class Amount /** * @throws FireflyException - * - * @SuppressWarnings(PHPMD.MissingImport) */ private function getLocaleInfo(): array { diff --git a/app/Support/Calendar/Calculator.php b/app/Support/Calendar/Calculator.php index c8fc629934..5602a88abd 100644 --- a/app/Support/Calendar/Calculator.php +++ b/app/Support/Calendar/Calculator.php @@ -62,9 +62,6 @@ class Calculator return self::loadIntervalMap()->contains($periodicity); } - /** - * @SuppressWarnings(PHPMD.MissingImport) - */ private static function loadIntervalMap(): \SplObjectStorage { if (null !== self::$intervalMap) { diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index 69e55922b8..c636e68d2f 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -62,7 +62,7 @@ use Illuminate\Support\Collection; /** * Class OperatorQuerySearch * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings("PHPMD.CouplingBetweenObjects") */ class OperatorQuerySearch implements SearchInterface { diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index c43e75bc31..7b3a49488a 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -166,11 +166,12 @@ class TransactionGroupTwig extends AbstractExtension private function normalJournalObjectAmount(TransactionJournal $journal): string { $type = $journal->transactionType->type; + /** @var Transaction $first */ $first = $journal->transactions()->where('amount', '<', 0)->first(); $currency = $journal->transactionCurrency; $amount = $first->amount ?? '0'; $colored = true; - $sourceType = $first->account()->first()->accountType()->first()->type; + $sourceType = $first->account->accountType()->first()->type; $amount = $this->signAmount($amount, $type, $sourceType); @@ -205,7 +206,7 @@ class TransactionGroupTwig extends AbstractExtension $currency = $first->foreignCurrency; $amount = '' === $first->foreign_amount ? '0' : $first->foreign_amount; $colored = true; - $sourceType = $first->account()->first()->accountType()->first()->type; + $sourceType = $first->account->accountType()->first()->type; $amount = $this->signAmount($amount, $type, $sourceType); diff --git a/app/User.php b/app/User.php index ffd1568ba0..233dc87e9c 100644 --- a/app/User.php +++ b/app/User.php @@ -66,9 +66,6 @@ use Laravel\Passport\HasApiTokens; use NotificationChannels\Pushover\PushoverReceiver; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * @mixin IdeHelperUser - */ class User extends Authenticatable { use HasApiTokens;