From 4fa5f4e5a3a234e445148701d29a57cb6124f908 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 21:32:58 +0200 Subject: [PATCH] Fix some issues that triggered in scrutinizer. --- app/Helpers/Attachments/AttachmentHelper.php | 2 +- app/Models/Category.php | 1 + app/Repositories/ImportJob/ImportJobRepository.php | 4 ++-- app/Repositories/Rule/RuleRepository.php | 6 +++--- app/Rules/BelongsUser.php | 2 +- app/Support/FireflyConfig.php | 4 ++-- app/Support/Preferences.php | 2 +- app/TransactionRules/Triggers/AmountExactly.php | 4 ++-- app/TransactionRules/Triggers/AmountLess.php | 4 ++-- app/TransactionRules/Triggers/AmountMore.php | 4 ++-- app/TransactionRules/Triggers/BudgetIs.php | 4 ++-- app/TransactionRules/Triggers/CategoryIs.php | 4 ++-- app/TransactionRules/Triggers/CurrencyIs.php | 4 ++-- app/TransactionRules/Triggers/DescriptionContains.php | 4 ++-- app/TransactionRules/Triggers/DescriptionEnds.php | 4 ++-- app/TransactionRules/Triggers/DescriptionIs.php | 4 ++-- app/TransactionRules/Triggers/DescriptionStarts.php | 4 ++-- app/TransactionRules/Triggers/FromAccountContains.php | 4 ++-- app/TransactionRules/Triggers/FromAccountEnds.php | 4 ++-- app/TransactionRules/Triggers/FromAccountIs.php | 4 ++-- app/TransactionRules/Triggers/FromAccountStarts.php | 4 ++-- app/TransactionRules/Triggers/HasAnyBudget.php | 4 ++-- app/TransactionRules/Triggers/HasAnyCategory.php | 4 ++-- app/TransactionRules/Triggers/HasAnyTag.php | 4 ++-- app/TransactionRules/Triggers/HasAttachment.php | 4 ++-- app/TransactionRules/Triggers/HasNoBudget.php | 4 ++-- app/TransactionRules/Triggers/HasNoCategory.php | 4 ++-- app/TransactionRules/Triggers/HasNoTag.php | 4 ++-- app/TransactionRules/Triggers/NotesAny.php | 4 ++-- app/TransactionRules/Triggers/NotesAre.php | 4 ++-- app/TransactionRules/Triggers/NotesContain.php | 4 ++-- app/TransactionRules/Triggers/NotesEmpty.php | 4 ++-- app/TransactionRules/Triggers/NotesEnd.php | 4 ++-- app/TransactionRules/Triggers/NotesStart.php | 4 ++-- app/TransactionRules/Triggers/TagIs.php | 4 ++-- app/TransactionRules/Triggers/ToAccountContains.php | 4 ++-- app/TransactionRules/Triggers/ToAccountEnds.php | 4 ++-- app/TransactionRules/Triggers/ToAccountIs.php | 4 ++-- app/TransactionRules/Triggers/ToAccountStarts.php | 4 ++-- app/TransactionRules/Triggers/TransactionType.php | 4 ++-- app/TransactionRules/Triggers/TriggerInterface.php | 4 ++-- app/TransactionRules/Triggers/UserAction.php | 4 ++-- 42 files changed, 81 insertions(+), 80 deletions(-) diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index 12c61e22b5..3b607834fb 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -249,7 +249,7 @@ class AttachmentHelper implements AttachmentHelperInterface $attachment->filename = $file->getClientOriginalName(); $attachment->mime = $file->getMimeType(); $attachment->size = $file->getSize(); - $attachment->uploaded = 0; + $attachment->uploaded = false; $attachment->save(); Log::debug('Created attachment:', $attachment->toArray()); diff --git a/app/Models/Category.php b/app/Models/Category.php index b8ea97894d..359dd039e3 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Models; +use Carbon\Carbon; use Crypt; use FireflyIII\User; use Illuminate\Database\Eloquent\Model; diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index ca5f59ff8b..a722871f60 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -300,7 +300,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface $attachment->filename = $name; $attachment->mime = 'plain/txt'; $attachment->size = \strlen($content); - $attachment->uploaded = 0; + $attachment->uploaded = false; $attachment->save(); $encrypted = Crypt::encrypt($content); @@ -351,7 +351,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface $attachment->filename = $name; $attachment->mime = $file->getMimeType(); $attachment->size = $file->getSize(); - $attachment->uploaded = 0; + $attachment->uploaded = false; $attachment->save(); $fileObject = $file->openFile('r'); $fileObject->rewind(); diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 02f79607aa..c143a2e2ce 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -288,7 +288,7 @@ class RuleRepository implements RuleRepositoryInterface $rule->rule_group_id = $data['rule_group_id']; $rule->order = ($order + 1); - $rule->active = 1; + $rule->active = true; $rule->strict = $data['strict'] ?? false; $rule->stop_processing = 1 === (int)$data['stop-processing']; $rule->title = $data['title']; @@ -316,7 +316,7 @@ class RuleRepository implements RuleRepositoryInterface $ruleAction = new RuleAction; $ruleAction->rule()->associate($rule); $ruleAction->order = $values['order']; - $ruleAction->active = 1; + $ruleAction->active = true; $ruleAction->stop_processing = $values['stopProcessing']; $ruleAction->action_type = $values['action']; $ruleAction->action_value = $values['value'] ?? ''; @@ -336,7 +336,7 @@ class RuleRepository implements RuleRepositoryInterface $ruleTrigger = new RuleTrigger; $ruleTrigger->rule()->associate($rule); $ruleTrigger->order = $values['order']; - $ruleTrigger->active = 1; + $ruleTrigger->active = true; $ruleTrigger->stop_processing = $values['stopProcessing']; $ruleTrigger->trigger_type = $values['action']; $ruleTrigger->trigger_value = $values['value'] ?? ''; diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index bc1ee68f3e..b873b18fe2 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -52,7 +52,7 @@ class BelongsUser implements Rule * * @return string */ - public function message() + public function message(): string { return (string)trans('validation.belongs_user'); } diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index f3a1f688b9..17a0fe41a5 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -51,7 +51,7 @@ class FireflyConfig /** * @param string $name - * @param null $default + * @param mixed $default * * @return \FireflyIII\Models\Configuration|null */ @@ -79,7 +79,7 @@ class FireflyConfig /** * @param string $name - * @param null $default + * @param mixed $default * * @return \FireflyIII\Models\Configuration|null */ diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index e57cb53b3f..69a4a41e8a 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -80,7 +80,7 @@ class Preferences /** * @param string $name - * @param null $default + * @param mixed $default * * @return \FireflyIII\Models\Preference|null */ diff --git a/app/TransactionRules/Triggers/AmountExactly.php b/app/TransactionRules/Triggers/AmountExactly.php index 678cfd5f23..5ecba6a6b4 100644 --- a/app/TransactionRules/Triggers/AmountExactly.php +++ b/app/TransactionRules/Triggers/AmountExactly.php @@ -43,11 +43,11 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/AmountLess.php b/app/TransactionRules/Triggers/AmountLess.php index 13325ef037..bad0c9708e 100644 --- a/app/TransactionRules/Triggers/AmountLess.php +++ b/app/TransactionRules/Triggers/AmountLess.php @@ -43,11 +43,11 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/AmountMore.php b/app/TransactionRules/Triggers/AmountMore.php index 3914513bd8..c57eaf9621 100644 --- a/app/TransactionRules/Triggers/AmountMore.php +++ b/app/TransactionRules/Triggers/AmountMore.php @@ -43,11 +43,11 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = 0 === bccomp('0', (string)$value); diff --git a/app/TransactionRules/Triggers/BudgetIs.php b/app/TransactionRules/Triggers/BudgetIs.php index bdf2fc2533..bc48a87c58 100644 --- a/app/TransactionRules/Triggers/BudgetIs.php +++ b/app/TransactionRules/Triggers/BudgetIs.php @@ -43,11 +43,11 @@ final class BudgetIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/CategoryIs.php b/app/TransactionRules/Triggers/CategoryIs.php index 14fb50a6d9..ddce55d936 100644 --- a/app/TransactionRules/Triggers/CategoryIs.php +++ b/app/TransactionRules/Triggers/CategoryIs.php @@ -43,11 +43,11 @@ final class CategoryIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/CurrencyIs.php b/app/TransactionRules/Triggers/CurrencyIs.php index 120a938ea0..d936a47a5e 100644 --- a/app/TransactionRules/Triggers/CurrencyIs.php +++ b/app/TransactionRules/Triggers/CurrencyIs.php @@ -44,11 +44,11 @@ final class CurrencyIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/DescriptionContains.php b/app/TransactionRules/Triggers/DescriptionContains.php index 7a58121418..a991101a4e 100644 --- a/app/TransactionRules/Triggers/DescriptionContains.php +++ b/app/TransactionRules/Triggers/DescriptionContains.php @@ -42,11 +42,11 @@ final class DescriptionContains extends AbstractTrigger implements TriggerInterf * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/DescriptionEnds.php b/app/TransactionRules/Triggers/DescriptionEnds.php index f55f9c095a..71bb7e5f2f 100644 --- a/app/TransactionRules/Triggers/DescriptionEnds.php +++ b/app/TransactionRules/Triggers/DescriptionEnds.php @@ -42,11 +42,11 @@ final class DescriptionEnds extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/DescriptionIs.php b/app/TransactionRules/Triggers/DescriptionIs.php index 3f7e7c481e..49876e0b73 100644 --- a/app/TransactionRules/Triggers/DescriptionIs.php +++ b/app/TransactionRules/Triggers/DescriptionIs.php @@ -42,11 +42,11 @@ final class DescriptionIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/DescriptionStarts.php b/app/TransactionRules/Triggers/DescriptionStarts.php index f8decc9ef0..250f0ae3e3 100644 --- a/app/TransactionRules/Triggers/DescriptionStarts.php +++ b/app/TransactionRules/Triggers/DescriptionStarts.php @@ -42,11 +42,11 @@ final class DescriptionStarts extends AbstractTrigger implements TriggerInterfac * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountContains.php b/app/TransactionRules/Triggers/FromAccountContains.php index 2434fdd217..a551afddc2 100644 --- a/app/TransactionRules/Triggers/FromAccountContains.php +++ b/app/TransactionRules/Triggers/FromAccountContains.php @@ -43,11 +43,11 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountEnds.php b/app/TransactionRules/Triggers/FromAccountEnds.php index 8b30c32c3d..a64b0ca254 100644 --- a/app/TransactionRules/Triggers/FromAccountEnds.php +++ b/app/TransactionRules/Triggers/FromAccountEnds.php @@ -43,11 +43,11 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountIs.php b/app/TransactionRules/Triggers/FromAccountIs.php index 100ba5970e..9354c832ae 100644 --- a/app/TransactionRules/Triggers/FromAccountIs.php +++ b/app/TransactionRules/Triggers/FromAccountIs.php @@ -43,11 +43,11 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountStarts.php b/app/TransactionRules/Triggers/FromAccountStarts.php index 23987e3210..99a8ae1c49 100644 --- a/app/TransactionRules/Triggers/FromAccountStarts.php +++ b/app/TransactionRules/Triggers/FromAccountStarts.php @@ -43,11 +43,11 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/HasAnyBudget.php b/app/TransactionRules/Triggers/HasAnyBudget.php index 224c4b9212..89b451412d 100644 --- a/app/TransactionRules/Triggers/HasAnyBudget.php +++ b/app/TransactionRules/Triggers/HasAnyBudget.php @@ -43,11 +43,11 @@ final class HasAnyBudget extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasAnyCategory.php b/app/TransactionRules/Triggers/HasAnyCategory.php index 2f356f2eaa..d27f34fb8c 100644 --- a/app/TransactionRules/Triggers/HasAnyCategory.php +++ b/app/TransactionRules/Triggers/HasAnyCategory.php @@ -43,11 +43,11 @@ final class HasAnyCategory extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasAnyTag.php b/app/TransactionRules/Triggers/HasAnyTag.php index 5e1795bb20..a58ca924a3 100644 --- a/app/TransactionRules/Triggers/HasAnyTag.php +++ b/app/TransactionRules/Triggers/HasAnyTag.php @@ -42,11 +42,11 @@ final class HasAnyTag extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasAttachment.php b/app/TransactionRules/Triggers/HasAttachment.php index 0dba22509b..ec6601b0d1 100644 --- a/app/TransactionRules/Triggers/HasAttachment.php +++ b/app/TransactionRules/Triggers/HasAttachment.php @@ -42,11 +42,11 @@ class HasAttachment extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { $value = (int)$value; diff --git a/app/TransactionRules/Triggers/HasNoBudget.php b/app/TransactionRules/Triggers/HasNoBudget.php index fa4bae0539..a313ba75ce 100644 --- a/app/TransactionRules/Triggers/HasNoBudget.php +++ b/app/TransactionRules/Triggers/HasNoBudget.php @@ -43,11 +43,11 @@ final class HasNoBudget extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasNoCategory.php b/app/TransactionRules/Triggers/HasNoCategory.php index b0ebe78d6a..d986832e65 100644 --- a/app/TransactionRules/Triggers/HasNoCategory.php +++ b/app/TransactionRules/Triggers/HasNoCategory.php @@ -43,11 +43,11 @@ final class HasNoCategory extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasNoTag.php b/app/TransactionRules/Triggers/HasNoTag.php index 98e435e865..9077ef1ad7 100644 --- a/app/TransactionRules/Triggers/HasNoTag.php +++ b/app/TransactionRules/Triggers/HasNoTag.php @@ -42,11 +42,11 @@ final class HasNoTag extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/NotesAny.php b/app/TransactionRules/Triggers/NotesAny.php index 6be0eab197..b30c93a564 100644 --- a/app/TransactionRules/Triggers/NotesAny.php +++ b/app/TransactionRules/Triggers/NotesAny.php @@ -43,11 +43,11 @@ final class NotesAny extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/NotesAre.php b/app/TransactionRules/Triggers/NotesAre.php index 00275edecd..d08ff753bd 100644 --- a/app/TransactionRules/Triggers/NotesAre.php +++ b/app/TransactionRules/Triggers/NotesAre.php @@ -43,11 +43,11 @@ final class NotesAre extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/NotesContain.php b/app/TransactionRules/Triggers/NotesContain.php index 23c74cc74d..54901597b3 100644 --- a/app/TransactionRules/Triggers/NotesContain.php +++ b/app/TransactionRules/Triggers/NotesContain.php @@ -43,11 +43,11 @@ final class NotesContain extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/NotesEmpty.php b/app/TransactionRules/Triggers/NotesEmpty.php index dc548d40e5..bd42f18ab6 100644 --- a/app/TransactionRules/Triggers/NotesEmpty.php +++ b/app/TransactionRules/Triggers/NotesEmpty.php @@ -43,11 +43,11 @@ final class NotesEmpty extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/NotesEnd.php b/app/TransactionRules/Triggers/NotesEnd.php index aa3f264c13..3eb265ab5c 100644 --- a/app/TransactionRules/Triggers/NotesEnd.php +++ b/app/TransactionRules/Triggers/NotesEnd.php @@ -43,11 +43,11 @@ final class NotesEnd extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/NotesStart.php b/app/TransactionRules/Triggers/NotesStart.php index 0346f6136a..4bef3f85e2 100644 --- a/app/TransactionRules/Triggers/NotesStart.php +++ b/app/TransactionRules/Triggers/NotesStart.php @@ -43,11 +43,11 @@ final class NotesStart extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/TagIs.php b/app/TransactionRules/Triggers/TagIs.php index 687f14cf5b..48bfa3841d 100644 --- a/app/TransactionRules/Triggers/TagIs.php +++ b/app/TransactionRules/Triggers/TagIs.php @@ -43,11 +43,11 @@ final class TagIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/ToAccountContains.php b/app/TransactionRules/Triggers/ToAccountContains.php index b0c78f7322..a4079522e5 100644 --- a/app/TransactionRules/Triggers/ToAccountContains.php +++ b/app/TransactionRules/Triggers/ToAccountContains.php @@ -43,11 +43,11 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/ToAccountEnds.php b/app/TransactionRules/Triggers/ToAccountEnds.php index d23cbee4e7..1ca88c56dc 100644 --- a/app/TransactionRules/Triggers/ToAccountEnds.php +++ b/app/TransactionRules/Triggers/ToAccountEnds.php @@ -43,11 +43,11 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/ToAccountIs.php b/app/TransactionRules/Triggers/ToAccountIs.php index 5754527ef7..658b96adf6 100644 --- a/app/TransactionRules/Triggers/ToAccountIs.php +++ b/app/TransactionRules/Triggers/ToAccountIs.php @@ -43,11 +43,11 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/ToAccountStarts.php b/app/TransactionRules/Triggers/ToAccountStarts.php index ab21f63b66..8583235369 100644 --- a/app/TransactionRules/Triggers/ToAccountStarts.php +++ b/app/TransactionRules/Triggers/ToAccountStarts.php @@ -43,11 +43,11 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/TransactionType.php b/app/TransactionRules/Triggers/TransactionType.php index 7d3d033197..8aa6699155 100644 --- a/app/TransactionRules/Triggers/TransactionType.php +++ b/app/TransactionRules/Triggers/TransactionType.php @@ -42,11 +42,11 @@ final class TransactionType extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/TriggerInterface.php b/app/TransactionRules/Triggers/TriggerInterface.php index 9877633e22..45b24847ba 100644 --- a/app/TransactionRules/Triggers/TriggerInterface.php +++ b/app/TransactionRules/Triggers/TriggerInterface.php @@ -41,11 +41,11 @@ interface TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null); + public static function willMatchEverything($value = null): bool; /** * Triggers on a value and journal. diff --git a/app/TransactionRules/Triggers/UserAction.php b/app/TransactionRules/Triggers/UserAction.php index 7a8ed85d7c..f54ac107dd 100644 --- a/app/TransactionRules/Triggers/UserAction.php +++ b/app/TransactionRules/Triggers/UserAction.php @@ -42,13 +42,13 @@ final class UserAction extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @codeCoverageIgnore * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return true; }