diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index c6c4bed3e2..22472602a7 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -87,7 +87,7 @@ class AccountController extends Controller $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); $default = app('amount')->getDefaultCurrency(); - if (0 === count($frontPage->data)) { + if (empty($frontPage->data)) { $frontPage->data = $defaultSet; $frontPage->save(); } diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index cab0cc29e7..66bc12af35 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -109,7 +109,7 @@ class UpdateRequest extends FormRequest } $return[] = $current; } - if (0 === count($return)) { + if (empty($return)) { return null; } diff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.php index b005f12c96..9f6978d218 100644 --- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php @@ -167,7 +167,7 @@ class StoreRequest extends FormRequest $data = $validator->getData(); $triggers = $data['triggers'] ?? []; // need at least one trigger - if (!is_countable($triggers) || 0 === count($triggers)) { + if (!is_countable($triggers) || empty($triggers)) { $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger')); } } @@ -182,7 +182,7 @@ class StoreRequest extends FormRequest $data = $validator->getData(); $actions = $data['actions'] ?? []; // need at least one trigger - if (!is_countable($actions) || 0 === count($actions)) { + if (!is_countable($actions) || empty($actions)) { $validator->errors()->add('title', (string)trans('validation.at_least_one_action')); } } diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php index 01df50719b..65e54e6354 100644 --- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php @@ -180,7 +180,7 @@ class UpdateRequest extends FormRequest $data = $validator->getData(); $triggers = $data['triggers'] ?? null; // need at least one trigger - if (is_array($triggers) && 0 === count($triggers)) { + if (is_array($triggers) && empty($triggers)) { $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger')); } } @@ -195,7 +195,7 @@ class UpdateRequest extends FormRequest $data = $validator->getData(); $actions = $data['actions'] ?? null; // need at least one action - if (is_array($actions) && 0 === count($actions)) { + if (is_array($actions) && empty($actions)) { $validator->errors()->add('title', (string)trans('validation.at_least_one_action')); } } diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index 909c3b90db..a4a96a7067 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -125,11 +125,11 @@ class ExportData extends Command $exporter->setExportBills($options['export']['bills']); $exporter->setExportPiggies($options['export']['piggies']); $data = $exporter->export(); - if (0 === count($data)) { + if (empty($data)) { $this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org'); } $returnCode = 0; - if (0 !== count($data)) { + if (!empty($data)) { try { $this->exportData($options, $data); app('telemetry')->feature('system.command.executed', 'firefly-iii:export-data'); diff --git a/app/Console/Commands/VerifySecurityAlerts.php b/app/Console/Commands/VerifySecurityAlerts.php index 6ec0ebf651..36f9884766 100644 --- a/app/Console/Commands/VerifySecurityAlerts.php +++ b/app/Console/Commands/VerifySecurityAlerts.php @@ -25,16 +25,6 @@ class VerifySecurityAlerts extends Command */ protected $description = 'Verify security alerts'; - /** - * Create a new command instance. - * - * @return void - */ - public function __construct() - { - parent::__construct(); - } - /** * Execute the console command. * diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 55eada3ed1..8a7025b376 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -106,7 +106,7 @@ class TransactionJournalFactory Log::debug('Start of TransactionJournalFactory::create()'); $collection = new Collection; $transactions = $dataObject['transactions'] ?? []; - if (0 === count($transactions)) { + if (empty($transactions)) { Log::error('There are no transactions in the array, the TransactionJournalFactory cannot continue.'); return new Collection; diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index e3388ae0a9..c7a8889078 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -325,7 +325,7 @@ class GroupCollector implements GroupCollectorInterface */ public function setJournalIds(array $journalIds): GroupCollectorInterface { - if (0 !== count($journalIds)) { + if (!empty($journalIds)) { // make all integers. $integerIDs = array_map('intval', $journalIds); diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 1c91ed2b44..101994c3ab 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -117,7 +117,7 @@ class IndexController extends Controller $sums = $this->getSums($budgets); // get budgeted for default currency: - if (0 === count($availableBudgets)) { + if (empty($availableBudgets)) { $budgeted = $this->blRepository->budgeted($start, $end, $defaultCurrency,); $spentArr = $this->opsRepository->sumExpenses($start, $end, null, null, $defaultCurrency); $spent = $spentArr[$defaultCurrency->id]['sum'] ?? '0'; diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 9b49e08a45..e09b67bb43 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -331,7 +331,7 @@ class AccountController extends Controller Log::debug('Default set is ', $defaultSet); $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); Log::debug('Frontpage preference set is ', $frontPage->data); - if (0 === count($frontPage->data)) { + if (empty($frontPage->data)) { app('preferences')->set('frontPageAccounts', $defaultSet); Log::debug('frontpage set is empty!'); } diff --git a/app/Http/Controllers/Chart/DoubleReportController.php b/app/Http/Controllers/Chart/DoubleReportController.php index ac7315c507..fd7a49dbe0 100644 --- a/app/Http/Controllers/Chart/DoubleReportController.php +++ b/app/Http/Controllers/Chart/DoubleReportController.php @@ -319,7 +319,7 @@ class DoubleReportController extends Controller $journalId = $journal['transaction_journal_id']; // no tags? also deserves a sport - if (0 === count($journal['tags'])) { + if (empty($journal['tags'])) { $includedJournals[] = $journalId; // do something $tagName = trans('firefly.no_tags'); @@ -379,7 +379,7 @@ class DoubleReportController extends Controller $journalId = $journal['transaction_journal_id']; // no tags? also deserves a sport - if (0 === count($journal['tags'])) { + if (empty($journal['tags'])) { $includedJournals[] = $journalId; // do something $tagName = trans('firefly.no_tags'); diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php index 2f703d31bd..18c259a3d5 100644 --- a/app/Http/Controllers/Json/IntroController.php +++ b/app/Http/Controllers/Json/IntroController.php @@ -48,7 +48,7 @@ class IntroController extends Controller $specificPage = $specificPage ?? ''; $steps = $this->getBasicSteps($route); $specificSteps = $this->getSpecificSteps($route, $specificPage); - if (0 === count($specificSteps)) { + if (empty($specificSteps)) { Log::debug(sprintf('No specific steps for route "%s" and page "%s"', $route, $specificPage)); return response()->json($steps); diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 1e0b984b67..f700a900c7 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -115,7 +115,7 @@ class PreferencesController extends Controller $locales = ['equal' => (string)trans('firefly.equal_to_language')] + $locales; // an important fallback is that the frontPageAccount array gets refilled automatically // when it turns up empty. - if (0 === count($frontPageAccounts->data)) { + if (empty($frontPageAccounts->data)) { $frontPageAccounts = $accountIds; } diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index 040860406c..49e208424d 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -144,7 +144,7 @@ class SelectController extends Controller $textTriggers = $this->getValidTriggerList($request); // warn if nothing. - if (0 === count($textTriggers)) { + if (empty($textTriggers)) { return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); } @@ -168,7 +168,7 @@ class SelectController extends Controller // Warn the user if only a subset of transactions is returned $warning = ''; - if (0 === count($collection)) { + if (empty($collection)) { $warning = (string)trans('firefly.warning_no_matching_transactions'); } @@ -198,7 +198,7 @@ class SelectController extends Controller { $triggers = $rule->ruleTriggers; - if (0 === count($triggers)) { + if (empty($triggers)) { return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); } // create new rule engine: @@ -210,7 +210,7 @@ class SelectController extends Controller $collection = $collection->slice(0, 20); $warning = ''; - if (0 === count($collection)) { + if (empty($collection)) { $warning = (string)trans('firefly.warning_no_matching_transactions'); } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 2c087122f8..136a3a3262 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -88,7 +88,7 @@ class Authenticate protected function authenticate($request, array $guards) { - if (0 === count($guards)) { + if (empty($guards)) { try { // go for default guard: /** @noinspection PhpUndefinedMethodInspection */ diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 5c95f267c8..94eae23c6b 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -319,7 +319,7 @@ class TransactionJournal extends Model if (!self::isJoined($query, 'transaction_types')) { $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); } - if (0 !== count($types)) { + if (!empty($types)) { $query->whereIn('transaction_types.type', $types); } } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index ed49193657..aa34bdb7d4 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -125,7 +125,7 @@ class AccountRepository implements AccountRepositoryInterface { $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban'); - if (0 !== count($types)) { + if (!empty($types)) { $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); $query->whereIn('account_types.type', $types); } @@ -153,7 +153,7 @@ class AccountRepository implements AccountRepositoryInterface { $query = $this->user->accounts(); - if (0 !== count($types)) { + if (!empty($types)) { $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); $query->whereIn('account_types.type', $types); } @@ -222,7 +222,7 @@ class AccountRepository implements AccountRepositoryInterface { $query = $this->user->accounts(); - if (0 !== count($accountIds)) { + if (!empty($accountIds)) { $query->whereIn('accounts.id', $accountIds); } $query->orderBy('accounts.order', 'ASC'); @@ -242,7 +242,7 @@ class AccountRepository implements AccountRepositoryInterface { $res = array_intersect([AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT], $types); $query = $this->user->accounts(); - if (0 !== count($types)) { + if (!empty($types)) { $query->accountTypeIn($types); } @@ -253,8 +253,8 @@ class AccountRepository implements AccountRepositoryInterface } } - if (0 === count($sort)) { - if (0 !== count($res)) { + if (empty($sort)) { + if (!empty($res)) { $query->orderBy('accounts.order', 'ASC'); } $query->orderBy('accounts.active', 'DESC'); @@ -276,7 +276,7 @@ class AccountRepository implements AccountRepositoryInterface $query->where('name', 'account_role'); }, 'attachments'] ); - if (0 !== count($types)) { + if (!empty($types)) { $query->accountTypeIn($types); } $query->where('active', true); @@ -336,7 +336,7 @@ class AccountRepository implements AccountRepositoryInterface $query->where('name', 'account_role'); }] ); - if (0 !== count($types)) { + if (!empty($types)) { $query->accountTypeIn($types); } $query->where('active', 0); @@ -674,7 +674,7 @@ class AccountRepository implements AccountRepositoryInterface } } - if (0 !== count($types)) { + if (!empty($types)) { $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); $dbQuery->whereIn('account_types.type', $types); } @@ -712,7 +712,7 @@ class AccountRepository implements AccountRepositoryInterface ); } } - if (0 !== count($types)) { + if (!empty($types)) { $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); $dbQuery->whereIn('account_types.type', $types); } @@ -791,7 +791,7 @@ class AccountRepository implements AccountRepositoryInterface } ); - if (0 !== count($types)) { + if (!empty($types)) { $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); $dbQuery->whereIn('account_types.type', $types); } diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 6d81f3d2d7..b9709176ee 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -355,7 +355,7 @@ class RecurringRepository implements RecurringRepositoryInterface foreach ($journalMeta as $journalId) { $search[] = (int)$journalId; } - if (0 === count($search)) { + if (empty($search)) { return new Collection; } diff --git a/app/Services/Internal/Support/CreditRecalculateService.php b/app/Services/Internal/Support/CreditRecalculateService.php index a1928482ea..cbe7a735e9 100644 --- a/app/Services/Internal/Support/CreditRecalculateService.php +++ b/app/Services/Internal/Support/CreditRecalculateService.php @@ -67,7 +67,7 @@ class CreditRecalculateService // work based on account. $this->processAccount(); } - if (0 === count($this->work)) { + if (empty($this->work)) { Log::debug('No work accounts, do not do CreditRecalculationService'); return; @@ -127,7 +127,7 @@ class CreditRecalculateService { /** @var TransactionJournal $journal */ foreach ($this->group->transactionJournals as $journal) { - if (0 === count($this->work)) { + if (empty($this->work)) { try { $this->findByJournal($journal); } catch (FireflyException $e) { diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index 5ada279fb7..d51bdb895d 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -322,7 +322,7 @@ trait RecurringTransactionTrait $entry->value = json_encode($tags); $entry->save(); } - if (0 === count($tags)) { + if (empty($tags)) { // delete if present $transaction->recurrenceTransactionMeta()->where('name', 'tags')->delete(); } diff --git a/app/Services/Internal/Update/GroupUpdateService.php b/app/Services/Internal/Update/GroupUpdateService.php index 41dd3f6c1d..d276b112fe 100644 --- a/app/Services/Internal/Update/GroupUpdateService.php +++ b/app/Services/Internal/Update/GroupUpdateService.php @@ -57,7 +57,7 @@ class GroupUpdateService $transactionGroup->save(); } - if (0 === count($transactions)) { + if (empty($transactions)) { Log::debug('No transactions submitted, do nothing.'); return $transactionGroup; diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php index 812bca8f6a..051f8bd4cd 100644 --- a/app/Services/Internal/Update/RecurrenceUpdateService.php +++ b/app/Services/Internal/Update/RecurrenceUpdateService.php @@ -149,7 +149,7 @@ class RecurrenceUpdateService private function updateRepetitions(Recurrence $recurrence, array $repetitions): void { $originalCount = $recurrence->recurrenceRepetitions()->count(); - if (0 === count($repetitions)) { + if (empty($repetitions)) { // wont drop repetition, rather avoid. return; } @@ -227,7 +227,7 @@ class RecurrenceUpdateService private function updateTransactions(Recurrence $recurrence, array $transactions): void { $originalCount = $recurrence->recurrenceTransactions()->count(); - if (0 === count($transactions)) { + if (empty($transactions)) { // wont drop transactions, rather avoid. return; } diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.php index efbd567577..ff2ed2ffdc 100644 --- a/app/Support/Binder/BudgetList.php +++ b/app/Support/Binder/BudgetList.php @@ -55,7 +55,7 @@ class BudgetList implements BinderInterface $list = array_unique(array_map('\intval', explode(',', $value))); - if (0 === count($list)) { + if (empty($list)) { Log::warning('Budget list count is zero, return 404.'); throw new NotFoundHttpException; } diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.php index 001396e6b9..bf03596597 100644 --- a/app/Support/Binder/CategoryList.php +++ b/app/Support/Binder/CategoryList.php @@ -50,7 +50,7 @@ class CategoryList implements BinderInterface } $list = array_unique(array_map('\intval', explode(',', $value))); - if (0 === count($list)) { + if (empty($list)) { throw new NotFoundHttpException; } diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php index 4c1f8d50f9..d06dce5d41 100644 --- a/app/Support/Binder/JournalList.php +++ b/app/Support/Binder/JournalList.php @@ -52,7 +52,7 @@ class JournalList implements BinderInterface $collector->withCategoryInformation()->withBudgetInformation()->withTagInformation()->withAccountInformation(); $collector->setJournalIds($list); $result = $collector->getExtractedJournals(); - if (0 === count($result)) { + if (empty($result)) { throw new NotFoundHttpException; } @@ -68,7 +68,7 @@ class JournalList implements BinderInterface protected static function parseList(string $value): array { $list = array_unique(array_map('\intval', explode(',', $value))); - if (0 === count($list)) { + if (empty($list)) { throw new NotFoundHttpException; } diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.php index 07d2d5ab53..c5440988ee 100644 --- a/app/Support/Binder/TagList.php +++ b/app/Support/Binder/TagList.php @@ -53,7 +53,7 @@ class TagList implements BinderInterface $list = array_unique(array_map('\strtolower', explode(',', $value))); Log::debug('List of tags is', $list); - if (0 === count($list)) { + if (empty($list)) { Log::error('Tag list is empty.'); throw new NotFoundHttpException; } diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.php index 7db505e549..3035e458b5 100644 --- a/app/Support/Export/ExportDataGenerator.php +++ b/app/Support/Export/ExportDataGenerator.php @@ -765,7 +765,7 @@ class ExportDataGenerator */ private function mergeTags(array $tags): string { - if (0 === count($tags)) { + if (empty($tags)) { return ''; } $smol = []; diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index 57464938a2..6c66154d80 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -178,7 +178,7 @@ class OperatorQuerySearch implements SearchInterface */ public function searchTransactions(): LengthAwarePaginator { - if (0 === count($this->getWords()) && 0 === count($this->getOperators())) { + if (empty($this->getWords()) && empty($this->getOperators())) { return new LengthAwarePaginator([], 0, 5, 1); } diff --git a/app/TransactionRules/Factory/ActionFactory.php b/app/TransactionRules/Factory/ActionFactory.php index 37a8acae7b..23c7da3248 100644 --- a/app/TransactionRules/Factory/ActionFactory.php +++ b/app/TransactionRules/Factory/ActionFactory.php @@ -92,7 +92,7 @@ class ActionFactory */ protected static function getActionTypes(): array { - if (0 === count(self::$actionTypes)) { + if (empty(self::$actionTypes)) { self::$actionTypes = Domain::getRuleActions(); } diff --git a/app/Validation/RecurrenceValidation.php b/app/Validation/RecurrenceValidation.php index 07de4d0fd7..1469bcbf0f 100644 --- a/app/Validation/RecurrenceValidation.php +++ b/app/Validation/RecurrenceValidation.php @@ -126,7 +126,7 @@ trait RecurrenceValidation $data = $validator->getData(); $repetitions = $data['repetitions'] ?? []; // need at least one transaction - if (!is_countable($repetitions) || 0 === count($repetitions)) { + if (!is_countable($repetitions) || empty($repetitions)) { $validator->errors()->add('repetitions', (string)trans('validation.at_least_one_repetition')); } } @@ -144,7 +144,7 @@ trait RecurrenceValidation return; } // need at least one transaction - if (0 === count($repetitions)) { + if (empty($repetitions)) { $validator->errors()->add('repetitions', (string)trans('validation.at_least_one_repetition')); } } diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index b49a0c11e3..34009ab076 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -261,7 +261,7 @@ trait TransactionValidation $transactions = $this->getTransactionsArray($validator); // need at least one transaction - if (0 === count($transactions)) { + if (empty($transactions)) { $validator->errors()->add('transactions', (string)trans('validation.at_least_one_transaction')); } } @@ -276,7 +276,7 @@ trait TransactionValidation Log::debug('Now in validateOneTransaction()'); $transactions = $this->getTransactionsArray($validator); // need at least one transaction - if (0 === count($transactions)) { + if (empty($transactions)) { $validator->errors()->add('transactions.0.description', (string)trans('validation.at_least_one_transaction')); Log::debug('Added error: at_least_one_transaction.');