Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-09-26
JC5d3c557ca2255
diff --git a/app/Handlers/Events/StoredGroupEventHandler.php b/app/Handlers/Events/StoredGroupEventHandler.phpindex b5912ad2b9..9b4f75b4b3 100644--- a/app/Handlers/Events/StoredGroupEventHandler.php+++ b/app/Handlers/Events/StoredGroupEventHandler.php@@ -62,14 +62,14 @@ class StoredGroupEventHandler}Log::debug('Now in StoredGroupEventHandler::processRules()');- $journals = $storedGroupEvent->transactionGroup->transactionJournals;- $array = [];+ $journals = $storedGroupEvent->transactionGroup->transactionJournals;+ $array = [];/** @var TransactionJournal $journal */foreach ($journals as $journal) {$array[] = $journal->id;}- $journalIds = implode(',', $array);+ $journalIds = implode(',', $array);Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));// collect rules:@@ -78,10 +78,10 @@ class StoredGroupEventHandler// add the groups to the rule engine.// it should run the rules in the group and cancel the group if necessary.- $groups = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');+ $groups = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');// create and fire rule engine.- $newRuleEngine = app(RuleEngineInterface::class);+ $newRuleEngine = app(RuleEngineInterface::class);$newRuleEngine->setUser($storedGroupEvent->transactionGroup->user);$newRuleEngine->addOperator(['type' => 'journal_id', 'value' => $journalIds]);$newRuleEngine->setRuleGroups($groups);@@ -90,7 +90,7 @@ class StoredGroupEventHandlerprivate function recalculateCredit(StoredTransactionGroup $event): void{- $group = $event->transactionGroup;+ $group = $event->transactionGroup;/** @var CreditRecalculateService $object */$object = app(CreditRecalculateService::class);@@ -102,6 +102,7 @@ class StoredGroupEventHandler{/** @var PeriodStatisticRepositoryInterface $repository */$repository = app(PeriodStatisticRepositoryInterface::class);+/** @var TransactionJournal $journal */foreach ($event->transactionGroup->transactionJournals as $journal) {$source = $journal->transactions()->where('amount', '<', '0')->first();@@ -117,14 +118,14 @@ class StoredGroupEventHandlerprivate function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void{Log::debug(__METHOD__);- $group = $storedGroupEvent->transactionGroup;+ $group = $storedGroupEvent->transactionGroup;if (false === $storedGroupEvent->fireWebhooks) {Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));return;}- $user = $group->user;+ $user = $group->user;/** @var MessageGeneratorInterface $engine */$engine = app(MessageGeneratorInterface::class);diff --git a/app/Handlers/Events/UpdatedGroupEventHandler.php b/app/Handlers/Events/UpdatedGroupEventHandler.phpindex eedb842a10..ec5ada671d 100644--- a/app/Handlers/Events/UpdatedGroupEventHandler.php+++ b/app/Handlers/Events/UpdatedGroupEventHandler.php@@ -26,7 +26,6 @@ namespace FireflyIII\Handlers\Events;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Enums\WebhookTrigger;use FireflyIII\Events\RequestedSendWebhookMessages;-use FireflyIII\Events\StoredTransactionGroup;use FireflyIII\Events\UpdatedTransactionGroup;use FireflyIII\Generator\Webhook\MessageGeneratorInterface;use FireflyIII\Models\Account;@@ -63,6 +62,7 @@ class UpdatedGroupEventHandler{/** @var PeriodStatisticRepositoryInterface $repository */$repository = app(PeriodStatisticRepositoryInterface::class);+/** @var TransactionJournal $journal */foreach ($event->transactionGroup->transactionJournals as $journal) {$source = $journal->transactions()->where('amount', '<', '0')->first();diff --git a/app/Models/PeriodStatistic.php b/app/Models/PeriodStatistic.phpindex 194073bc88..ca166993ac 100644--- a/app/Models/PeriodStatistic.php+++ b/app/Models/PeriodStatistic.php@@ -22,8 +22,8 @@ class PeriodStatistic extends Model'created_at' => 'datetime','updated_at' => 'datetime','deleted_at' => 'datetime',- 'start' => SeparateTimezoneCaster::class,- 'end' => SeparateTimezoneCaster::class,+ 'start' => SeparateTimezoneCaster::class,+ 'end' => SeparateTimezoneCaster::class,];}@@ -54,6 +54,4 @@ class PeriodStatistic extends Modelreturn $this->morphTo();}--}diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.phpindex caf928b771..8eacb438b4 100644--- a/app/Repositories/Account/AccountRepository.php+++ b/app/Repositories/Account/AccountRepository.php@@ -547,6 +547,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfacpublic function periodCollection(Account $account, Carbon $start, Carbon $end): array{Log::debug(sprintf('periodCollection(#%d, %s, %s)', $account->id, $start->format('Y-m-d'), $end->format('Y-m-d')));+return $account->transactions()->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')diff --git a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.phpindex 9036fa1d7f..612773a9e2 100644--- a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php+++ b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php@@ -34,24 +34,26 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterfacepublic function findPeriodStatistics(Model $model, Carbon $start, Carbon $end, array $types): Collection{return $model->primaryPeriodStatistics()- ->where('start', $start)- ->where('end', $end)- ->whereIn('type', $types)- ->get();+ ->where('start', $start)+ ->where('end', $end)+ ->whereIn('type', $types)+ ->get()+ ;}public function findPeriodStatistic(Model $model, Carbon $start, Carbon $end, string $type): Collection{return $model->primaryPeriodStatistics()- ->where('start', $start)- ->where('end', $end)- ->where('type', $type)- ->get();+ ->where('start', $start)+ ->where('end', $end)+ ->where('type', $type)+ ->get()+ ;}public function saveStatistic(Model $model, int $currencyId, Carbon $start, Carbon $end, string $type, int $count, string $amount): PeriodStatistic{- $stat = new PeriodStatistic();+ $stat = new PeriodStatistic();$stat->primaryStatable()->associate($model);$stat->transaction_currency_id = $currencyId;$stat->start = $start;@@ -63,9 +65,17 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterface$stat->type = $type;$stat->save();- Log::debug(sprintf('Saved #%d [currency #%d, Model %s #%d, %s to %s, %d, %s] as new statistic.',- $stat->id, get_class($model), $model->id, $stat->transaction_currency_id, $stat->start->toW3cString(), $stat->end->toW3cString(), $count, $amount- ));+ Log::debug(sprintf(+ 'Saved #%d [currency #%d, Model %s #%d, %s to %s, %d, %s] as new statistic.',+ $stat->id,+ get_class($model),+ $model->id,+ $stat->transaction_currency_id,+ $stat->start->toW3cString(),+ $stat->end->toW3cString(),+ $count,+ $amount+ ));return $stat;}diff --git a/app/Support/Amount.php b/app/Support/Amount.phpindex 4b59c3a4d9..98e8aa284c 100644--- a/app/Support/Amount.php+++ b/app/Support/Amount.php@@ -59,11 +59,11 @@ class Amount// there are five possible positions for the "+" or "-" sign (if it is even used)// pos_a and pos_e could be the ( and ) symbol.- $posA = ''; // before everything- $posB = ''; // before currency symbol- $posC = ''; // after currency symbol- $posD = ''; // before amount- $posE = ''; // after everything+ $posA = ''; // before everything+ $posB = ''; // before currency symbol+ $posC = ''; // after currency symbol+ $posD = ''; // before amount+ $posE = ''; // after everything// format would be (currency before amount)// AB%sC_D%vE@@ -105,10 +105,10 @@ class Amount}if ($csPrecedes) {- return $posA . $posB . '%s' . $posC . $space . $posD . '%v' . $posE;+ return $posA.$posB.'%s'.$posC.$space.$posD.'%v'.$posE;}- return $posA . $posD . '%v' . $space . $posB . '%s' . $posC . $posE;+ return $posA.$posD.'%v'.$space.$posB.'%s'.$posC.$posE;}public function convertToPrimary(?User $user = null): bool@@ -125,8 +125,8 @@ class Amountreturn $pref;}- $key = sprintf('convert_to_primary_%d', $user->id);- $pref = $instance->getPreference($key);+ $key = sprintf('convert_to_primary_%d', $user->id);+ $pref = $instance->getPreference($key);if (null === $pref) {$res = true === Preferences::getForUser($user, 'convert_to_primary', false)->data && true === config('cer.enabled');$instance->setPreference($key, $res);@@ -163,15 +163,15 @@ class Amount*/public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string{- $locale = Steam::getLocale();- $rounded = Steam::bcround($amount, $decimalPlaces);+ $locale = Steam::getLocale();+ $rounded = Steam::bcround($amount, $decimalPlaces);$coloured ??= true;- $fmt = new NumberFormatter($locale, NumberFormatter::CURRENCY);+ $fmt = new NumberFormatter($locale, NumberFormatter::CURRENCY);$fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $symbol);$fmt->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, $decimalPlaces);$fmt->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, $decimalPlaces);- $result = (string)$fmt->format((float)$rounded); // intentional float+ $result = (string)$fmt->format((float)$rounded); // intentional floatif (true === $coloured) {if (1 === bccomp($rounded, '0')) {@@ -218,16 +218,16 @@ class Amount*/public function getAmountFromJournalObject(TransactionJournal $journal): string{- $convertToPrimary = $this->convertToPrimary();- $currency = $this->getPrimaryCurrency();- $field = $convertToPrimary && $currency->id !== $journal->transaction_currency_id ? 'pc_amount' : 'amount';+ $convertToPrimary = $this->convertToPrimary();+ $currency = $this->getPrimaryCurrency();+ $field = $convertToPrimary && $currency->id !== $journal->transaction_currency_id ? 'pc_amount' : 'amount';/** @var null|Transaction $sourceTransaction */$sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();if (null === $sourceTransaction) {return '0';}- $amount = $sourceTransaction->{$field} ?? '0';+ $amount = $sourceTransaction->{$field} ?? '0';if ((int)$sourceTransaction->foreign_currency_id === $currency->id) {// use foreign amount instead!$amount = (string)$sourceTransaction->foreign_amount; // hard coded to be foreign amount.@@ -284,7 +284,7 @@ class Amountpublic function getPrimaryCurrencyByUserGroup(UserGroup $userGroup): TransactionCurrency{- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty('getPrimaryCurrencyByGroup');$cache->addProperty($userGroup->id);if ($cache->has()) {@@ -314,7 +314,7 @@ class Amount$key = sprintf('transaction_currency_%s', $code);/** @var null|TransactionCurrency $pref */- $pref = $instance->getPreference($key);+ $pref = $instance->getPreference($key);if (null !== $pref) {return $pref;}@@ -336,7 +336,7 @@ class Amount$key = sprintf('transaction_currency_%d', $currencyId);/** @var null|TransactionCurrency $pref */- $pref = $instance->getPreference($key);+ $pref = $instance->getPreference($key);if (null !== $pref) {return $pref;}@@ -364,20 +364,20 @@ class Amountprivate function getLocaleInfo(): array{// get config from preference, not from translation:- $locale = Steam::getLocale();- $array = Steam::getLocaleArray($locale);+ $locale = Steam::getLocale();+ $array = Steam::getLocaleArray($locale);setlocale(LC_MONETARY, $array);- $info = localeconv();+ $info = localeconv();// correct variables- $info['n_cs_precedes'] = $this->getLocaleField($info, 'n_cs_precedes');- $info['p_cs_precedes'] = $this->getLocaleField($info, 'p_cs_precedes');+ $info['n_cs_precedes'] = $this->getLocaleField($info, 'n_cs_precedes');+ $info['p_cs_precedes'] = $this->getLocaleField($info, 'p_cs_precedes');- $info['n_sep_by_space'] = $this->getLocaleField($info, 'n_sep_by_space');- $info['p_sep_by_space'] = $this->getLocaleField($info, 'p_sep_by_space');+ $info['n_sep_by_space'] = $this->getLocaleField($info, 'n_sep_by_space');+ $info['p_sep_by_space'] = $this->getLocaleField($info, 'p_sep_by_space');- $fmt = new NumberFormatter($locale, NumberFormatter::CURRENCY);+ $fmt = new NumberFormatter($locale, NumberFormatter::CURRENCY);$info['mon_decimal_point'] = $fmt->getSymbol(NumberFormatter::MONETARY_SEPARATOR_SYMBOL);$info['mon_thousands_sep'] = $fmt->getSymbol(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL);diff --git a/app/Support/Authentication/RemoteUserGuard.php b/app/Support/Authentication/RemoteUserGuard.phpindex 353765af94..1c87806e00 100644--- a/app/Support/Authentication/RemoteUserGuard.php+++ b/app/Support/Authentication/RemoteUserGuard.php@@ -48,7 +48,7 @@ class RemoteUserGuard implements Guardpublic function __construct(protected UserProvider $provider, Application $app){/** @var null|Request $request */- $request = $app->get('request');+ $request = $app->get('request');Log::debug(sprintf('Created RemoteUserGuard for %s "%s"', $request?->getMethod(), $request?->getRequestUri()));$this->application = $app;$this->user = null;@@ -63,8 +63,8 @@ class RemoteUserGuard implements Guardreturn;}// Get the user identifier from $_SERVER or apache filtered headers- $header = config('auth.guard_header', 'REMOTE_USER');- $userID = request()->server($header) ?? null;+ $header = config('auth.guard_header', 'REMOTE_USER');+ $userID = request()->server($header) ?? null;if (function_exists('apache_request_headers')) {Log::debug('Use apache_request_headers to find user ID.');@@ -83,7 +83,7 @@ class RemoteUserGuard implements Guard$retrievedUser = $this->provider->retrieveById($userID);// store email address if present in header and not already set.- $header = config('auth.guard_email');+ $header = config('auth.guard_email');if (null !== $header) {$emailAddress = (string)(request()->server($header) ?? apache_request_headers()[$header] ?? null);@@ -99,7 +99,7 @@ class RemoteUserGuard implements Guard}Log::debug(sprintf('Result of getting user from provider: %s', $retrievedUser->email));- $this->user = $retrievedUser;+ $this->user = $retrievedUser;}public function check(): bool@@ -126,14 +126,14 @@ class RemoteUserGuard implements Guard/*** @SuppressWarnings("PHPMD.ShortMethodName")*/- public function id(): int | string | null+ public function id(): int|string|null{Log::debug(sprintf('Now at %s', __METHOD__));return $this->user?->id;}- public function setUser(Authenticatable | User | null $user): void // @phpstan-ignore-line+ public function setUser(Authenticatable|User|null $user): void // @phpstan-ignore-line{Log::debug(sprintf('Now at %s', __METHOD__));if ($user instanceof User) {diff --git a/app/Support/Balance.php b/app/Support/Balance.phpindex f9d684c5ef..0a9a97d0ee 100644--- a/app/Support/Balance.php+++ b/app/Support/Balance.php@@ -48,18 +48,19 @@ class Balancereturn $cache->get();}- $query = Transaction::whereIn('transactions.account_id', $accounts->pluck('id')->toArray())- ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')- ->orderBy('transaction_journals.date', 'desc')- ->orderBy('transaction_journals.order', 'asc')- ->orderBy('transaction_journals.description', 'desc')- ->orderBy('transactions.amount', 'desc')- ->where('transaction_journals.date', '<=', $date);+ $query = Transaction::whereIn('transactions.account_id', $accounts->pluck('id')->toArray())+ ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')+ ->orderBy('transaction_journals.date', 'desc')+ ->orderBy('transaction_journals.order', 'asc')+ ->orderBy('transaction_journals.description', 'desc')+ ->orderBy('transactions.amount', 'desc')+ ->where('transaction_journals.date', '<=', $date)+ ;- $result = $query->get(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.balance_after']);+ $result = $query->get(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.balance_after']);foreach ($result as $entry) {- $accountId = (int)$entry->account_id;- $currencyId = (int)$entry->transaction_currency_id;+ $accountId = (int)$entry->account_id;+ $currencyId = (int)$entry->transaction_currency_id;$currencies[$currencyId] ??= Amount::getTransactionCurrencyById($currencyId);$return[$accountId] ??= [];if (array_key_exists($currencyId, $return[$accountId])) {diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.phpindex 3d6c48728e..314a0c025f 100644--- a/app/Support/Binder/AccountList.php+++ b/app/Support/Binder/AccountList.php@@ -43,21 +43,23 @@ class AccountList implements BinderInterfaceif ('allAssetAccounts' === $value) {/** @var Collection $collection */$collection = auth()->user()->accounts()- ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')- ->whereIn('account_types.type', [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value])- ->orderBy('accounts.name', 'ASC')- ->get(['accounts.*']);+ ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')+ ->whereIn('account_types.type', [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value])+ ->orderBy('accounts.name', 'ASC')+ ->get(['accounts.*'])+ ;}if ('allAssetAccounts' !== $value) {- $incoming = array_map('\intval', explode(',', $value));- $list = array_merge(array_unique($incoming), [0]);+ $incoming = array_map('\intval', explode(',', $value));+ $list = array_merge(array_unique($incoming), [0]);/** @var Collection $collection */$collection = auth()->user()->accounts()- ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')- ->whereIn('accounts.id', $list)- ->orderBy('accounts.name', 'ASC')- ->get(['accounts.*']);+ ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')+ ->whereIn('accounts.id', $list)+ ->orderBy('accounts.name', 'ASC')+ ->get(['accounts.*'])+ ;}if ($collection->count() > 0) {diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.phpindex 917885a7d0..6526ebd38a 100644--- a/app/Support/Binder/BudgetList.php+++ b/app/Support/Binder/BudgetList.php@@ -41,12 +41,13 @@ class BudgetList implements BinderInterfaceif (auth()->check()) {if ('allBudgets' === $value) {return auth()->user()->budgets()->where('active', true)- ->orderBy('order', 'ASC')- ->orderBy('name', 'ASC')- ->get();+ ->orderBy('order', 'ASC')+ ->orderBy('name', 'ASC')+ ->get()+ ;}- $list = array_unique(array_map('\intval', explode(',', $value)));+ $list = array_unique(array_map('\intval', explode(',', $value)));if (0 === count($list)) { // @phpstan-ignore-lineapp('log')->warning('Budget list count is zero, return 404.');@@ -56,9 +57,10 @@ class BudgetList implements BinderInterface/** @var Collection $collection */$collection = auth()->user()->budgets()- ->where('active', true)- ->whereIn('id', $list)- ->get();+ ->where('active', true)+ ->whereIn('id', $list)+ ->get()+ ;// add empty budget if applicable.if (in_array(0, $list, true)) {diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.phpindex cde58f228f..1275481fa3 100644--- a/app/Support/Binder/CategoryList.php+++ b/app/Support/Binder/CategoryList.php@@ -41,19 +41,21 @@ class CategoryList implements BinderInterfaceif (auth()->check()) {if ('allCategories' === $value) {return auth()->user()->categories()- ->orderBy('name', 'ASC')- ->get();+ ->orderBy('name', 'ASC')+ ->get()+ ;}- $list = array_unique(array_map('\intval', explode(',', $value)));+ $list = array_unique(array_map('\intval', explode(',', $value)));if (0 === count($list)) { // @phpstan-ignore-linethrow new NotFoundHttpException();}/** @var Collection $collection */$collection = auth()->user()->categories()- ->whereIn('id', $list)- ->get();+ ->whereIn('id', $list)+ ->get()+ ;// add empty category if applicable.if (in_array(0, $list, true)) {diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.phpindex 4dcfb314c8..99c0ce4c17 100644--- a/app/Support/Binder/Date.php+++ b/app/Support/Binder/Date.php@@ -43,16 +43,16 @@ class Date implements BinderInterface/** @var FiscalHelperInterface $fiscalHelper */$fiscalHelper = app(FiscalHelperInterface::class);- $magicWords = [- 'currentMonthStart' => today(config('app.timezone'))->startOfMonth(),- 'currentMonthEnd' => today(config('app.timezone'))->endOfMonth(),- 'currentYearStart' => today(config('app.timezone'))->startOfYear(),- 'currentYearEnd' => today(config('app.timezone'))->endOfYear(),+ $magicWords = [+ 'currentMonthStart' => today(config('app.timezone'))->startOfMonth(),+ 'currentMonthEnd' => today(config('app.timezone'))->endOfMonth(),+ 'currentYearStart' => today(config('app.timezone'))->startOfYear(),+ 'currentYearEnd' => today(config('app.timezone'))->endOfYear(),- 'previousMonthStart' => today(config('app.timezone'))->startOfMonth()->subDay()->startOfMonth(),- 'previousMonthEnd' => today(config('app.timezone'))->startOfMonth()->subDay()->endOfMonth(),- 'previousYearStart' => today(config('app.timezone'))->startOfYear()->subDay()->startOfYear(),- 'previousYearEnd' => today(config('app.timezone'))->startOfYear()->subDay()->endOfYear(),+ 'previousMonthStart' => today(config('app.timezone'))->startOfMonth()->subDay()->startOfMonth(),+ 'previousMonthEnd' => today(config('app.timezone'))->startOfMonth()->subDay()->endOfMonth(),+ 'previousYearStart' => today(config('app.timezone'))->startOfYear()->subDay()->startOfYear(),+ 'previousYearEnd' => today(config('app.timezone'))->startOfYear()->subDay()->endOfYear(),'currentFiscalYearStart' => $fiscalHelper->startOfFiscalYear(today(config('app.timezone'))),'currentFiscalYearEnd' => $fiscalHelper->endOfFiscalYear(today(config('app.timezone'))),@@ -68,7 +68,7 @@ class Date implements BinderInterfacetry {$result = new Carbon($value);- } catch (InvalidDateException | InvalidFormatException $e) { // @phpstan-ignore-line+ } catch (InvalidDateException|InvalidFormatException $e) { // @phpstan-ignore-line$message = sprintf('Could not parse date "%s" for user #%d: %s', $value, auth()->user()->id, $e->getMessage());app('log')->error($message);diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.phpindex 217dd565ed..5eadcc587a 100644--- a/app/Support/Binder/JournalList.php+++ b/app/Support/Binder/JournalList.php@@ -39,7 +39,7 @@ class JournalList implements BinderInterfacepublic static function routeBinder(string $value, Route $route): array{if (auth()->check()) {- $list = self::parseList($value);+ $list = self::parseList($value);// get the journals by using the collector./** @var GroupCollectorInterface $collector */@@ -47,7 +47,7 @@ class JournalList implements BinderInterface$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value]);$collector->withCategoryInformation()->withBudgetInformation()->withTagInformation()->withAccountInformation();$collector->setJournalIds($list);- $result = $collector->getExtractedJournals();+ $result = $collector->getExtractedJournals();if (0 === count($result)) {throw new NotFoundHttpException();}diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.phpindex 685087da75..d87c8c69b9 100644--- a/app/Support/Binder/TagList.php+++ b/app/Support/Binder/TagList.php@@ -43,10 +43,11 @@ class TagList implements BinderInterfaceif (auth()->check()) {if ('allTags' === $value) {return auth()->user()->tags()- ->orderBy('tag', 'ASC')- ->get();+ ->orderBy('tag', 'ASC')+ ->get()+ ;}- $list = array_unique(array_map('\strtolower', explode(',', $value)));+ $list = array_unique(array_map('\strtolower', explode(',', $value)));app('log')->debug('List of tags is', $list);if (0 === count($list)) { // @phpstan-ignore-line@@ -58,7 +59,7 @@ class TagList implements BinderInterface/** @var TagRepositoryInterface $repository */$repository = app(TagRepositoryInterface::class);$repository->setUser(auth()->user());- $allTags = $repository->get();+ $allTags = $repository->get();$collection = $allTags->filter(static function (Tag $tag) use ($list) {diff --git a/app/Support/Binder/TagOrId.php b/app/Support/Binder/TagOrId.phpindex ad3a866e1a..e742fb674d 100644--- a/app/Support/Binder/TagOrId.php+++ b/app/Support/Binder/TagOrId.php@@ -40,7 +40,7 @@ class TagOrId implements BinderInterface$repository = app(TagRepositoryInterface::class);$repository->setUser(auth()->user());- $result = $repository->findByTag($value);+ $result = $repository->findByTag($value);if (null === $result) {$result = $repository->find((int)$value);}diff --git a/app/Support/Binder/UserGroupAccount.php b/app/Support/Binder/UserGroupAccount.phpindex 47a7af5541..c395655e87 100644--- a/app/Support/Binder/UserGroupAccount.php+++ b/app/Support/Binder/UserGroupAccount.php@@ -42,8 +42,9 @@ class UserGroupAccount implements BinderInterface/** @var User $user */$user = auth()->user();$account = Account::where('id', (int)$value)- ->where('user_group_id', $user->user_group_id)- ->first();+ ->where('user_group_id', $user->user_group_id)+ ->first()+ ;if (null !== $account) {return $account;}diff --git a/app/Support/Binder/UserGroupBill.php b/app/Support/Binder/UserGroupBill.phpindex 05eff73b6e..bd2489965e 100644--- a/app/Support/Binder/UserGroupBill.php+++ b/app/Support/Binder/UserGroupBill.php@@ -42,8 +42,9 @@ class UserGroupBill implements BinderInterface/** @var User $user */$user = auth()->user();$currency = Bill::where('id', (int)$value)- ->where('user_group_id', $user->user_group_id)- ->first();+ ->where('user_group_id', $user->user_group_id)+ ->first()+ ;if (null !== $currency) {return $currency;}diff --git a/app/Support/Binder/UserGroupExchangeRate.php b/app/Support/Binder/UserGroupExchangeRate.phpindex 1bb8fcc374..862564fde1 100644--- a/app/Support/Binder/UserGroupExchangeRate.php+++ b/app/Support/Binder/UserGroupExchangeRate.php@@ -39,8 +39,9 @@ class UserGroupExchangeRate implements BinderInterface/** @var User $user */$user = auth()->user();$rate = CurrencyExchangeRate::where('id', (int)$value)- ->where('user_group_id', $user->user_group_id)- ->first();+ ->where('user_group_id', $user->user_group_id)+ ->first()+ ;if (null !== $rate) {return $rate;}diff --git a/app/Support/Binder/UserGroupTransaction.php b/app/Support/Binder/UserGroupTransaction.phpindex 61add59c73..fbbf5c1f43 100644--- a/app/Support/Binder/UserGroupTransaction.php+++ b/app/Support/Binder/UserGroupTransaction.php@@ -39,8 +39,9 @@ class UserGroupTransaction implements BinderInterface/** @var User $user */$user = auth()->user();$group = TransactionGroup::where('id', (int)$value)- ->where('user_group_id', $user->user_group_id)- ->first();+ ->where('user_group_id', $user->user_group_id)+ ->first()+ ;if (null !== $group) {return $group;}diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.phpindex 38f2863e92..e22808ea06 100644--- a/app/Support/CacheProperties.php+++ b/app/Support/CacheProperties.php@@ -27,6 +27,7 @@ use Carbon\Carbon;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Cache;use JsonException;+use function Safe\json_encode;/**@@ -87,7 +88,7 @@ class CachePropertiesprivate function hash(): void{- $content = '';+ $content = '';foreach ($this->properties as $property) {try {$content = sprintf('%s%s', $content, json_encode($property, JSON_THROW_ON_ERROR));diff --git a/app/Support/Calendar/Calculator.php b/app/Support/Calendar/Calculator.phpindex b6ee2ceebb..ae5c1d7f72 100644--- a/app/Support/Calendar/Calculator.php+++ b/app/Support/Calendar/Calculator.php@@ -33,7 +33,7 @@ use SplObjectStorage;*/class Calculator{- public const int DEFAULT_INTERVAL = 1;+ public const int DEFAULT_INTERVAL = 1;private static ?SplObjectStorage $intervalMap = null; // @phpstan-ignore-lineprivate static array $intervals = [];diff --git a/app/Support/Chart/Budget/FrontpageChartGenerator.php b/app/Support/Chart/Budget/FrontpageChartGenerator.phpindex e48cc65e42..b5af64fedd 100644--- a/app/Support/Chart/Budget/FrontpageChartGenerator.php+++ b/app/Support/Chart/Budget/FrontpageChartGenerator.php@@ -181,7 +181,7 @@ class FrontpageChartGeneratorLog::debug(sprintf('Processing limit #%d with %s %s', $limit->id, $limit->transactionCurrency->code, $limit->amount));}- $spent = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);+ $spent = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);Log::debug(sprintf('Spent array has %d entries.', count($spent)));/** @var array $entry */@@ -208,7 +208,7 @@ class FrontpageChartGenerator*/private function processRow(array $data, Budget $budget, BudgetLimit $limit, array $entry): array{- $title = sprintf('%s (%s)', $budget->name, $entry['currency_name']);+ $title = sprintf('%s (%s)', $budget->name, $entry['currency_name']);Log::debug(sprintf('Title is "%s"', $title));if ($limit->start_date->startOfDay()->ne($this->start->startOfDay()) || $limit->end_date->startOfDay()->ne($this->end->startOfDay())) {$title = sprintf(@@ -219,8 +219,8 @@ class FrontpageChartGenerator$limit->end_date->isoFormat($this->monthAndDayFormat));}- $usePrimary = $this->convertToPrimary && $this->default->id !== $limit->transaction_currency_id;- $amount = $limit->amount;+ $usePrimary = $this->convertToPrimary && $this->default->id !== $limit->transaction_currency_id;+ $amount = $limit->amount;Log::debug(sprintf('Amount is "%s".', $amount));if ($usePrimary && $limit->transaction_currency_id !== $this->default->id) {$amount = $limit->native_amount;diff --git a/app/Support/Chart/Category/FrontpageChartGenerator.php b/app/Support/Chart/Category/FrontpageChartGenerator.phpindex b106deafce..cc9b249235 100644--- a/app/Support/Chart/Category/FrontpageChartGenerator.php+++ b/app/Support/Chart/Category/FrontpageChartGenerator.php@@ -65,16 +65,16 @@ class FrontpageChartGeneratorpublic function generate(): array{Log::debug(sprintf('Now in %s', __METHOD__));- $categories = $this->repository->getCategories();- $accounts = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]);- $collection = $this->collectExpensesAll($categories, $accounts);+ $categories = $this->repository->getCategories();+ $accounts = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]);+ $collection = $this->collectExpensesAll($categories, $accounts);// collect for no-category:- $noCategory = $this->collectNoCatExpenses($accounts);- $collection = array_merge($collection, $noCategory);+ $noCategory = $this->collectNoCatExpenses($accounts);+ $collection = array_merge($collection, $noCategory);// sort temp array by amount.- $amounts = array_column($collection, 'sum_float');+ $amounts = array_column($collection, 'sum_float');array_multisort($amounts, SORT_ASC, $collection);$currencyData = $this->createCurrencyGroups($collection);diff --git a/app/Support/Chart/Category/WholePeriodChartGenerator.php b/app/Support/Chart/Category/WholePeriodChartGenerator.phpindex 044b7f28a2..ce43b1d16e 100644--- a/app/Support/Chart/Category/WholePeriodChartGenerator.php+++ b/app/Support/Chart/Category/WholePeriodChartGenerator.php@@ -40,22 +40,22 @@ class WholePeriodChartGeneratorpublic function generate(Category $category, Carbon $start, Carbon $end): array{- $collection = new Collection()->push($category);+ $collection = new Collection()->push($category);/** @var OperationsRepositoryInterface $opsRepository */- $opsRepository = app(OperationsRepositoryInterface::class);+ $opsRepository = app(OperationsRepositoryInterface::class);/** @var AccountRepositoryInterface $accountRepository */$accountRepository = app(AccountRepositoryInterface::class);- $types = [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];- $accounts = $accountRepository->getAccountsByType($types);- $step = $this->calculateStep($start, $end);- $chartData = [];- $spent = [];- $earned = [];+ $types = [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];+ $accounts = $accountRepository->getAccountsByType($types);+ $step = $this->calculateStep($start, $end);+ $chartData = [];+ $spent = [];+ $earned = [];- $current = clone $start;+ $current = clone $start;while ($current <= $end) {$key = $current->format('Y-m-d');@@ -65,14 +65,14 @@ class WholePeriodChartGenerator$current = app('navigation')->addPeriod($current, $step, 0);}- $currencies = $this->extractCurrencies($spent) + $this->extractCurrencies($earned);+ $currencies = $this->extractCurrencies($spent) + $this->extractCurrencies($earned);// generate chart data (for each currency)/** @var array $currency */foreach ($currencies as $currency) {- $code = $currency['currency_code'];- $name = $currency['currency_name'];- $chartData[sprintf('spent-in-%s', $code)] = [+ $code = $currency['currency_code'];+ $name = $currency['currency_name'];+ $chartData[sprintf('spent-in-%s', $code)] = ['label' => (string)trans('firefly.box_spent_in_currency', ['currency' => $name]),'entries' => [],'type' => 'bar',@@ -87,11 +87,11 @@ class WholePeriodChartGenerator];}- $current = clone $start;+ $current = clone $start;while ($current <= $end) {- $key = $current->format('Y-m-d');- $label = app('navigation')->periodShow($current, $step);+ $key = $current->format('Y-m-d');+ $label = app('navigation')->periodShow($current, $step);/** @var array $currency */foreach ($currencies as $currency) {diff --git a/app/Support/Chart/ChartData.php b/app/Support/Chart/ChartData.phpindex 8d58c6a304..d35242c4d6 100644--- a/app/Support/Chart/ChartData.php+++ b/app/Support/Chart/ChartData.php@@ -49,7 +49,7 @@ class ChartDataif (array_key_exists('primary_currency_id', $data)) {$data['primary_currency_id'] = (string)$data['primary_currency_id'];}- $required = ['start', 'date', 'end', 'entries'];+ $required = ['start', 'date', 'end', 'entries'];foreach ($required as $field) {if (!array_key_exists($field, $data)) {throw new FireflyException(sprintf('Data-set is missing the "%s"-variable.', $field));diff --git a/app/Support/ChartColour.php b/app/Support/ChartColour.phpindex f08de5c258..9e938b9946 100644--- a/app/Support/ChartColour.php+++ b/app/Support/ChartColour.php@@ -55,7 +55,7 @@ class ChartColourpublic static function getColour(int $index): string{$index %= count(self::$colours);- $row = self::$colours[$index];+ $row = self::$colours[$index];return sprintf('rgba(%d, %d, %d, 0.7)', $row[0], $row[1], $row[2]);}diff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.phpindex 6855884d66..e4e82d2376 100644--- a/app/Support/Cronjobs/AutoBudgetCronjob.php+++ b/app/Support/Cronjobs/AutoBudgetCronjob.php@@ -70,7 +70,7 @@ class AutoBudgetCronjob extends AbstractCronjobLog::info(sprintf('Will now fire auto budget cron job task for date "%s".', $this->date->format('Y-m-d')));/** @var CreateAutoBudgetLimits $job */- $job = app(CreateAutoBudgetLimits::class, [$this->date]);+ $job = app(CreateAutoBudgetLimits::class, [$this->date]);$job->setDate($this->date);$job->handle();diff --git a/app/Support/Cronjobs/BillWarningCronjob.php b/app/Support/Cronjobs/BillWarningCronjob.phpindex f192aa1224..a358d5879e 100644--- a/app/Support/Cronjobs/BillWarningCronjob.php+++ b/app/Support/Cronjobs/BillWarningCronjob.php@@ -82,7 +82,7 @@ class BillWarningCronjob extends AbstractCronjobLog::info(sprintf('Will now fire bill notification job task for date "%s".', $this->date->format('Y-m-d H:i:s')));/** @var WarnAboutBills $job */- $job = app(WarnAboutBills::class);+ $job = app(WarnAboutBills::class);$job->setDate($this->date);$job->setForce($this->force);$job->handle();diff --git a/app/Support/Cronjobs/ExchangeRatesCronjob.php b/app/Support/Cronjobs/ExchangeRatesCronjob.phpindex 57cb788bc7..889d6e57de 100644--- a/app/Support/Cronjobs/ExchangeRatesCronjob.php+++ b/app/Support/Cronjobs/ExchangeRatesCronjob.php@@ -71,7 +71,7 @@ class ExchangeRatesCronjob extends AbstractCronjobLog::info(sprintf('Will now fire exchange rates cron job task for date "%s".', $this->date->format('Y-m-d')));/** @var DownloadExchangeRates $job */- $job = app(DownloadExchangeRates::class);+ $job = app(DownloadExchangeRates::class);$job->setDate($this->date);$job->handle();diff --git a/app/Support/Cronjobs/RecurringCronjob.php b/app/Support/Cronjobs/RecurringCronjob.phpindex 1f8654b9a7..5f4e11a4c2 100644--- a/app/Support/Cronjobs/RecurringCronjob.php+++ b/app/Support/Cronjobs/RecurringCronjob.php@@ -80,7 +80,7 @@ class RecurringCronjob extends AbstractCronjob{Log::info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s')));- $job = new CreateRecurringTransactions($this->date);+ $job = new CreateRecurringTransactions($this->date);$job->setForce($this->force);$job->handle();diff --git a/app/Support/Cronjobs/UpdateCheckCronjob.php b/app/Support/Cronjobs/UpdateCheckCronjob.phpindex c7681037dd..d9987a73ad 100644--- a/app/Support/Cronjobs/UpdateCheckCronjob.php+++ b/app/Support/Cronjobs/UpdateCheckCronjob.php@@ -41,8 +41,8 @@ class UpdateCheckCronjob extends AbstractCronjobLog::debug('Now in checkForUpdates()');// should not check for updates:- $permission = FireflyConfig::get('permission_update_check', -1);- $value = (int)$permission->data;+ $permission = FireflyConfig::get('permission_update_check', -1);+ $value = (int)$permission->data;if (1 !== $value) {Log::debug('Update check is not enabled.');// get stuff from job:@@ -56,9 +56,9 @@ class UpdateCheckCronjob extends AbstractCronjob// TODO this is duplicate./** @var Configuration $lastCheckTime */- $lastCheckTime = FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp());- $now = Carbon::now()->getTimestamp();- $diff = $now - $lastCheckTime->data;+ $lastCheckTime = FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp());+ $now = Carbon::now()->getTimestamp();+ $diff = $now - $lastCheckTime->data;Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));if ($diff < 604800 && false === $this->force) {// get stuff from job:@@ -71,7 +71,7 @@ class UpdateCheckCronjob extends AbstractCronjob}// last check time was more than a week ago.Log::debug('Have not checked for a new version in a week!');- $release = $this->getLatestRelease();+ $release = $this->getLatestRelease();if ('error' === $release['level']) {// get stuff from job:$this->jobFired = true;diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.phpindex 1dbaeb7d8e..fc464fae22 100644--- a/app/Support/ExpandedForm.php+++ b/app/Support/ExpandedForm.php@@ -43,7 +43,7 @@ class ExpandedForm*/public function amountNoCurrency(string $name, $value = null, ?array $options = null): string{- $options ??= [];+ $options ??= [];$label = $this->label($name, $options);$options = $this->expandOptionArray($name, $label, $options);$classes = $this->getHolderClasses($name);@@ -74,8 +74,8 @@ class ExpandedForm*/public function checkbox(string $name, ?int $value = null, $checked = null, ?array $options = null): string{- $options ??= [];- $value ??= 1;+ $options ??= [];+ $value ??= 1;$options['checked'] = true === $checked;if (app('session')->has('preFilled')) {@@ -83,10 +83,10 @@ class ExpandedForm$options['checked'] = $preFilled[$name] ?? $options['checked'];}- $label = $this->label($name, $options);- $options = $this->expandOptionArray($name, $label, $options);- $classes = $this->getHolderClasses($name);- $value = $this->fillFieldValue($name, $value);+ $label = $this->label($name, $options);+ $options = $this->expandOptionArray($name, $label, $options);+ $classes = $this->getHolderClasses($name);+ $value = $this->fillFieldValue($name, $value);unset($options['placeholder'], $options['autocomplete'], $options['class']);@@ -157,10 +157,10 @@ class ExpandedFormpublic function integer(string $name, $value = null, ?array $options = null): string{$options ??= [];- $label = $this->label($name, $options);- $options = $this->expandOptionArray($name, $label, $options);- $classes = $this->getHolderClasses($name);- $value = $this->fillFieldValue($name, $value);+ $label = $this->label($name, $options);+ $options = $this->expandOptionArray($name, $label, $options);+ $classes = $this->getHolderClasses($name);+ $value = $this->fillFieldValue($name, $value);$options['step'] ??= '1';try {@@ -209,9 +209,9 @@ class ExpandedForm/** @var Model $entry */foreach ($set as $entry) {// All Eloquent models have an ID- $entryId = $entry->id;- $current = $entry->toArray();- $title = null;+ $entryId = $entry->id;+ $current = $entry->toArray();+ $title = null;foreach ($fields as $field) {if (array_key_exists($field, $current) && null === $title) {$title = $current[$field];diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.phpindex b70f2a6615..926f371108 100644--- a/app/Support/Export/ExportDataGenerator.php+++ b/app/Support/Export/ExportDataGenerator.php@@ -89,8 +89,8 @@ class ExportDataGeneratorpublic function __construct(){- $this->accounts = new Collection();- $this->start = today(config('app.timezone'));+ $this->accounts = new Collection();+ $this->start = today(config('app.timezone'));$this->start->subYear();$this->end = today(config('app.timezone'));$this->exportTransactions = false;@@ -234,7 +234,7 @@ class ExportDataGenerator*/private function exportAccounts(): string{- $header = [+ $header = ['user_id','account_id','created_at',@@ -255,7 +255,7 @@ class ExportDataGenerator];/** @var AccountRepositoryInterface $repository */- $repository = app(AccountRepositoryInterface::class);+ $repository = app(AccountRepositoryInterface::class);$repository->setUser($this->user);$allAccounts = $repository->getAccountsByType([]);$records = [];@@ -285,7 +285,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -318,8 +318,8 @@ class ExportDataGenerator/** @var BillRepositoryInterface $repository */$repository = app(BillRepositoryInterface::class);$repository->setUser($this->user);- $bills = $repository->getBills();- $header = [+ $bills = $repository->getBills();+ $header = ['user_id','bill_id','created_at',@@ -333,7 +333,7 @@ class ExportDataGenerator'skip','active',];- $records = [];+ $records = [];/** @var Bill $bill */foreach ($bills as $bill) {@@ -354,7 +354,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -384,7 +384,7 @@ class ExportDataGenerator*/private function exportBudgets(): string{- $header = [+ $header = ['user_id','budget_id','name',@@ -398,9 +398,9 @@ class ExportDataGenerator$budgetRepos = app(BudgetRepositoryInterface::class);$budgetRepos->setUser($this->user);- $limitRepos = app(BudgetLimitRepositoryInterface::class);- $budgets = $budgetRepos->getBudgets();- $records = [];+ $limitRepos = app(BudgetLimitRepositoryInterface::class);+ $budgets = $budgetRepos->getBudgets();+ $records = [];/** @var Budget $budget */foreach ($budgets as $budget) {@@ -423,7 +423,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -453,10 +453,10 @@ class ExportDataGenerator*/private function exportCategories(): string{- $header = ['user_id', 'category_id', 'created_at', 'updated_at', 'name'];+ $header = ['user_id', 'category_id', 'created_at', 'updated_at', 'name'];/** @var CategoryRepositoryInterface $catRepos */- $catRepos = app(CategoryRepositoryInterface::class);+ $catRepos = app(CategoryRepositoryInterface::class);$catRepos->setUser($this->user);$records = [];@@ -474,7 +474,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -505,14 +505,14 @@ class ExportDataGeneratorprivate function exportPiggies(): string{/** @var PiggyBankRepositoryInterface $piggyRepos */- $piggyRepos = app(PiggyBankRepositoryInterface::class);+ $piggyRepos = app(PiggyBankRepositoryInterface::class);$piggyRepos->setUser($this->user);/** @var AccountRepositoryInterface $accountRepos */$accountRepos = app(AccountRepositoryInterface::class);$accountRepos->setUser($this->user);- $header = [+ $header = ['user_id','piggy_bank_id','created_at',@@ -528,8 +528,8 @@ class ExportDataGenerator'order','active',];- $records = [];- $piggies = $piggyRepos->getPiggyBanks();+ $records = [];+ $piggies = $piggyRepos->getPiggyBanks();/** @var PiggyBank $piggy */foreach ($piggies as $piggy) {@@ -554,7 +554,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -587,7 +587,7 @@ class ExportDataGenerator/** @var RecurringRepositoryInterface $recurringRepos */$recurringRepos = app(RecurringRepositoryInterface::class);$recurringRepos->setUser($this->user);- $header = [+ $header = [// recurrence:'user_id', 'recurrence_id', 'row_contains', 'created_at', 'updated_at', 'type', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active',@@ -596,8 +596,8 @@ class ExportDataGenerator// transactions + meta:'currency_code', 'foreign_currency_code', 'source_name', 'source_type', 'destination_name', 'destination_type', 'amount', 'foreign_amount', 'category', 'budget', 'piggy_bank', 'tags',];- $records = [];- $recurrences = $recurringRepos->get();+ $records = [];+ $recurrences = $recurringRepos->get();/** @var Recurrence $recurrence */foreach ($recurrences as $recurrence) {@@ -630,7 +630,7 @@ class ExportDataGenerator$piggyBankId = $recurringRepos->getPiggyBank($transaction);$tags = $recurringRepos->getTags($transaction);- $records[] = [+ $records[] = [// recurrence$this->user->id,$recurrence->id,@@ -646,7 +646,7 @@ class ExportDataGenerator}}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -683,8 +683,8 @@ class ExportDataGenerator'action_type', 'action_value', 'action_order', 'action_active', 'action_stop_processing'];$ruleRepos = app(RuleRepositoryInterface::class);$ruleRepos->setUser($this->user);- $rules = $ruleRepos->getAll();- $records = [];+ $rules = $ruleRepos->getAll();+ $records = [];/** @var Rule $rule */foreach ($rules as $rule) {@@ -723,7 +723,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -753,12 +753,12 @@ class ExportDataGenerator*/private function exportTags(): string{- $header = ['user_id', 'tag_id', 'created_at', 'updated_at', 'tag', 'date', 'description', 'latitude', 'longitude', 'zoom_level'];+ $header = ['user_id', 'tag_id', 'created_at', 'updated_at', 'tag', 'date', 'description', 'latitude', 'longitude', 'zoom_level'];$tagRepos = app(TagRepositoryInterface::class);$tagRepos->setUser($this->user);- $tags = $tagRepos->get();- $records = [];+ $tags = $tagRepos->get();+ $records = [];/** @var Tag $tag */foreach ($tags as $tag) {@@ -777,7 +777,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {@@ -809,26 +809,26 @@ class ExportDataGenerator{Log::debug('Will now export transactions.');// TODO better place for keys?- $header = ['user_id', 'group_id', 'journal_id', 'created_at', 'updated_at', 'group_title', 'type', 'currency_code', 'amount', 'foreign_currency_code', 'foreign_amount', 'primary_currency_code', 'pc_amount', 'pc_foreign_amount', 'description', 'date', 'source_name', 'source_iban', 'source_type', 'destination_name', 'destination_iban', 'destination_type', 'reconciled', 'category', 'budget', 'bill', 'tags', 'notes'];+ $header = ['user_id', 'group_id', 'journal_id', 'created_at', 'updated_at', 'group_title', 'type', 'currency_code', 'amount', 'foreign_currency_code', 'foreign_amount', 'primary_currency_code', 'pc_amount', 'pc_foreign_amount', 'description', 'date', 'source_name', 'source_iban', 'source_type', 'destination_name', 'destination_iban', 'destination_type', 'reconciled', 'category', 'budget', 'bill', 'tags', 'notes'];$metaFields = config('firefly.journal_meta_fields');$header = array_merge($header, $metaFields);$primary = Amount::getPrimaryCurrency();- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setUser($this->user);$collector->setRange($this->start, $this->end)->withAccountInformation()->withCategoryInformation()->withBillInformation()->withBudgetInformation()->withTagInformation()->withNotes();if (0 !== $this->accounts->count()) {$collector->setAccounts($this->accounts);}- $journals = $collector->getExtractedJournals();+ $journals = $collector->getExtractedJournals();// get repository for meta data:$repository = app(TransactionGroupRepositoryInterface::class);$repository->setUser($this->user);- $records = [];+ $records = [];/** @var array $journal */foreach ($journals as $journal) {@@ -853,7 +853,7 @@ class ExportDataGenerator$pcForeignAmount = null === $journal['pc_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['pc_foreign_amount']), $primary->decimal_places);}- $records[] = [+ $records[] = [$journal['user_id'], $journal['transaction_group_id'], $journal['transaction_journal_id'], $journal['created_at']->toAtomString(), $journal['updated_at']->toAtomString(), $journal['transaction_group_title'], $journal['transaction_type_type'],// amounts and currencies$journal['currency_code'], $amount, $journal['foreign_currency_code'], $foreignAmount, $primary->code, $pcAmount, $pcForeignAmount,@@ -878,7 +878,7 @@ class ExportDataGenerator}// load the CSV document from a string- $csv = Writer::createFromString();+ $csv = Writer::createFromString();// insert the headertry {diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.phpindex b79967f8cb..70d4650c6c 100644--- a/app/Support/FireflyConfig.php+++ b/app/Support/FireflyConfig.php@@ -39,7 +39,7 @@ class FireflyConfig{public function delete(string $name): void{- $fullName = 'ff3-config-' . $name;+ $fullName = 'ff3-config-'.$name;if (Cache::has($fullName)) {Cache::forget($fullName);}@@ -53,7 +53,7 @@ class FireflyConfig*/public function get(string $name, mixed $default = null): ?Configuration{- $fullName = 'ff3-config-' . $name;+ $fullName = 'ff3-config-'.$name;if (Cache::has($fullName)) {return Cache::get($fullName);}@@ -61,7 +61,7 @@ class FireflyConfigtry {/** @var null|Configuration $config */$config = Configuration::where('name', $name)->first(['id', 'name', 'data']);- } catch (Exception | QueryException $e) {+ } catch (Exception|QueryException $e) {throw new FireflyException(sprintf('Could not poll the database: %s', $e->getMessage()), 0, $e);}@@ -146,13 +146,13 @@ class FireflyConfig$item->name = $name;$item->data = $value;$item->save();- Cache::forget('ff3-config-' . $name);+ Cache::forget('ff3-config-'.$name);return $item;}$config->data = $value;$config->save();- Cache::forget('ff3-config-' . $name);+ Cache::forget('ff3-config-'.$name);return $config;}diff --git a/app/Support/Form/AccountForm.php b/app/Support/Form/AccountForm.phpindex c7a7685061..9b72eb285a 100644--- a/app/Support/Form/AccountForm.php+++ b/app/Support/Form/AccountForm.php@@ -62,9 +62,9 @@ class AccountForm*/public function activeWithdrawalDestinations(string $name, mixed $value = null, ?array $options = null): string{- $types = [AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::EXPENSE->value];- $repository = $this->getAccountRepository();- $grouped = $this->getAccountsGrouped($types, $repository);+ $types = [AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::EXPENSE->value];+ $repository = $this->getAccountRepository();+ $grouped = $this->getAccountsGrouped($types, $repository);$cash = $repository->getCashAccount();$key = (string)trans('firefly.cash_account_type');@@ -80,15 +80,15 @@ class AccountForm*/public function assetAccountCheckList(string $name, ?array $options = null): string{- $options ??= [];+ $options ??= [];$label = $this->label($name, $options);$options = $this->expandOptionArray($name, $label, $options);$classes = $this->getHolderClasses($name);$selected = request()->old($name) ?? [];// get all asset accounts:- $types = [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::DEBT->value];- $grouped = $this->getAccountsGrouped($types);+ $types = [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::DEBT->value];+ $grouped = $this->getAccountsGrouped($types);unset($options['class']);@@ -154,7 +154,7 @@ class AccountForm/** @var Account $account */foreach ($accountList as $account) {- $role = (string)$repository->getMetaValue($account, 'account_role');+ $role = (string)$repository->getMetaValue($account, 'account_role');if (in_array($account->accountType->type, $liabilityTypes, true)) {$role = sprintf('l_%s', $account->accountType->type);}diff --git a/app/Support/Form/CurrencyForm.php b/app/Support/Form/CurrencyForm.phpindex 6d24780f19..bf748c6097 100644--- a/app/Support/Form/CurrencyForm.php+++ b/app/Support/Form/CurrencyForm.php@@ -72,12 +72,12 @@ class CurrencyForm$currencyRepos = app(CurrencyRepositoryInterface::class);// get all currencies:- $list = $currencyRepos->get();- $array = [];+ $list = $currencyRepos->get();+ $array = [];/** @var TransactionCurrency $currency */foreach ($list as $currency) {- $array[$currency->id] = $currency->name . ' (' . $currency->symbol . ')';+ $array[$currency->id] = $currency->name.' ('.$currency->symbol.')';}return $this->select($name, $array, $value, $options);@@ -94,14 +94,14 @@ class CurrencyForm$currencyRepos = app(CurrencyRepositoryInterface::class);// get all currencies:- $list = $currencyRepos->get();- $array = [+ $list = $currencyRepos->get();+ $array = [0 => (string)trans('firefly.no_currency'),];/** @var TransactionCurrency $currency */foreach ($list as $currency) {- $array[$currency->id] = $currency->name . ' (' . $currency->symbol . ')';+ $array[$currency->id] = $currency->name.' ('.$currency->symbol.')';}return $this->select($name, $array, $value, $options);@@ -124,16 +124,16 @@ class CurrencyForm$primaryCurrency = $options['currency'] ?? app('amount')->getPrimaryCurrency();/** @var Collection $currencies */- $currencies = app('amount')->getAllCurrencies();+ $currencies = app('amount')->getAllCurrencies();unset($options['currency'], $options['placeholder']);// perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount)- $preFilled = session('preFilled');+ $preFilled = session('preFilled');if (!is_array($preFilled)) {$preFilled = [];}- $key = 'amount_currency_id_' . $name;- $sentCurrencyId = array_key_exists($key, $preFilled) ? (int)$preFilled[$key] : $primaryCurrency->id;+ $key = 'amount_currency_id_'.$name;+ $sentCurrencyId = array_key_exists($key, $preFilled) ? (int)$preFilled[$key] : $primaryCurrency->id;app('log')->debug(sprintf('Sent currency ID is %d', $sentCurrencyId));@@ -153,7 +153,7 @@ class CurrencyForm}try {- $html = view('form.' . $view, compact('primaryCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();+ $html = view('form.'.$view, compact('primaryCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();} catch (Throwable $e) {app('log')->debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));$html = 'Could not render currencyField.';@@ -179,15 +179,15 @@ class CurrencyForm$primaryCurrency = $options['currency'] ?? app('amount')->getPrimaryCurrency();/** @var Collection $currencies */- $currencies = app('amount')->getCurrencies();+ $currencies = app('amount')->getCurrencies();unset($options['currency'], $options['placeholder']);// perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount)- $preFilled = session('preFilled');+ $preFilled = session('preFilled');if (!is_array($preFilled)) {$preFilled = [];}- $key = 'amount_currency_id_' . $name;- $sentCurrencyId = array_key_exists($key, $preFilled) ? (int)$preFilled[$key] : $primaryCurrency->id;+ $key = 'amount_currency_id_'.$name;+ $sentCurrencyId = array_key_exists($key, $preFilled) ? (int)$preFilled[$key] : $primaryCurrency->id;app('log')->debug(sprintf('Sent currency ID is %d', $sentCurrencyId));@@ -207,7 +207,7 @@ class CurrencyForm}try {- $html = view('form.' . $view, compact('primaryCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();+ $html = view('form.'.$view, compact('primaryCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();} catch (Throwable $e) {app('log')->debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));$html = 'Could not render currencyField.';diff --git a/app/Support/Form/FormSupport.php b/app/Support/Form/FormSupport.phpindex e41c785f00..22a580c295 100644--- a/app/Support/Form/FormSupport.php+++ b/app/Support/Form/FormSupport.php@@ -36,7 +36,7 @@ trait FormSupport{public function multiSelect(string $name, ?array $list = null, mixed $selected = null, ?array $options = null): string{- $list ??= [];+ $list ??= [];$label = $this->label($name, $options);$options = $this->expandOptionArray($name, $label, $options);$classes = $this->getHolderClasses($name);@@ -59,7 +59,7 @@ trait FormSupport*/public function select(string $name, ?array $list = null, $selected = null, ?array $options = null): string{- $list ??= [];+ $list ??= [];$label = $this->label($name, $options);$options = $this->expandOptionArray($name, $label, $options);$classes = $this->getHolderClasses($name);@@ -81,10 +81,10 @@ trait FormSupport*/protected function expandOptionArray(string $name, $label, ?array $options = null): array{- $options ??= [];+ $options ??= [];$name = str_replace('[]', '', $name);$options['class'] = 'form-control';- $options['id'] = 'ffInput_' . $name;+ $options['id'] = 'ffInput_'.$name;$options['autocomplete'] = 'off';$options['placeholder'] = ucfirst((string)$label);@@ -145,6 +145,6 @@ trait FormSupport}$name = str_replace('[]', '', $name);- return (string)trans('form.' . $name);+ return (string)trans('form.'.$name);}}diff --git a/app/Support/Form/PiggyBankForm.php b/app/Support/Form/PiggyBankForm.phpindex b6233fd0d6..0818d96157 100644--- a/app/Support/Form/PiggyBankForm.php+++ b/app/Support/Form/PiggyBankForm.php@@ -62,14 +62,14 @@ class PiggyBankForm/** @var PiggyBank $piggy */foreach ($piggyBanks as $piggy) {- $group = $piggy->objectGroups->first();- $groupTitle = null;- $groupOrder = 0;+ $group = $piggy->objectGroups->first();+ $groupTitle = null;+ $groupOrder = 0;if (null !== $group) {$groupTitle = $group->title;$groupOrder = $group->order;}- $subList[$groupOrder] ??= [+ $subList[$groupOrder] ??= ['group' => ['title' => $groupTitle,],diff --git a/app/Support/Form/RuleForm.php b/app/Support/Form/RuleForm.phpindex f635ed9b86..9566f0301f 100644--- a/app/Support/Form/RuleForm.php+++ b/app/Support/Form/RuleForm.php@@ -41,8 +41,8 @@ class RuleForm$groupRepos = app(RuleGroupRepositoryInterface::class);// get all currencies:- $list = $groupRepos->get();- $array = [];+ $list = $groupRepos->get();+ $array = [];/** @var RuleGroup $group */foreach ($list as $group) {@@ -57,15 +57,15 @@ class RuleForm*/public function ruleGroupListWithEmpty(string $name, $value = null, ?array $options = null): string{- $options ??= [];+ $options ??= [];$options['class'] = 'form-control';/** @var RuleGroupRepositoryInterface $groupRepos */- $groupRepos = app(RuleGroupRepositoryInterface::class);+ $groupRepos = app(RuleGroupRepositoryInterface::class);// get all currencies:- $list = $groupRepos->get();- $array = [+ $list = $groupRepos->get();+ $array = [0 => (string)trans('firefly.none_in_select_list'),];diff --git a/app/Support/Http/Api/AccountBalanceGrouped.php b/app/Support/Http/Api/AccountBalanceGrouped.phpindex 4c60e00870..e335da23eb 100644--- a/app/Support/Http/Api/AccountBalanceGrouped.php+++ b/app/Support/Http/Api/AccountBalanceGrouped.php@@ -67,7 +67,7 @@ class AccountBalanceGrouped/** @var array $currency */foreach ($this->data as $currency) {// income and expense array prepped:- $income = [+ $income = ['label' => 'earned','currency_id' => (string)$currency['currency_id'],'currency_symbol' => $currency['currency_symbol'],@@ -86,7 +86,7 @@ class AccountBalanceGrouped'entries' => [],'pc_entries' => [],];- $expense = [+ $expense = ['label' => 'spent','currency_id' => (string)$currency['currency_id'],'currency_symbol' => $currency['currency_symbol'],@@ -108,22 +108,22 @@ class AccountBalanceGrouped// loop all possible periods between $start and $end, and add them to the correct dataset.$currentStart = clone $this->start;while ($currentStart <= $this->end) {- $key = $currentStart->format($this->carbonFormat);- $label = $currentStart->toAtomString();+ $key = $currentStart->format($this->carbonFormat);+ $label = $currentStart->toAtomString();// normal entries- $income['entries'][$label] = Steam::bcround($currency[$key]['earned'] ?? '0', $currency['currency_decimal_places']);- $expense['entries'][$label] = Steam::bcround($currency[$key]['spent'] ?? '0', $currency['currency_decimal_places']);+ $income['entries'][$label] = Steam::bcround($currency[$key]['earned'] ?? '0', $currency['currency_decimal_places']);+ $expense['entries'][$label] = Steam::bcround($currency[$key]['spent'] ?? '0', $currency['currency_decimal_places']);// converted entries$income['pc_entries'][$label] = Steam::bcround($currency[$key]['pc_earned'] ?? '0', $currency['primary_currency_decimal_places']);$expense['pc_entries'][$label] = Steam::bcround($currency[$key]['pc_spent'] ?? '0', $currency['primary_currency_decimal_places']);// next loop- $currentStart = Navigation::addPeriod($currentStart, $this->preferredRange, 0);+ $currentStart = Navigation::addPeriod($currentStart, $this->preferredRange, 0);}- $chartData[] = $income;- $chartData[] = $expense;+ $chartData[] = $income;+ $chartData[] = $expense;}return $chartData;@@ -193,7 +193,7 @@ class AccountBalanceGroupedprivate function createDefaultDataEntry(array $journal): void{- $currencyId = (int)$journal['currency_id'];+ $currencyId = (int)$journal['currency_id'];$this->data[$currencyId] ??= ['currency_id' => (string)$currencyId,'currency_symbol' => $journal['currency_symbol'],@@ -210,8 +210,8 @@ class AccountBalanceGroupedprivate function createDefaultPeriodEntry(array $journal): void{- $currencyId = (int)$journal['currency_id'];- $period = $journal['date']->format($this->carbonFormat);+ $currencyId = (int)$journal['currency_id'];+ $period = $journal['date']->format($this->carbonFormat);$this->data[$currencyId][$period] ??= ['period' => $period,'spent' => '0',@@ -268,9 +268,9 @@ class AccountBalanceGroupedprivate function processJournal(array $journal): void{// format the date according to the period- $period = $journal['date']->format($this->carbonFormat);- $currencyId = (int)$journal['currency_id'];- $currency = $this->findCurrency($currencyId);+ $period = $journal['date']->format($this->carbonFormat);+ $currencyId = (int)$journal['currency_id'];+ $currency = $this->findCurrency($currencyId);// set the array with monetary info, if it does not exist.$this->createDefaultDataEntry($journal);@@ -278,12 +278,12 @@ class AccountBalanceGrouped$this->createDefaultPeriodEntry($journal);// is this journal's amount in- our outgoing?- $key = $this->getDataKey($journal);- $amount = 'spent' === $key ? Steam::negative($journal['amount']) : Steam::positive($journal['amount']);+ $key = $this->getDataKey($journal);+ $amount = 'spent' === $key ? Steam::negative($journal['amount']) : Steam::positive($journal['amount']);// get conversion rate- $rate = $this->getRate($currency, $journal['date']);- $amountConverted = bcmul($amount, $rate);+ $rate = $this->getRate($currency, $journal['date']);+ $amountConverted = bcmul($amount, $rate);// perhaps transaction already has the foreign amount in the primary currency.if ((int)$journal['foreign_currency_id'] === $this->primary->id) {@@ -292,7 +292,7 @@ class AccountBalanceGrouped}// add normal entry- $this->data[$currencyId][$period][$key] = bcadd((string)$this->data[$currencyId][$period][$key], $amount);+ $this->data[$currencyId][$period][$key] = bcadd((string)$this->data[$currencyId][$period][$key], $amount);// add converted entry$convertedKey = sprintf('pc_%s', $key);diff --git a/app/Support/Http/Api/ExchangeRateConverter.php b/app/Support/Http/Api/ExchangeRateConverter.phpindex 84d57a4649..d92313907a 100644--- a/app/Support/Http/Api/ExchangeRateConverter.php+++ b/app/Support/Http/Api/ExchangeRateConverter.php@@ -128,7 +128,7 @@ class ExchangeRateConverterif ($cache->has()) {return (int)$cache->get();}- $euro = Amount::getTransactionCurrencyByCode('EUR');+ $euro = Amount::getTransactionCurrencyByCode('EUR');++$this->queryCount;$cache->store($euro->id);@@ -144,13 +144,13 @@ class ExchangeRateConverterif ($euroId === $currency->id) {return '1';}- $rate = $this->getFromDB($currency->id, $euroId, $date->format('Y-m-d'));+ $rate = $this->getFromDB($currency->id, $euroId, $date->format('Y-m-d'));if (null !== $rate) {// app('log')->debug(sprintf('Rate for %s to EUR is %s.', $currency->code, $rate));return $rate;}- $rate = $this->getFromDB($euroId, $currency->id, $date->format('Y-m-d'));+ $rate = $this->getFromDB($euroId, $currency->id, $date->format('Y-m-d'));if (null !== $rate) {return bcdiv('1', $rate);// app('log')->debug(sprintf('Inverted rate for %s to EUR is %s.', $currency->code, $rate));@@ -175,7 +175,7 @@ class ExchangeRateConverterreturn '1';}- $key = sprintf('cer-%d-%d-%s', $from, $to, $date);+ $key = sprintf('cer-%d-%d-%s', $from, $to, $date);// perhaps the rate has been cached during this particular run$preparedRate = $this->prepared[$date][$from][$to] ?? null;@@ -185,7 +185,7 @@ class ExchangeRateConverterreturn $preparedRate;}- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($key);if ($cache->has()) {$rate = $cache->get();@@ -198,14 +198,15 @@ class ExchangeRateConverter}/** @var null|CurrencyExchangeRate $result */- $result = $this->userGroup->currencyExchangeRates()- ->where('from_currency_id', $from)- ->where('to_currency_id', $to)- ->where('date', '<=', $date)- ->orderBy('date', 'DESC')- ->first();+ $result = $this->userGroup->currencyExchangeRates()+ ->where('from_currency_id', $from)+ ->where('to_currency_id', $to)+ ->where('date', '<=', $date)+ ->orderBy('date', 'DESC')+ ->first()+ ;++$this->queryCount;- $rate = (string)$result?->rate;+ $rate = (string)$result?->rate;if ('' === $rate) {app('log')->debug(sprintf('ExchangeRateConverter: Found no rate for #%d->#%d (%s) in the DB.', $from, $to, $date));@@ -241,8 +242,8 @@ class ExchangeRateConverter*/private function getRate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string{- $key = $this->getCacheKey($from, $to, $date);- $res = Cache::get($key, null);+ $key = $this->getCacheKey($from, $to, $date);+ $res = Cache::get($key, null);// find in cacheif (null !== $res) {@@ -252,7 +253,7 @@ class ExchangeRateConverter}// find in database- $rate = $this->getFromDB($from->id, $to->id, $date->format('Y-m-d'));+ $rate = $this->getFromDB($from->id, $to->id, $date->format('Y-m-d'));if (null !== $rate) {Cache::forever($key, $rate);Log::debug(sprintf('ExchangeRateConverter: Return DB rate from %s to %s on %s.', $from->code, $to->code, $date->format('Y-m-d')));@@ -261,7 +262,7 @@ class ExchangeRateConverter}// find reverse in database- $rate = $this->getFromDB($to->id, $from->id, $date->format('Y-m-d'));+ $rate = $this->getFromDB($to->id, $from->id, $date->format('Y-m-d'));if (null !== $rate) {$rate = bcdiv('1', $rate);Cache::forever($key, $rate);diff --git a/app/Support/Http/Api/SummaryBalanceGrouped.php b/app/Support/Http/Api/SummaryBalanceGrouped.phpindex 8f88dba7d5..e4fdb41b68 100644--- a/app/Support/Http/Api/SummaryBalanceGrouped.php+++ b/app/Support/Http/Api/SummaryBalanceGrouped.php@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Log;class SummaryBalanceGrouped{- private const string SUM = 'sum';+ private const string SUM = 'sum';private array $amounts = [];private array $currencies;private readonly CurrencyRepositoryInterface $currencyRepository;@@ -48,9 +48,9 @@ class SummaryBalanceGroupedpublic function groupData(): array{Log::debug('Now going to group data.');- $return = [];+ $return = [];foreach ($this->keys as $key) {- $title = match ($key) {+ $title = match ($key) {'sum' => 'balance','expense' => 'spent','income' => 'earned',@@ -109,11 +109,11 @@ class SummaryBalanceGrouped/** @var array $journal */foreach ($journals as $journal) {// transaction info:- $currencyId = (int)$journal['currency_id'];- $amount = bcmul((string)$journal['amount'], $multiplier);- $currency = $this->currencies[$currencyId] ?? Amount::getTransactionCurrencyById($currencyId);- $this->currencies[$currencyId] = $currency;- $pcAmount = $converter->convert($currency, $this->default, $journal['date'], $amount);+ $currencyId = (int)$journal['currency_id'];+ $amount = bcmul((string)$journal['amount'], $multiplier);+ $currency = $this->currencies[$currencyId] ?? Amount::getTransactionCurrencyById($currencyId);+ $this->currencies[$currencyId] = $currency;+ $pcAmount = $converter->convert($currency, $this->default, $journal['date'], $amount);if ((int)$journal['foreign_currency_id'] === $this->default->id) {// use foreign amount instead$pcAmount = $journal['foreign_amount'];diff --git a/app/Support/Http/Api/ValidatesUserGroupTrait.php b/app/Support/Http/Api/ValidatesUserGroupTrait.phpindex 0ce08c97ed..3d17a7b42c 100644--- a/app/Support/Http/Api/ValidatesUserGroupTrait.php+++ b/app/Support/Http/Api/ValidatesUserGroupTrait.php@@ -59,8 +59,8 @@ trait ValidatesUserGroupTrait}/** @var User $user */- $user = auth()->user();- $groupId = 0;+ $user = auth()->user();+ $groupId = 0;if (!$request->has('user_group_id')) {$groupId = (int)$user->user_group_id;Log::debug(sprintf('validateUserGroup: no user group submitted, use default group #%d.', $groupId));@@ -71,7 +71,7 @@ trait ValidatesUserGroupTrait}/** @var UserGroupRepositoryInterface $repository */- $repository = app(UserGroupRepositoryInterface::class);+ $repository = app(UserGroupRepositoryInterface::class);$repository->setUser($user);$memberships = $repository->getMembershipsFromGroupId($groupId);@@ -82,14 +82,14 @@ trait ValidatesUserGroupTrait}// need to get the group from the membership:- $group = $repository->getById($groupId);+ $group = $repository->getById($groupId);if (null === $group) {Log::debug(sprintf('validateUserGroup: group #%d does not exist.', $groupId));throw new AuthorizationException((string)trans('validation.belongs_user_or_user_group'));}Log::debug(sprintf('validateUserGroup: validate access of user to group #%d ("%s").', $groupId, $group->title));- $roles = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : []; // @phpstan-ignore-line+ $roles = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : []; // @phpstan-ignore-lineif (0 === count($roles)) {Log::debug('validateUserGroup: no roles defined, so no access.');diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex aa3883244f..2046b7e5b2 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -56,10 +56,10 @@ trait AugumentData/** @var Account $expenseAccount */foreach ($accounts as $expenseAccount) {- $collection = new Collection();+ $collection = new Collection();$collection->push($expenseAccount);- $revenue = $repository->findByName($expenseAccount->name, [AccountTypeEnum::REVENUE->value]);+ $revenue = $repository->findByName($expenseAccount->name, [AccountTypeEnum::REVENUE->value]);if (null !== $revenue) {$collection->push($revenue);}@@ -116,7 +116,7 @@ trait AugumentData$return[$accountId] = $grouped[$accountId][0]['name'];}}- $return[0] = '(no name)';+ $return[0] = '(no name)';return $return;}@@ -136,7 +136,7 @@ trait AugumentData$return[$budgetId] = $grouped[$budgetId][0]['name'];}}- $return[0] = (string)trans('firefly.no_budget');+ $return[0] = (string)trans('firefly.no_budget');return $return;}@@ -158,7 +158,7 @@ trait AugumentData$return[$categoryId] = $grouped[$categoryId][0]['name'];}}- $return[0] = (string)trans('firefly.no_category');+ $return[0] = (string)trans('firefly.no_category');return $return;}@@ -171,14 +171,14 @@ trait AugumentDataLog::debug('In getLimits');/** @var OperationsRepositoryInterface $opsRepository */- $opsRepository = app(OperationsRepositoryInterface::class);+ $opsRepository = app(OperationsRepositoryInterface::class);/** @var BudgetLimitRepositoryInterface $blRepository */- $blRepository = app(BudgetLimitRepositoryInterface::class);+ $blRepository = app(BudgetLimitRepositoryInterface::class);$end->endOfMonth();// properties for cache- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty($budget->id);@@ -189,25 +189,25 @@ trait AugumentDatareturn $cache->get();}- $set = $blRepository->getBudgetLimits($budget, $start, $end);+ $set = $blRepository->getBudgetLimits($budget, $start, $end);$budgetCollection = new Collection()->push($budget);// merge sets based on a key, in case of convert to primary currency- $limits = new Collection();+ $limits = new Collection();/** @var BudgetLimit $entry */foreach ($set as $entry) {Log::debug(sprintf('Now at budget limit #%d', $entry->id));- $currency = $entry->transactionCurrency;+ $currency = $entry->transactionCurrency;if ($this->convertToPrimary) {// the sumExpenses method already handles this.$currency = $this->primaryCurrency;}// clone because these objects change each other.- $currentStart = clone $entry->start_date;- $currentEnd = null === $entry->end_date ? null : clone $entry->end_date;+ $currentStart = clone $entry->start_date;+ $currentEnd = null === $entry->end_date ? null : clone $entry->end_date;if (null === $currentEnd) {$currentEnd = clone $currentStart;@@ -219,9 +219,9 @@ trait AugumentData$entry->pc_spent = $spent;// normal amount:- $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, false);- $spent = $expenses[$entry->transactionCurrency->id]['sum'] ?? '0';- $entry->spent = $spent;+ $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, false);+ $spent = $expenses[$entry->transactionCurrency->id]['sum'] ?? '0';+ $entry->spent = $spent;$limits->push($entry);}@@ -240,7 +240,7 @@ trait AugumentData/** @var array $journal */foreach ($array as $journal) {- $name = '(no name)';+ $name = '(no name)';if (TransactionTypeEnum::WITHDRAWAL->value === $journal['transaction_type_type']) {$name = $journal['destination_account_name'];}@@ -263,16 +263,16 @@ trait AugumentData/** @var GroupCollectorInterface $collector */$collector = app(GroupCollectorInterface::class);- $total = $assets->merge($opposing);+ $total = $assets->merge($opposing);$collector->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setAccounts($total);- $journals = $collector->getExtractedJournals();- $sum = [+ $journals = $collector->getExtractedJournals();+ $sum = ['grand_sum' => '0','per_currency' => [],];// loop to support multi currencyforeach ($journals as $journal) {- $currencyId = (int)$journal['currency_id'];+ $currencyId = (int)$journal['currency_id'];// if not set, set to zero:if (!array_key_exists($currencyId, $sum['per_currency'])) {diff --git a/app/Support/Http/Controllers/ChartGeneration.php b/app/Support/Http/Controllers/ChartGeneration.phpindex 7fe3b3ab96..c117c51171 100644--- a/app/Support/Http/Controllers/ChartGeneration.php+++ b/app/Support/Http/Controllers/ChartGeneration.php@@ -59,28 +59,28 @@ trait ChartGenerationreturn $cache->get();}Log::debug('Regenerate chart.account.account-balance-chart from scratch.');- $locale = app('steam')->getLocale();+ $locale = app('steam')->getLocale();/** @var GeneratorInterface $generator */- $generator = app(GeneratorInterface::class);+ $generator = app(GeneratorInterface::class);/** @var AccountRepositoryInterface $accountRepos */- $accountRepos = app(AccountRepositoryInterface::class);+ $accountRepos = app(AccountRepositoryInterface::class);- $primary = app('amount')->getPrimaryCurrency();- $chartData = [];+ $primary = app('amount')->getPrimaryCurrency();+ $chartData = [];Log::debug(sprintf('Start of accountBalanceChart(list, %s, %s)', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));/** @var Account $account */foreach ($accounts as $account) {Log::debug(sprintf('Now at account #%d ("%s)', $account->id, $account->name));- $currency = $accountRepos->getAccountCurrency($account) ?? $primary;- $usePrimary = $convertToPrimary && $primary->id !== $currency->id;- $field = $convertToPrimary ? 'pc_balance' : 'balance';- $currency = $usePrimary ? $primary : $currency;+ $currency = $accountRepos->getAccountCurrency($account) ?? $primary;+ $usePrimary = $convertToPrimary && $primary->id !== $currency->id;+ $field = $convertToPrimary ? 'pc_balance' : 'balance';+ $currency = $usePrimary ? $primary : $currency;Log::debug(sprintf('Will use field %s', $field));- $currentSet = [+ $currentSet = ['label' => $account->name,'currency_symbol' => $currency->symbol,'entries' => [],@@ -91,16 +91,16 @@ trait ChartGeneration$previous = array_values($range)[0];Log::debug(sprintf('Start balance for account #%d ("%s) is', $account->id, $account->name), $previous);while ($currentStart <= $end) {- $format = $currentStart->format('Y-m-d');- $label = trim($currentStart->isoFormat((string)trans('config.month_and_day_js', [], $locale)));- $balance = $range[$format] ?? $previous;- $previous = $balance;+ $format = $currentStart->format('Y-m-d');+ $label = trim($currentStart->isoFormat((string)trans('config.month_and_day_js', [], $locale)));+ $balance = $range[$format] ?? $previous;+ $previous = $balance;$currentStart->addDay();$currentSet['entries'][$label] = $balance[$field] ?? '0';}- $chartData[] = $currentSet;+ $chartData[] = $currentSet;}- $data = $generator->multiSet($chartData);+ $data = $generator->multiSet($chartData);$cache->store($data);return $data;diff --git a/app/Support/Http/Controllers/CreateStuff.php b/app/Support/Http/Controllers/CreateStuff.phpindex c54d585328..a69c44ac54 100644--- a/app/Support/Http/Controllers/CreateStuff.php+++ b/app/Support/Http/Controllers/CreateStuff.php@@ -32,6 +32,7 @@ use FireflyIII\User;use Illuminate\Support\Facades\Log;use Laravel\Passport\Passport;use phpseclib3\Crypt\RSA;+use function Safe\file_put_contents;/**@@ -103,7 +104,7 @@ trait CreateStuffreturn;}- $key = RSA::createKey(4096);+ $key = RSA::createKey(4096);Log::alert('NO OAuth keys were found. They have been created.');diff --git a/app/Support/Http/Controllers/DateCalculation.php b/app/Support/Http/Controllers/DateCalculation.phpindex 83baefcf8b..69c30c77d3 100644--- a/app/Support/Http/Controllers/DateCalculation.php+++ b/app/Support/Http/Controllers/DateCalculation.php@@ -90,19 +90,19 @@ trait DateCalculationprotected function getNextPeriods(Carbon $date, string $range): array{// select thing for next 12 periods:- $loop = [];+ $loop = [];/** @var Carbon $current */$current = app('navigation')->startOfPeriod($date, $range);$current = app('navigation')->endOfPeriod($current, $range);$current->addDay();- $count = 0;+ $count = 0;while ($count < 12) {$current = app('navigation')->endOfPeriod($current, $range);$currentStart = app('navigation')->startOfPeriod($current, $range);- $loop[] = [+ $loop[] = ['label' => $current->format('Y-m-d'),'title' => app('navigation')->periodShow($current, $range),'start' => clone $currentStart,@@ -122,7 +122,7 @@ trait DateCalculationprotected function getPreviousPeriods(Carbon $date, string $range): array{// select thing for last 12 periods:- $loop = [];+ $loop = [];/** @var Carbon $current */$current = app('navigation')->startOfPeriod($date, $range);diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.phpindex d1005bfdcb..b0bb16b3f1 100644--- a/app/Support/Http/Controllers/GetConfigurationData.php+++ b/app/Support/Http/Controllers/GetConfigurationData.php@@ -61,13 +61,13 @@ trait GetConfigurationData$steps = [];if (is_array($elements) && count($elements) > 0) {foreach ($elements as $key => $options) {- $currentStep = $options;+ $currentStep = $options;// get the text:- $currentStep['intro'] = (string)trans('intro.' . $route . '_' . $key);+ $currentStep['intro'] = (string)trans('intro.'.$route.'_'.$key);// save in array:- $steps[] = $currentStep;+ $steps[] = $currentStep;}}app('log')->debug(sprintf('Total basic steps for %s is %d', $routeKey, count($steps)));@@ -82,22 +82,22 @@ trait GetConfigurationData*/protected function getDateRangeConfig(): array // get configuration + get preferences.{- $viewRange = app('navigation')->getViewRange(false);+ $viewRange = app('navigation')->getViewRange(false);Log::debug(sprintf('dateRange: the view range is "%s"', $viewRange));/** @var Carbon $start */- $start = session('start');+ $start = session('start');/** @var Carbon $end */- $end = session('end');+ $end = session('end');/** @var Carbon $first */- $first = session('first');- $title = sprintf('%s - %s', $start->isoFormat($this->monthAndDayFormat), $end->isoFormat($this->monthAndDayFormat));- $isCustom = true === session('is_custom_range', false);- $today = today(config('app.timezone'));- $ranges = [+ $first = session('first');+ $title = sprintf('%s - %s', $start->isoFormat($this->monthAndDayFormat), $end->isoFormat($this->monthAndDayFormat));+ $isCustom = true === session('is_custom_range', false);+ $today = today(config('app.timezone'));+ $ranges = [// first range is the current range:$title => [$start, $end],];@@ -127,10 +127,10 @@ trait GetConfigurationData// today:/** @var Carbon $todayStart */- $todayStart = app('navigation')->startOfPeriod($today, $viewRange);+ $todayStart = app('navigation')->startOfPeriod($today, $viewRange);/** @var Carbon $todayEnd */- $todayEnd = app('navigation')->endOfPeriod($todayStart, $viewRange);+ $todayEnd = app('navigation')->endOfPeriod($todayStart, $viewRange);if ($todayStart->ne($start) || $todayEnd->ne($end)) {$ranges[ucfirst((string)trans('firefly.today'))] = [$todayStart, $todayEnd];@@ -186,16 +186,16 @@ trait GetConfigurationData// user is on page with specific instructions:if ('' !== $specificPage) {$routeKey = str_replace('.', '_', $route);- $elements = config(sprintf('intro.%s', $routeKey . '_' . $specificPage));+ $elements = config(sprintf('intro.%s', $routeKey.'_'.$specificPage));if (is_array($elements) && count($elements) > 0) {foreach ($elements as $key => $options) {- $currentStep = $options;+ $currentStep = $options;// get the text:- $currentStep['intro'] = (string)trans('intro.' . $route . '_' . $specificPage . '_' . $key);+ $currentStep['intro'] = (string)trans('intro.'.$route.'_'.$specificPage.'_'.$key);// save in array:- $steps[] = $currentStep;+ $steps[] = $currentStep;}}}diff --git a/app/Support/Http/Controllers/ModelInformation.php b/app/Support/Http/Controllers/ModelInformation.phpindex 152c9671ef..093120cf7a 100644--- a/app/Support/Http/Controllers/ModelInformation.php+++ b/app/Support/Http/Controllers/ModelInformation.php@@ -75,14 +75,14 @@ trait ModelInformationprotected function getLiabilityTypes(): array{/** @var AccountRepositoryInterface $repository */- $repository = app(AccountRepositoryInterface::class);+ $repository = app(AccountRepositoryInterface::class);// types of liability:/** @var AccountType $debt */- $debt = $repository->getAccountTypeByType(AccountTypeEnum::DEBT->value);+ $debt = $repository->getAccountTypeByType(AccountTypeEnum::DEBT->value);/** @var AccountType $loan */- $loan = $repository->getAccountTypeByType(AccountTypeEnum::LOAN->value);+ $loan = $repository->getAccountTypeByType(AccountTypeEnum::LOAN->value);/** @var AccountType $mortgage */$mortgage = $repository->getAccountTypeByType(AccountTypeEnum::MORTGAGE->value);@@ -114,8 +114,8 @@ trait ModelInformationprotected function getTriggersForBill(Bill $bill): array // get info and argument{// TODO duplicate code- $operators = config('search.operators');- $triggers = [];+ $operators = config('search.operators');+ $triggers = [];foreach ($operators as $key => $operator) {if ('user_action' !== $key && false === $operator['alias']) {$triggers[$key] = (string)trans(sprintf('firefly.rule_trigger_%s_choice', $key));@@ -165,8 +165,8 @@ trait ModelInformationprivate function getTriggersForJournal(TransactionJournal $journal): array{// TODO duplicated code.- $operators = config('search.operators');- $triggers = [];+ $operators = config('search.operators');+ $triggers = [];foreach ($operators as $key => $operator) {if ('user_action' !== $key && false === $operator['alias']) {$triggers[$key] = (string)trans(sprintf('firefly.rule_trigger_%s_choice', $key));@@ -174,18 +174,18 @@ trait ModelInformation}asort($triggers);- $result = [];- $journalTriggers = [];- $values = [];- $index = 0;+ $result = [];+ $journalTriggers = [];+ $values = [];+ $index = 0;// amount, description, category, budget, tags, source, destination, notes, currency type// ,type/** @var null|Transaction $source */- $source = $journal->transactions()->where('amount', '<', 0)->first();+ $source = $journal->transactions()->where('amount', '<', 0)->first();/** @var null|Transaction $destination */- $destination = $journal->transactions()->where('amount', '>', 0)->first();+ $destination = $journal->transactions()->where('amount', '>', 0)->first();if (null === $destination || null === $source) {return $result;}@@ -220,21 +220,21 @@ trait ModelInformation++$index;// category (if)- $category = $journal->categories()->first();+ $category = $journal->categories()->first();if (null !== $category) {$journalTriggers[$index] = 'category_is';$values[$index] = $category->name;++$index;}// budget (if)- $budget = $journal->budgets()->first();+ $budget = $journal->budgets()->first();if (null !== $budget) {$journalTriggers[$index] = 'budget_is';$values[$index] = $budget->name;++$index;}// tags (if)- $tags = $journal->tags()->get();+ $tags = $journal->tags()->get();/** @var Tag $tag */foreach ($tags as $tag) {@@ -243,7 +243,7 @@ trait ModelInformation++$index;}// notes (if)- $notes = $journal->notes()->first();+ $notes = $journal->notes()->first();if (null !== $notes) {$journalTriggers[$index] = 'notes_is';$values[$index] = $notes->text;diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.phpindex 9012e471b9..6af3f30b6f 100644--- a/app/Support/Http/Controllers/PeriodOverview.php+++ b/app/Support/Http/Controllers/PeriodOverview.php@@ -88,12 +88,12 @@ trait PeriodOverview$this->accountRepository = app(AccountRepositoryInterface::class);$this->periodStatisticRepo = app(PeriodStatisticRepositoryInterface::class);$range = Navigation::getViewRange(true);- [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];+ [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- [$start, $end] = $this->getPeriodFromBlocks($dates, $start, $end);- $this->statistics = $this->periodStatisticRepo->allInRangeForModel($account, $start, $end);+ $dates = Navigation::blockPeriods($start, $end, $range);+ [$start, $end] = $this->getPeriodFromBlocks($dates, $start, $end);+ $this->statistics = $this->periodStatisticRepo->allInRangeForModel($account, $start, $end);// TODO needs to be re-arranged:// get all period stats for entire range.@@ -101,7 +101,7 @@ trait PeriodOverview// create new ones, or use collected.- $entries = [];+ $entries = [];Log::debug(sprintf('Count of loops: %d', count($dates)));foreach ($dates as $currentDate) {$entries[] = $this->getSingleAccountPeriod($account, $currentDate['period'], $currentDate['start'], $currentDate['end']);@@ -137,11 +137,11 @@ trait PeriodOverview*/protected function getCategoryPeriodOverview(Category $category, Carbon $start, Carbon $end): array{- $range = Navigation::getViewRange(true);+ $range = Navigation::getViewRange(true);[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];// properties for entries with their amounts.- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty($range);@@ -153,32 +153,32 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// collect all expenses in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setCategory($category);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);- $earnedSet = $collector->getExtractedJournals();+ $earnedSet = $collector->getExtractedJournals();// collect all income in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setCategory($category);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $spentSet = $collector->getExtractedJournals();+ $spentSet = $collector->getExtractedJournals();// collect all transfers in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setCategory($category);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);- $transferSet = $collector->getExtractedJournals();+ $transferSet = $collector->getExtractedJournals();foreach ($dates as $currentDate) {$spent = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']);$earned = $this->filterJournalsByDate($earnedSet, $currentDate['start'], $currentDate['end']);@@ -186,17 +186,17 @@ trait PeriodOverview$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'transactions' => 0,- 'title' => $title,- 'route' => route(- 'categories.show',- [$category->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]- ),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ 'transactions' => 0,+ 'title' => $title,+ 'route' => route(+ 'categories.show',+ [$category->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]+ ),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];}$cache->store($entries);@@ -212,11 +212,11 @@ trait PeriodOverview*/protected function getNoBudgetPeriodOverview(Carbon $start, Carbon $end): array{- $range = Navigation::getViewRange(true);+ $range = Navigation::getViewRange(true);[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty($this->convertToPrimary);@@ -227,28 +227,28 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// get all expenses without a budget./** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setRange($start, $end)->withoutBudget()->withAccountInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $journals = $collector->getExtractedJournals();+ $journals = $collector->getExtractedJournals();foreach ($dates as $currentDate) {$set = $this->filterJournalsByDate($journals, $currentDate['start'], $currentDate['end']);$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'title' => $title,- 'route' => route('budgets.no-budget', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),- 'total_transactions' => count($set),- 'spent' => $this->groupByCurrency($set),- 'earned' => [],- 'transferred_away' => [],- 'transferred_in' => [],- ];+ 'title' => $title,+ 'route' => route('budgets.no-budget', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),+ 'total_transactions' => count($set),+ 'spent' => $this->groupByCurrency($set),+ 'earned' => [],+ 'transferred_away' => [],+ 'transferred_in' => [],+ ];}$cache->store($entries);@@ -265,38 +265,38 @@ trait PeriodOverviewprotected function getNoCategoryPeriodOverview(Carbon $theDate): array{Log::debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d')));- $range = Navigation::getViewRange(true);- $first = $this->journalRepos->firstNull();- $start = null === $first ? new Carbon() : $first->date;- $end = clone $theDate;- $end = Navigation::endOfPeriod($end, $range);+ $range = Navigation::getViewRange(true);+ $first = $this->journalRepos->firstNull();+ $start = null === $first ? new Carbon() : $first->date;+ $end = clone $theDate;+ $end = Navigation::endOfPeriod($end, $range);Log::debug(sprintf('Start for getNoCategoryPeriodOverview() is %s', $start->format('Y-m-d')));Log::debug(sprintf('End for getNoCategoryPeriodOverview() is %s', $end->format('Y-m-d')));// properties for cache- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// collect all expenses in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->withoutCategory();$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);- $earnedSet = $collector->getExtractedJournals();+ $earnedSet = $collector->getExtractedJournals();// collect all income in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->withoutCategory();$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $spentSet = $collector->getExtractedJournals();+ $spentSet = $collector->getExtractedJournals();// collect all transfers in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->withoutCategory();$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);@@ -310,13 +310,13 @@ trait PeriodOverview$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'title' => $title,- 'route' => route('categories.no-category', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ 'title' => $title,+ 'route' => route('categories.no-category', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];}Log::debug('End of loops');@@ -333,7 +333,7 @@ trait PeriodOverview'total_transactions' => 0,];foreach ($types as $type) {- $set = $this->getSingleAccountPeriodByType($account, $start, $end, $type);+ $set = $this->getSingleAccountPeriodByType($account, $start, $end, $type);$return['total_transactions'] += $set['count'];unset($set['count']);$return[$type] = $set;@@ -353,6 +353,7 @@ trait PeriodOverviewecho sprintf('End: "%s" vs "%s": %s', $statistic->end->toW3cString(), $end->toW3cString(), var_export($statistic->end->eq($end), true));var_dump($statistic->end);var_dump($end);+exit;}@@ -398,21 +399,21 @@ trait PeriodOverview}// each result must be grouped by currency, then saved as period statistic.Log::debug(sprintf('Going to group %d found journal(s)', count($result)));- $grouped = $this->groupByCurrency($result);+ $grouped = $this->groupByCurrency($result);$this->saveGroupedAsStatistics($account, $start, $end, $type, $grouped);return $grouped;}- $grouped = [+ $grouped = ['count' => 0,];/** @var PeriodStatistic $statistic */foreach ($statistics as $statistic) {- $id = (int)$statistic->transaction_currency_id;- $currency = Amount::getTransactionCurrencyById($id);- $grouped[$id] = [+ $id = (int)$statistic->transaction_currency_id;+ $currency = Amount::getTransactionCurrencyById($id);+ $grouped[$id] = ['amount' => (string)$statistic->amount,'count' => (int)$statistic->count,'currency_id' => $currency->id,@@ -434,11 +435,11 @@ trait PeriodOverview*/protected function getTagPeriodOverview(Tag $tag, Carbon $start, Carbon $end): array // period overview for tags.{- $range = Navigation::getViewRange(true);+ $range = Navigation::getViewRange(true);[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];// properties for cache- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty('tag-period-entries');@@ -448,37 +449,37 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// collect all expenses in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTag($tag);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);- $earnedSet = $collector->getExtractedJournals();+ $earnedSet = $collector->getExtractedJournals();// collect all income in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTag($tag);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $spentSet = $collector->getExtractedJournals();+ $spentSet = $collector->getExtractedJournals();// collect all transfers in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTag($tag);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);- $transferSet = $collector->getExtractedJournals();+ $transferSet = $collector->getExtractedJournals();// filer all of them:- $earnedSet = $this->filterJournalsByTag($earnedSet, $tag);- $spentSet = $this->filterJournalsByTag($spentSet, $tag);- $transferSet = $this->filterJournalsByTag($transferSet, $tag);+ $earnedSet = $this->filterJournalsByTag($earnedSet, $tag);+ $spentSet = $this->filterJournalsByTag($spentSet, $tag);+ $transferSet = $this->filterJournalsByTag($transferSet, $tag);foreach ($dates as $currentDate) {$spent = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']);@@ -487,17 +488,17 @@ trait PeriodOverview$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'transactions' => 0,- 'title' => $title,- 'route' => route(- 'tags.show',- [$tag->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]- ),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ 'transactions' => 0,+ 'title' => $title,+ 'route' => route(+ 'tags.show',+ [$tag->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]+ ),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];}return $entries;@@ -508,12 +509,12 @@ trait PeriodOverview*/protected function getTransactionPeriodOverview(string $transactionType, Carbon $start, Carbon $end): array{- $range = Navigation::getViewRange(true);- $types = config(sprintf('firefly.transactionTypesByType.%s', $transactionType));+ $range = Navigation::getViewRange(true);+ $types = config(sprintf('firefly.transactionTypesByType.%s', $transactionType));[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];// properties for cache- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty('transactions-period-entries');@@ -523,16 +524,16 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];- $spent = [];- $earned = [];- $transferred = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];+ $spent = [];+ $earned = [];+ $transferred = [];// collect all journals in this period (regardless of type)- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTypes($types)->setRange($start, $end);- $genericSet = $collector->getExtractedJournals();- $loops = 0;+ $genericSet = $collector->getExtractedJournals();+ $loops = 0;foreach ($dates as $currentDate) {$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);@@ -550,14 +551,14 @@ trait PeriodOverview}}$entries[]- = [- 'title' => $title,- 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ = [+ 'title' => $title,+ 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];++$loops;}@@ -598,7 +599,7 @@ trait PeriodOverview{$return = [];foreach ($set as $entry) {- $found = false;+ $found = false;/** @var array $localTag */foreach ($entry['tags'] as $localTag) {@@ -713,13 +714,13 @@ trait PeriodOverviewexit;}- $currencyId = (int)$journal['currency_id'];- $currencyCode = $journal['currency_code'];- $currencyName = $journal['currency_name'];- $currencySymbol = $journal['currency_symbol'];- $currencyDecimalPlaces = $journal['currency_decimal_places'];- $foreignCurrencyId = $journal['foreign_currency_id'];- $amount = $journal['amount'] ?? '0';+ $currencyId = (int)$journal['currency_id'];+ $currencyCode = $journal['currency_code'];+ $currencyName = $journal['currency_name'];+ $currencySymbol = $journal['currency_symbol'];+ $currencyDecimalPlaces = $journal['currency_decimal_places'];+ $foreignCurrencyId = $journal['foreign_currency_id'];+ $amount = $journal['amount'] ?? '0';if ($this->convertToPrimary && $currencyId !== $this->primaryCurrency->id && $foreignCurrencyId !== $this->primaryCurrency->id) {$amount = $journal['pc_amount'] ?? '0';diff --git a/app/Support/Http/Controllers/RenderPartialViews.php b/app/Support/Http/Controllers/RenderPartialViews.phpindex 05ff99e38b..f7d5df7cb8 100644--- a/app/Support/Http/Controllers/RenderPartialViews.php+++ b/app/Support/Http/Controllers/RenderPartialViews.php@@ -52,20 +52,20 @@ trait RenderPartialViewsprotected function budgetEntry(array $attributes): string // generate view for report.{/** @var PopupReportInterface $popupHelper */- $popupHelper = app(PopupReportInterface::class);+ $popupHelper = app(PopupReportInterface::class);/** @var BudgetRepositoryInterface $budgetRepository */$budgetRepository = app(BudgetRepositoryInterface::class);$budget = $budgetRepository->find((int)$attributes['budgetId']);- $accountRepos = app(AccountRepositoryInterface::class);- $account = $accountRepos->find((int)$attributes['accountId']);+ $accountRepos = app(AccountRepositoryInterface::class);+ $account = $accountRepos->find((int)$attributes['accountId']);if (null === $budget || null === $account) {throw new FireflyException('Could not render popup.report.balance-amount because budget or account is null.');}- $journals = $popupHelper->balanceForBudget($budget, $account, $attributes);+ $journals = $popupHelper->balanceForBudget($budget, $account, $attributes);try {$view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();@@ -113,14 +113,14 @@ trait RenderPartialViews$budgetRepository = app(BudgetRepositoryInterface::class);/** @var PopupReportInterface $popupHelper */- $popupHelper = app(PopupReportInterface::class);+ $popupHelper = app(PopupReportInterface::class);- $budget = $budgetRepository->find((int)$attributes['budgetId']);+ $budget = $budgetRepository->find((int)$attributes['budgetId']);if (null === $budget) {// transactions without a budget.$budget = new Budget();}- $journals = $popupHelper->byBudget($budget, $attributes);+ $journals = $popupHelper->byBudget($budget, $attributes);try {$view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();@@ -142,7 +142,7 @@ trait RenderPartialViewsprotected function categoryEntry(array $attributes): string // generate view for report.{/** @var PopupReportInterface $popupHelper */- $popupHelper = app(PopupReportInterface::class);+ $popupHelper = app(PopupReportInterface::class);/** @var CategoryRepositoryInterface $categoryRepository */$categoryRepository = app(CategoryRepositoryInterface::class);@@ -237,15 +237,15 @@ trait RenderPartialViews$accountRepository = app(AccountRepositoryInterface::class);/** @var PopupReportInterface $popupHelper */- $popupHelper = app(PopupReportInterface::class);+ $popupHelper = app(PopupReportInterface::class);- $account = $accountRepository->find((int)$attributes['accountId']);+ $account = $accountRepository->find((int)$attributes['accountId']);if (null === $account) {return 'This is an unknown account. Apologies.';}- $journals = $popupHelper->byExpenses($account, $attributes);+ $journals = $popupHelper->byExpenses($account, $attributes);try {$view = view('popup.report.expense-entry', compact('journals', 'account'))->render();@@ -266,8 +266,8 @@ trait RenderPartialViews*/protected function getCurrentActions(Rule $rule): array // get info from object and present.{- $index = 0;- $actions = [];+ $index = 0;+ $actions = [];// must be repos$currentActions = $rule->ruleActions()->orderBy('order', 'ASC')->get();@@ -306,8 +306,8 @@ trait RenderPartialViewsprotected function getCurrentTriggers(Rule $rule): array // get info from object and present.{// TODO duplicated code.- $operators = config('search.operators');- $triggers = [];+ $operators = config('search.operators');+ $triggers = [];foreach ($operators as $key => $operator) {if ('user_action' !== $key && false === $operator['alias']) {$triggers[$key] = (string)trans(sprintf('firefly.rule_trigger_%s_choice', $key));@@ -325,7 +325,7 @@ trait RenderPartialViews$count = ($index + 1);try {- $rootOperator = OperatorQuerySearch::getRootOperator((string)$entry->trigger_type);+ $rootOperator = OperatorQuerySearch::getRootOperator((string)$entry->trigger_type);if (str_starts_with($rootOperator, '-')) {$rootOperator = substr($rootOperator, 1);}@@ -365,14 +365,14 @@ trait RenderPartialViews$accountRepository = app(AccountRepositoryInterface::class);/** @var PopupReportInterface $popupHelper */- $popupHelper = app(PopupReportInterface::class);- $account = $accountRepository->find((int)$attributes['accountId']);+ $popupHelper = app(PopupReportInterface::class);+ $account = $accountRepository->find((int)$attributes['accountId']);if (null === $account) {return 'This is an unknown category. Apologies.';}- $journals = $popupHelper->byIncome($account, $attributes);+ $journals = $popupHelper->byIncome($account, $attributes);try {$view = view('popup.report.income-entry', compact('journals', 'account'))->render();diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.phpindex b7600f778a..39a6df3aff 100644--- a/app/Support/Http/Controllers/RequestInformation.php+++ b/app/Support/Http/Controllers/RequestInformation.php@@ -35,6 +35,7 @@ use Illuminate\Routing\Route;use Illuminate\Support\Facades\Hash;use Illuminate\Support\Facades\Route as RouteFacade;use Illuminate\Support\Facades\Validator;+use function Safe\parse_url;/**@@ -100,13 +101,13 @@ trait RequestInformation$page = $this->getPageName();$specificPage = $this->getSpecificPageName();// indicator if user has seen the help for this page ( + special page):- $key = sprintf('shown_demo_%s%s', $page, $specificPage);+ $key = sprintf('shown_demo_%s%s', $page, $specificPage);// is there an intro for this route?$intro = config(sprintf('intro.%s', $page)) ?? [];$specialIntro = config(sprintf('intro.%s%s', $page, $specificPage)) ?? [];// some routes have a "what" parameter, which indicates a special page:- $shownDemo = true;+ $shownDemo = true;// both must be array and either must be > 0if (count($intro) > 0 || count($specialIntro) > 0) {$shownDemo = app('preferences')->get($key, false)->data;@@ -127,7 +128,7 @@ trait RequestInformation$start = session('start', today(config('app.timezone'))->startOfMonth());/** @var Carbon $end */- $end = session('end', today(config('app.timezone'))->endOfMonth());+ $end = session('end', today(config('app.timezone'))->endOfMonth());if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {return true;}@@ -145,20 +146,20 @@ trait RequestInformationfinal protected function parseAttributes(array $attributes): array // parse input + return result{$attributes['location'] ??= '';- $attributes['accounts'] = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get', '', []));- $date = Carbon::createFromFormat('Ymd', $attributes['startDate']);+ $attributes['accounts'] = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get', '', []));+ $date = Carbon::createFromFormat('Ymd', $attributes['startDate']);if (!$date instanceof Carbon) {$date = today(config('app.timezone'));}$date->startOfMonth();$attributes['startDate'] = $date;- $date2 = Carbon::createFromFormat('Ymd', $attributes['endDate']);+ $date2 = Carbon::createFromFormat('Ymd', $attributes['endDate']);if (!$date2 instanceof Carbon) {$date2 = today(config('app.timezone'));}$date2->endOfDay();- $attributes['endDate'] = $date2;+ $attributes['endDate'] = $date2;return $attributes;}diff --git a/app/Support/Http/Controllers/RuleManagement.php b/app/Support/Http/Controllers/RuleManagement.phpindex 9903873484..081d1c44d0 100644--- a/app/Support/Http/Controllers/RuleManagement.php+++ b/app/Support/Http/Controllers/RuleManagement.php@@ -74,8 +74,8 @@ trait RuleManagementprotected function getPreviousTriggers(Request $request): array{// TODO duplicated code.- $operators = config('search.operators');- $triggers = [];+ $operators = config('search.operators');+ $triggers = [];foreach ($operators as $key => $operator) {if ('user_action' !== $key && false === $operator['alias']) {$triggers[$key] = (string)trans(sprintf('firefly.rule_trigger_%s_choice', $key));@@ -129,7 +129,7 @@ trait RuleManagement}asort($triggers);- $index = 0;+ $index = 0;foreach ($submittedOperators as $operator) {$rootOperator = OperatorQuerySearch::getRootOperator($operator['type']);$needsContext = (bool)config(sprintf('search.operators.%s.needs_context', $rootOperator));diff --git a/app/Support/Http/Controllers/TransactionCalculation.php b/app/Support/Http/Controllers/TransactionCalculation.phpindex a872b53807..17df264ce8 100644--- a/app/Support/Http/Controllers/TransactionCalculation.php+++ b/app/Support/Http/Controllers/TransactionCalculation.php@@ -39,14 +39,15 @@ trait TransactionCalculation*/protected function getExpensesForOpposing(Collection $accounts, Collection $opposing, Carbon $start, Carbon $end): array{- $total = $accounts->merge($opposing);+ $total = $accounts->merge($opposing);/** @var GroupCollectorInterface $collector */$collector = app(GroupCollectorInterface::class);$collector->setAccounts($total)- ->setRange($start, $end)- ->withAccountInformation()- ->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);+ ->setRange($start, $end)+ ->withAccountInformation()+ ->setTypes([TransactionTypeEnum::WITHDRAWAL->value])+ ;return $collector->getExtractedJournals();}@@ -60,7 +61,8 @@ trait TransactionCalculation$collector = app(GroupCollectorInterface::class);$collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::TRANSFER->value])- ->setTags($tags)->withAccountInformation();+ ->setTags($tags)->withAccountInformation()+ ;return $collector->getExtractedJournals();}@@ -73,7 +75,8 @@ trait TransactionCalculation/** @var GroupCollectorInterface $collector */$collector = app(GroupCollectorInterface::class);$collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::TRANSFER->value])- ->setBudgets($budgets)->withAccountInformation();+ ->setBudgets($budgets)->withAccountInformation()+ ;return $collector->getExtractedJournals();}@@ -90,7 +93,8 @@ trait TransactionCalculation->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::TRANSFER->value])->setCategories($categories)- ->withAccountInformation();+ ->withAccountInformation()+ ;return $collector->getExtractedJournals();}@@ -103,7 +107,8 @@ trait TransactionCalculation/** @var GroupCollectorInterface $collector */$collector = app(GroupCollectorInterface::class);$collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value])- ->setCategories($categories)->withAccountInformation();+ ->setCategories($categories)->withAccountInformation()+ ;return $collector->getExtractedJournals();}@@ -113,7 +118,7 @@ trait TransactionCalculation*/protected function getIncomeForOpposing(Collection $accounts, Collection $opposing, Carbon $start, Carbon $end): array{- $total = $accounts->merge($opposing);+ $total = $accounts->merge($opposing);/** @var GroupCollectorInterface $collector */$collector = app(GroupCollectorInterface::class);@@ -130,7 +135,8 @@ trait TransactionCalculation/** @var GroupCollectorInterface $collector */$collector = app(GroupCollectorInterface::class);$collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value])- ->setTags($tags)->withAccountInformation();+ ->setTags($tags)->withAccountInformation()+ ;return $collector->getExtractedJournals();}diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.phpindex fc34201443..bee31f429e 100644--- a/app/Support/Http/Controllers/UserNavigation.php+++ b/app/Support/Http/Controllers/UserNavigation.php@@ -69,7 +69,7 @@ trait UserNavigationfinal protected function isEditableGroup(TransactionGroup $group): bool{/** @var null|TransactionJournal $journal */- $journal = $group->transactionJournals()->first();+ $journal = $group->transactionJournals()->first();if (null === $journal) {return false;}@@ -96,10 +96,10 @@ trait UserNavigationreturn redirect(route('index'));}- $journal = $transaction->transactionJournal;+ $journal = $transaction->transactionJournal;/** @var null|Transaction $other */- $other = $journal->transactions()->where('id', '!=', $transaction->id)->first();+ $other = $journal->transactions()->where('id', '!=', $transaction->id)->first();if (null === $other) {app('log')->error(sprintf('Account #%d has no valid journals. Dont know where it belongs.', $account->id));session()->flash('error', trans('firefly.cant_find_redirect_account'));@@ -119,7 +119,7 @@ trait UserNavigationfinal protected function redirectGroupToAccount(TransactionGroup $group){/** @var null|TransactionJournal $journal */- $journal = $group->transactionJournals()->first();+ $journal = $group->transactionJournals()->first();if (null === $journal) {app('log')->error(sprintf('No journals in group #%d', $group->id));diff --git a/app/Support/JsonApi/Enrichments/AccountEnrichment.php b/app/Support/JsonApi/Enrichments/AccountEnrichment.phpindex 7dc3cb444c..7aedeb6880 100644--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php@@ -112,7 +112,7 @@ class AccountEnrichment implements EnrichmentInterface}#[Override]- public function enrichSingle(array | Model $model): Account | array+ public function enrichSingle(array|Model $model): Account|array{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -168,9 +168,9 @@ class AccountEnrichment implements EnrichmentInterfaceprivate function appendCollectedData(): void{$this->collection = $this->collection->map(function (Account $item) {- $id = (int)$item->id;- $item->full_account_type = $this->accountTypes[(int)$item->account_type_id] ?? null;- $meta = [+ $id = (int)$item->id;+ $item->full_account_type = $this->accountTypes[(int)$item->account_type_id] ?? null;+ $meta = ['currency' => null,'location' => ['latitude' => null,@@ -217,30 +217,30 @@ class AccountEnrichment implements EnrichmentInterface// add balances// get currencies:- $currency = $this->primaryCurrency; // assume primary currency+ $currency = $this->primaryCurrency; // assume primary currencyif (null !== $meta['currency']) {$currency = $meta['currency'];}// get the current balance:- $date = $this->getDate();+ $date = $this->getDate();// $finalBalance = Steam::finalAccountBalance($item, $date, $this->primaryCurrency, $this->convertToPrimary);- $finalBalance = $this->balances[$id];- $balanceDifference = $this->getBalanceDifference($id, $currency);+ $finalBalance = $this->balances[$id];+ $balanceDifference = $this->getBalanceDifference($id, $currency);Log::debug(sprintf('Call finalAccountBalance(%s) with date/time "%s"', var_export($this->convertToPrimary, true), $date->toIso8601String()), $finalBalance);// collect current balances:- $currentBalance = Steam::bcround($finalBalance[$currency->code] ?? '0', $currency->decimal_places);- $openingBalance = Steam::bcround($meta['opening_balance_amount'] ?? '0', $currency->decimal_places);- $virtualBalance = Steam::bcround($item->virtual_balance ?? '0', $currency->decimal_places);- $debtAmount = $meta['current_debt'] ?? null;+ $currentBalance = Steam::bcround($finalBalance[$currency->code] ?? '0', $currency->decimal_places);+ $openingBalance = Steam::bcround($meta['opening_balance_amount'] ?? '0', $currency->decimal_places);+ $virtualBalance = Steam::bcround($item->virtual_balance ?? '0', $currency->decimal_places);+ $debtAmount = $meta['current_debt'] ?? null;// set some pc_ default values to NULL:- $pcCurrentBalance = null;- $pcOpeningBalance = null;- $pcVirtualBalance = null;- $pcDebtAmount = null;- $pcBalanceDifference = null;+ $pcCurrentBalance = null;+ $pcOpeningBalance = null;+ $pcVirtualBalance = null;+ $pcDebtAmount = null;+ $pcBalanceDifference = null;// convert to primary currency if needed:if ($this->convertToPrimary && $currency->id !== $this->primaryCurrency->id) {@@ -279,7 +279,7 @@ class AccountEnrichment implements EnrichmentInterface'pc_balance_difference' => $pcBalanceDifference,];// end add balances- $item->meta = $meta;+ $item->meta = $meta;return $item;});@@ -313,23 +313,25 @@ class AccountEnrichment implements EnrichmentInterfaceprivate function collectLocations(): void{$locations = Location::query()->whereIn('locatable_id', $this->ids)- ->where('locatable_type', Account::class)->get(['locations.locatable_id', 'locations.latitude', 'locations.longitude', 'locations.zoom_level'])->toArray();+ ->where('locatable_type', Account::class)->get(['locations.locatable_id', 'locations.latitude', 'locations.longitude', 'locations.zoom_level'])->toArray()+ ;foreach ($locations as $location) {$this->locations[(int)$location['locatable_id']]= [- 'latitude' => (float)$location['latitude'],- 'longitude' => (float)$location['longitude'],- 'zoom_level' => (int)$location['zoom_level'],- ];+ 'latitude' => (float)$location['latitude'],+ 'longitude' => (float)$location['longitude'],+ 'zoom_level' => (int)$location['zoom_level'],+ ];}Log::debug(sprintf('Enrich with %d locations(s)', count($this->locations)));}private function collectMetaData(): void{- $set = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'BIC', 'liability_direction', 'interest', 'interest_period', 'current_debt'])- ->whereIn('account_id', $this->ids)- ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray();+ $set = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'BIC', 'liability_direction', 'interest', 'interest_period', 'current_debt'])+ ->whereIn('account_id', $this->ids)+ ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray()+ ;/** @var array $entry */foreach ($set as $entry) {@@ -355,9 +357,10 @@ class AccountEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->ids)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', Account::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', Account::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -366,12 +369,13 @@ class AccountEnrichment implements EnrichmentInterfaceprivate function collectObjectGroups(): void{- $set = DB::table('object_groupables')- ->whereIn('object_groupable_id', $this->ids)- ->where('object_groupable_type', Account::class)- ->get(['object_groupable_id', 'object_group_id']);+ $set = DB::table('object_groupables')+ ->whereIn('object_groupable_id', $this->ids)+ ->where('object_groupable_type', Account::class)+ ->get(['object_groupable_id', 'object_group_id'])+ ;- $ids = array_unique($set->pluck('object_group_id')->toArray());+ $ids = array_unique($set->pluck('object_group_id')->toArray());foreach ($set as $entry) {$this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;@@ -395,19 +399,20 @@ class AccountEnrichment implements EnrichmentInterface->setUserGroup($this->userGroup)->setAccounts($this->collection)->withAccountInformation()- ->setTypes([TransactionTypeEnum::OPENING_BALANCE->value]);- $journals = $collector->getExtractedJournals();+ ->setTypes([TransactionTypeEnum::OPENING_BALANCE->value])+ ;+ $journals = $collector->getExtractedJournals();foreach ($journals as $journal) {$this->openingBalances[(int)$journal['source_account_id']]= [- 'amount' => Steam::negative($journal['amount']),- 'date' => $journal['date'],- ];+ 'amount' => Steam::negative($journal['amount']),+ 'date' => $journal['date'],+ ];$this->openingBalances[(int)$journal['destination_account_id']]= [- 'amount' => Steam::positive($journal['amount']),- 'date' => $journal['date'],- ];+ 'amount' => Steam::positive($journal['amount']),+ 'date' => $journal['date'],+ ];}}@@ -431,8 +436,8 @@ class AccountEnrichment implements EnrichmentInterfaceif (0 === count($startBalance) || 0 === count($endBalance)) {return null;}- $start = $startBalance[$currency->code] ?? '0';- $end = $endBalance[$currency->code] ?? '0';+ $start = $startBalance[$currency->code] ?? '0';+ $end = $endBalance[$currency->code] ?? '0';return bcsub($end, $start);}@@ -453,7 +458,7 @@ class AccountEnrichment implements EnrichmentInterfacecase 'current_balance':case 'pc_current_balance':- $this->collection = $this->collection->sortBy(static fn(Account $account) => $account->meta['balances'][$parameter[0]] ?? '0', SORT_NUMERIC, 'desc' === $parameter[1]);+ $this->collection = $this->collection->sortBy(static fn (Account $account) => $account->meta['balances'][$parameter[0]] ?? '0', SORT_NUMERIC, 'desc' === $parameter[1]);break;}diff --git a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.phpindex 85711c7efb..a6a8823368 100644--- a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php+++ b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php@@ -79,7 +79,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface}#[Override]- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);diff --git a/app/Support/JsonApi/Enrichments/BudgetEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetEnrichment.phpindex 71e4ff160b..cb875aca78 100644--- a/app/Support/JsonApi/Enrichments/BudgetEnrichment.php+++ b/app/Support/JsonApi/Enrichments/BudgetEnrichment.php@@ -70,7 +70,7 @@ class BudgetEnrichment implements EnrichmentInterfacereturn $this->collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -103,8 +103,8 @@ class BudgetEnrichment implements EnrichmentInterfaceprivate function appendCollectedData(): void{$this->collection = $this->collection->map(function (Budget $item) {- $id = (int)$item->id;- $meta = [+ $id = (int)$item->id;+ $meta = ['object_group_id' => null,'object_group_order' => null,'object_group_title' => null,@@ -156,7 +156,7 @@ class BudgetEnrichment implements EnrichmentInterface$opsRepository->setUserGroup($this->userGroup);// $spent = $this->beautify();// $set = $this->opsRepository->sumExpenses($start, $end, null, new Collection()->push($budget))- $expenses = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection, null);+ $expenses = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection, null);foreach ($this->collection as $item) {$id = (int)$item->id;$this->spent[$id] = array_values($opsRepository->sumCollectedExpensesByBudget($expenses, $item, false));@@ -177,9 +177,10 @@ class BudgetEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->ids)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', Budget::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', Budget::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -188,12 +189,13 @@ class BudgetEnrichment implements EnrichmentInterfaceprivate function collectObjectGroups(): void{- $set = DB::table('object_groupables')- ->whereIn('object_groupable_id', $this->ids)- ->where('object_groupable_type', Budget::class)- ->get(['object_groupable_id', 'object_group_id']);+ $set = DB::table('object_groupables')+ ->whereIn('object_groupable_id', $this->ids)+ ->where('object_groupable_type', Budget::class)+ ->get(['object_groupable_id', 'object_group_id'])+ ;- $ids = array_unique($set->pluck('object_group_id')->toArray());+ $ids = array_unique($set->pluck('object_group_id')->toArray());foreach ($set as $entry) {$this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;diff --git a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.phpindex f0a7fd3479..db1e248708 100644--- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php+++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php@@ -73,7 +73,7 @@ class BudgetLimitEnrichment implements EnrichmentInterfacereturn $this->collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -115,12 +115,12 @@ class BudgetLimitEnrichment implements EnrichmentInterfaceprivate function collectBudgets(): void{- $budgetIds = $this->collection->pluck('budget_id')->unique()->toArray();- $budgets = Budget::whereIn('id', $budgetIds)->get();+ $budgetIds = $this->collection->pluck('budget_id')->unique()->toArray();+ $budgets = Budget::whereIn('id', $budgetIds)->get();$repository = app(OperationsRepository::class);$repository->setUser($this->user);- $expenses = $repository->collectExpenses($this->start, $this->end, null, $budgets, null);+ $expenses = $repository->collectExpenses($this->start, $this->end, null, $budgets, null);/** @var BudgetLimit $budgetLimit */foreach ($this->collection as $budgetLimit) {@@ -151,8 +151,8 @@ class BudgetLimitEnrichment implements EnrichmentInterfaceprivate function collectIds(): void{- $this->start = $this->collection->min('start_date') ?? Carbon::now()->startOfMonth();- $this->end = $this->collection->max('end_date') ?? Carbon::now()->endOfMonth();+ $this->start = $this->collection->min('start_date') ?? Carbon::now()->startOfMonth();+ $this->end = $this->collection->max('end_date') ?? Carbon::now()->endOfMonth();/** @var BudgetLimit $limit */foreach ($this->collection as $limit) {@@ -169,9 +169,10 @@ class BudgetLimitEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->ids)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', BudgetLimit::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', BudgetLimit::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -180,7 +181,7 @@ class BudgetLimitEnrichment implements EnrichmentInterfaceprivate function filterToBudget(array $expenses, int $budget): array{- $result = array_filter($expenses, fn(array $item) => (int)$item['budget_id'] === $budget);+ $result = array_filter($expenses, fn (array $item) => (int)$item['budget_id'] === $budget);Log::debug(sprintf('filterToBudget for budget #%d, from %d to %d items', $budget, count($expenses), count($result)));return $result;@@ -188,13 +189,13 @@ class BudgetLimitEnrichment implements EnrichmentInterfaceprivate function stringifyIds(): void{- $this->expenses = array_map(fn($first) => array_map(function ($second) {+ $this->expenses = array_map(fn ($first) => array_map(function ($second) {$second['currency_id'] = (string)($second['currency_id'] ?? 0);return $second;}, $first), $this->expenses);- $this->pcExpenses = array_map(fn($first) => array_map(function ($second) {+ $this->pcExpenses = array_map(fn ($first) => array_map(function ($second) {$second['currency_id'] = (string)($second['currency_id'] ?? 0);return $second;diff --git a/app/Support/JsonApi/Enrichments/CategoryEnrichment.php b/app/Support/JsonApi/Enrichments/CategoryEnrichment.phpindex 074747011b..975227844f 100644--- a/app/Support/JsonApi/Enrichments/CategoryEnrichment.php+++ b/app/Support/JsonApi/Enrichments/CategoryEnrichment.php@@ -62,7 +62,7 @@ class CategoryEnrichment implements EnrichmentInterfacereturn $collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -123,9 +123,10 @@ class CategoryEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->ids)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', Category::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', Category::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -139,9 +140,9 @@ class CategoryEnrichment implements EnrichmentInterface$opsRepository = app(OperationsRepositoryInterface::class);$opsRepository->setUser($this->user);$opsRepository->setUserGroup($this->userGroup);- $expenses = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection);- $income = $opsRepository->collectIncome($this->start, $this->end, null, $this->collection);- $transfers = $opsRepository->collectTransfers($this->start, $this->end, null, $this->collection);+ $expenses = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection);+ $income = $opsRepository->collectIncome($this->start, $this->end, null, $this->collection);+ $transfers = $opsRepository->collectTransfers($this->start, $this->end, null, $this->collection);foreach ($this->collection as $item) {$id = (int)$item->id;$this->spent[$id] = array_values($opsRepository->sumCollectedTransactionsByCategory($expenses, $item, 'negative', false));diff --git a/app/Support/JsonApi/Enrichments/EnrichmentInterface.php b/app/Support/JsonApi/Enrichments/EnrichmentInterface.phpindex e93ddcf283..0ccfb7c060 100644--- a/app/Support/JsonApi/Enrichments/EnrichmentInterface.php+++ b/app/Support/JsonApi/Enrichments/EnrichmentInterface.php@@ -33,7 +33,7 @@ interface EnrichmentInterface{public function enrich(Collection $collection): Collection;- public function enrichSingle(array | Model $model): array | Model;+ public function enrichSingle(array|Model $model): array|Model;public function setUser(User $user): void;diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.phpindex aebdde8f67..e1afbe0042 100644--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php@@ -43,13 +43,13 @@ use Illuminate\Support\Facades\Log;class PiggyBankEnrichment implements EnrichmentInterface{- private array $accountIds = []; // @phpstan-ignore-line- private array $accounts = []; // @phpstan-ignore-line- private array $amounts = [];+ private array $accountIds = []; // @phpstan-ignore-line+ private array $accounts = []; // @phpstan-ignore-line+ private array $amounts = [];private Collection $collection;- private array $currencies = [];- private array $currencyIds = [];- private array $ids = [];+ private array $currencies = [];+ private array $currencyIds = [];+ private array $ids = [];// private array $accountCurrencies = [];private array $mappedObjects = [];private array $notes = [];@@ -77,7 +77,7 @@ class PiggyBankEnrichment implements EnrichmentInterfacereturn $this->collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -100,14 +100,14 @@ class PiggyBankEnrichment implements EnrichmentInterfaceprivate function appendCollectedData(): void{$this->collection = $this->collection->map(function (PiggyBank $item) {- $id = (int)$item->id;- $currencyId = (int)$item->transaction_currency_id;- $currency = $this->currencies[$currencyId] ?? $this->primaryCurrency;- $targetAmount = null;+ $id = (int)$item->id;+ $currencyId = (int)$item->transaction_currency_id;+ $currency = $this->currencies[$currencyId] ?? $this->primaryCurrency;+ $targetAmount = null;if (0 !== bccomp($item->target_amount, '0')) {$targetAmount = $item->target_amount;}- $meta = [+ $meta = ['notes' => $this->notes[$id] ?? null,'currency' => $this->currencies[$currencyId] ?? null,// 'auto_budget' => $this->autoBudgets[$id] ?? null,@@ -136,17 +136,17 @@ class PiggyBankEnrichment implements EnrichmentInterface}// add current amount(s).foreach ($this->amounts[$id] as $accountId => $row) {- $meta['accounts'][] = [+ $meta['accounts'][] = ['account_id' => (string)$accountId,'name' => $this->accounts[$accountId]['name'] ?? '','current_amount' => Steam::bcround($row['current_amount'], $currency->decimal_places),'pc_current_amount' => Steam::bcround($row['pc_current_amount'], $this->primaryCurrency->decimal_places),];- $meta['current_amount'] = bcadd($meta['current_amount'], $row['current_amount']);+ $meta['current_amount'] = bcadd($meta['current_amount'], $row['current_amount']);// only add pc_current_amount when the pc_current_amount is set$meta['pc_current_amount'] = null === $row['pc_current_amount'] ? null : bcadd($meta['pc_current_amount'], $row['pc_current_amount']);}- $meta['current_amount'] = Steam::bcround($meta['current_amount'], $currency->decimal_places);+ $meta['current_amount'] = Steam::bcround($meta['current_amount'], $currency->decimal_places);// only round this number when pc_current_amount is set.$meta['pc_current_amount'] = null === $meta['pc_current_amount'] ? null : Steam::bcround($meta['pc_current_amount'], $this->primaryCurrency->decimal_places);@@ -160,7 +160,7 @@ class PiggyBankEnrichment implements EnrichmentInterface$meta['save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($item->start_date, $item->target_date, $meta['target_amount'], $meta['current_amount']), $currency->decimal_places);$meta['pc_save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($item->start_date, $item->target_date, $meta['pc_target_amount'], $meta['pc_current_amount']), $currency->decimal_places);- $item->meta = $meta;+ $item->meta = $meta;return $item;});@@ -176,7 +176,7 @@ class PiggyBankEnrichment implements EnrichmentInterface$this->ids[] = $id;$this->currencyIds[$id] = (int)$piggy->transaction_currency_id;}- $this->ids = array_unique($this->ids);+ $this->ids = array_unique($this->ids);// collect currencies.$currencies = TransactionCurrency::whereIn('id', $this->currencyIds)->get();@@ -185,10 +185,10 @@ class PiggyBankEnrichment implements EnrichmentInterface}// collect accounts- $set = DB::table('account_piggy_bank')->whereIn('piggy_bank_id', $this->ids)->get(['piggy_bank_id', 'account_id', 'current_amount', 'native_current_amount']);+ $set = DB::table('account_piggy_bank')->whereIn('piggy_bank_id', $this->ids)->get(['piggy_bank_id', 'account_id', 'current_amount', 'native_current_amount']);foreach ($set as $item) {- $id = (int)$item->piggy_bank_id;- $accountId = (int)$item->account_id;+ $id = (int)$item->piggy_bank_id;+ $accountId = (int)$item->account_id;$this->amounts[$id] ??= [];if (!array_key_exists($id, $this->accountIds)) {$this->accountIds[$id] = (int)$item->account_id;@@ -206,7 +206,7 @@ class PiggyBankEnrichment implements EnrichmentInterface}// get account currency preference for ALL.- $set = AccountMeta::whereIn('account_id', array_values($this->accountIds))->where('name', 'currency_id')->get();+ $set = AccountMeta::whereIn('account_id', array_values($this->accountIds))->where('name', 'currency_id')->get();/** @var AccountMeta $item */foreach ($set as $item) {@@ -219,7 +219,7 @@ class PiggyBankEnrichment implements EnrichmentInterface}// get account info.- $set = Account::whereIn('id', array_values($this->accountIds))->get();+ $set = Account::whereIn('id', array_values($this->accountIds))->get();/** @var Account $item */foreach ($set as $item) {@@ -234,9 +234,10 @@ class PiggyBankEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->ids)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', PiggyBank::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', PiggyBank::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -245,12 +246,13 @@ class PiggyBankEnrichment implements EnrichmentInterfaceprivate function collectObjectGroups(): void{- $set = DB::table('object_groupables')- ->whereIn('object_groupable_id', $this->ids)- ->where('object_groupable_type', PiggyBank::class)- ->get(['object_groupable_id', 'object_group_id']);+ $set = DB::table('object_groupables')+ ->whereIn('object_groupable_id', $this->ids)+ ->where('object_groupable_type', PiggyBank::class)+ ->get(['object_groupable_id', 'object_group_id'])+ ;- $ids = array_unique($set->pluck('object_group_id')->toArray());+ $ids = array_unique($set->pluck('object_group_id')->toArray());foreach ($set as $entry) {$this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.phpindex 8758dfe94d..56a0714466 100644--- a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php+++ b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php@@ -66,7 +66,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterfacereturn $this->collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -89,10 +89,10 @@ class PiggyBankEventEnrichment implements EnrichmentInterfaceprivate function appendCollectedData(): void{$this->collection = $this->collection->map(function (PiggyBankEvent $item) {- $id = (int)$item->id;- $piggyId = (int)$item->piggy_bank_id;- $journalId = (int)$item->transaction_journal_id;- $currency = null;+ $id = (int)$item->id;+ $piggyId = (int)$item->piggy_bank_id;+ $journalId = (int)$item->transaction_journal_id;+ $currency = null;if (array_key_exists($piggyId, $this->accountIds)) {$accountId = $this->accountIds[$piggyId];if (array_key_exists($accountId, $this->accountCurrencies)) {@@ -120,7 +120,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterface}$this->ids = array_unique($this->ids);// collect groups with journal info.- $set = TransactionJournal::whereIn('id', $this->journalIds)->get(['id', 'transaction_group_id']);+ $set = TransactionJournal::whereIn('id', $this->journalIds)->get(['id', 'transaction_group_id']);/** @var TransactionJournal $item */foreach ($set as $item) {@@ -128,7 +128,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterface}// collect account info.- $set = DB::table('account_piggy_bank')->whereIn('piggy_bank_id', $this->piggyBankIds)->get(['piggy_bank_id', 'account_id']);+ $set = DB::table('account_piggy_bank')->whereIn('piggy_bank_id', $this->piggyBankIds)->get(['piggy_bank_id', 'account_id']);foreach ($set as $item) {$id = (int)$item->piggy_bank_id;if (!array_key_exists($id, $this->accountIds)) {@@ -137,12 +137,12 @@ class PiggyBankEventEnrichment implements EnrichmentInterface}// get account currency preference for ALL.- $set = AccountMeta::whereIn('account_id', array_values($this->accountIds))->where('name', 'currency_id')->get();+ $set = AccountMeta::whereIn('account_id', array_values($this->accountIds))->where('name', 'currency_id')->get();/** @var AccountMeta $item */foreach ($set as $item) {- $accountId = (int)$item->account_id;- $currencyId = (int)$item->data;+ $accountId = (int)$item->account_id;+ $currencyId = (int)$item->data;if (!array_key_exists($currencyId, $this->currencies)) {$this->currencies[$currencyId] = Amount::getTransactionCurrencyById($currencyId);}diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex 30484f5388..7fdfc1c5dc 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -51,11 +51,12 @@ use Illuminate\Database\Eloquent\Model;use Illuminate\Support\Arr;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;+use function Safe\json_decode;class RecurringEnrichment implements EnrichmentInterface{- private array $accounts = [];+ private array $accounts = [];private Collection $collection;// private array $transactionTypeIds = [];// private array $transactionTypes = [];@@ -97,7 +98,7 @@ class RecurringEnrichment implements EnrichmentInterfacereturn $this->collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -131,7 +132,7 @@ class RecurringEnrichment implements EnrichmentInterfacereturn (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1], $this->language);}if ('ndom' === $repetition->repetition_type) {- $parts = explode(',', $repetition->repetition_moment);+ $parts = explode(',', $repetition->repetition_moment);// first part is number of week, second is weekday.$dayOfWeek = trans(sprintf('config.dow_%s', $parts[1]), [], $this->language);if ($repetition->repetition_skip > 0) {@@ -148,7 +149,7 @@ class RecurringEnrichment implements EnrichmentInterface}// $diffInYears = (int)$today->diffInYears($repDate, true);// $repDate->addYears($diffInYears); // technically not necessary.- $string = $repDate->isoFormat((string)trans('config.month_and_day_no_year_js'));+ $string = $repDate->isoFormat((string)trans('config.month_and_day_no_year_js'));return (string)trans('firefly.recurring_yearly', ['date' => $string], $this->language);}@@ -171,8 +172,8 @@ class RecurringEnrichment implements EnrichmentInterfaceprivate function appendCollectedData(): void{$this->collection = $this->collection->map(function (Recurrence $item) {- $id = (int)$item->id;- $meta = [+ $id = (int)$item->id;+ $meta = ['notes' => $this->notes[$id] ?? null,'repetitions' => array_values($this->repetitions[$id] ?? []),'transactions' => $this->processTransactions(array_values($this->transactions[$id] ?? [])),@@ -285,7 +286,7 @@ class RecurringEnrichment implements EnrichmentInterface{/** @var Recurrence $recurrence */foreach ($this->collection as $recurrence) {- $id = (int)$recurrence->id;+ $id = (int)$recurrence->id;// $typeId = (int)$recurrence->transaction_type_id;$this->ids[] = $id;// $this->transactionTypeIds[$id] = $typeId;@@ -303,9 +304,10 @@ class RecurringEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->ids)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', Recurrence::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', Recurrence::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -335,20 +337,20 @@ class RecurringEnrichment implements EnrichmentInterfaceLog::debug('Start of enrichment: collectRepetitions()');$repository = app(RecurringRepositoryInterface::class);$repository->setUserGroup($this->userGroup);- $set = RecurrenceRepetition::whereIn('recurrence_id', $this->ids)->get();+ $set = RecurrenceRepetition::whereIn('recurrence_id', $this->ids)->get();/** @var RecurrenceRepetition $repetition */foreach ($set as $repetition) {- $recurrence = $this->collection->filter(fn(Recurrence $item) => (int)$item->id === (int)$repetition->recurrence_id)->first();- $fromDate = clone($recurrence->latest_date ?? $recurrence->first_date);- $id = (int)$repetition->recurrence_id;- $repId = (int)$repetition->id;+ $recurrence = $this->collection->filter(fn (Recurrence $item) => (int)$item->id === (int)$repetition->recurrence_id)->first();+ $fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);+ $id = (int)$repetition->recurrence_id;+ $repId = (int)$repetition->id;$this->repetitions[$id] ??= [];// get the (future) occurrences for this specific type of repetition:- $amount = 'daily' === $repetition->repetition_type ? 9 : 5;- $set = $repository->getXOccurrencesSince($repetition, $fromDate, now(config('app.timezone')), $amount);- $occurrences = [];+ $amount = 'daily' === $repetition->repetition_type ? 9 : 5;+ $set = $repository->getXOccurrencesSince($repetition, $fromDate, now(config('app.timezone')), $amount);+ $occurrences = [];/** @var Carbon $carbon */foreach ($set as $carbon) {@@ -371,8 +373,8 @@ class RecurringEnrichment implements EnrichmentInterfaceprivate function collectTransactionMetaData(): void{- $ids = array_keys($this->transactions);- $meta = RecurrenceTransactionMeta::whereNull('deleted_at')->whereIn('rt_id', $ids)->get();+ $ids = array_keys($this->transactions);+ $meta = RecurrenceTransactionMeta::whereNull('deleted_at')->whereIn('rt_id', $ids)->get();// other meta-data to be collected:$billIds = [];$piggyBankIds = [];@@ -384,8 +386,8 @@ class RecurringEnrichment implements EnrichmentInterface$transactionId = (int)$entry->rt_id;// this should refer to another array, were rtIds can be used to find the recurrence.- $recurrenceId = $this->recurrenceIds[$transactionId] ?? 0;- $name = (string)($entry->name ?? '');+ $recurrenceId = $this->recurrenceIds[$transactionId] ?? 0;+ $name = (string)($entry->name ?? '');if (0 === $recurrenceId) {Log::error(sprintf('Could not find recurrence ID for recurrence transaction ID %d', $transactionId));@@ -485,14 +487,14 @@ class RecurringEnrichment implements EnrichmentInterface/** @var RecurrenceTransaction $transaction */foreach ($set as $transaction) {- $id = (int)$transaction->recurrence_id;- $transactionId = (int)$transaction->id;- $this->recurrenceIds[$transactionId] = $id;- $this->transactions[$id] ??= [];- $amount = $transaction->amount;- $foreignAmount = $transaction->foreign_amount;-- $this->transactions[$id][$transactionId] = [+ $id = (int)$transaction->recurrence_id;+ $transactionId = (int)$transaction->id;+ $this->recurrenceIds[$transactionId] = $id;+ $this->transactions[$id] ??= [];+ $amount = $transaction->amount;+ $foreignAmount = $transaction->foreign_amount;++ $this->transactions[$id][$transactionId] = ['id' => (string)$transactionId,// 'recurrence_id' => $id,'transaction_currency_id' => (int)$transaction->transaction_currency_id,@@ -529,8 +531,8 @@ class RecurringEnrichment implements EnrichmentInterfaceprivate function getLanguage(): void{/** @var Preference $preference */- $preference = Preferences::getForUser($this->user, 'language', config('firefly.default_language', 'en_US'));- $language = $preference->data;+ $preference = Preferences::getForUser($this->user, 'language', config('firefly.default_language', 'en_US'));+ $language = $preference->data;if (is_array($language)) {$language = 'en_US';}@@ -543,9 +545,9 @@ class RecurringEnrichment implements EnrichmentInterface$return = [];$converter = new ExchangeRateConverter();foreach ($transactions as $transaction) {- $currencyId = $transaction['transaction_currency_id'];- $pcAmount = null;- $pcForeignAmount = null;+ $currencyId = $transaction['transaction_currency_id'];+ $pcAmount = null;+ $pcForeignAmount = null;// set the same amount in the primary currency, if both are the same anyway.if (true === $this->convertToPrimary && $currencyId === (int)$this->primaryCurrency->id) {$pcAmount = $transaction['amount'];@@ -561,26 +563,26 @@ class RecurringEnrichment implements EnrichmentInterface}}- $transaction['pc_amount'] = $pcAmount;- $transaction['pc_foreign_amount'] = $pcForeignAmount;+ $transaction['pc_amount'] = $pcAmount;+ $transaction['pc_foreign_amount'] = $pcForeignAmount;- $sourceId = $transaction['source_id'];- $transaction['source_name'] = $this->accounts[$sourceId]->name;- $transaction['source_iban'] = $this->accounts[$sourceId]->iban;- $transaction['source_type'] = $this->accounts[$sourceId]->accountType->type;- $transaction['source_id'] = (string)$transaction['source_id'];+ $sourceId = $transaction['source_id'];+ $transaction['source_name'] = $this->accounts[$sourceId]->name;+ $transaction['source_iban'] = $this->accounts[$sourceId]->iban;+ $transaction['source_type'] = $this->accounts[$sourceId]->accountType->type;+ $transaction['source_id'] = (string)$transaction['source_id'];- $destId = $transaction['destination_id'];- $transaction['destination_name'] = $this->accounts[$destId]->name;- $transaction['destination_iban'] = $this->accounts[$destId]->iban;- $transaction['destination_type'] = $this->accounts[$destId]->accountType->type;- $transaction['destination_id'] = (string)$transaction['destination_id'];+ $destId = $transaction['destination_id'];+ $transaction['destination_name'] = $this->accounts[$destId]->name;+ $transaction['destination_iban'] = $this->accounts[$destId]->iban;+ $transaction['destination_type'] = $this->accounts[$destId]->accountType->type;+ $transaction['destination_id'] = (string)$transaction['destination_id'];- $transaction['currency_id'] = (string)$currencyId;- $transaction['currency_name'] = $this->currencies[$currencyId]->name;- $transaction['currency_code'] = $this->currencies[$currencyId]->code;- $transaction['currency_symbol'] = $this->currencies[$currencyId]->symbol;- $transaction['currency_decimal_places'] = $this->currencies[$currencyId]->decimal_places;+ $transaction['currency_id'] = (string)$currencyId;+ $transaction['currency_name'] = $this->currencies[$currencyId]->name;+ $transaction['currency_code'] = $this->currencies[$currencyId]->code;+ $transaction['currency_symbol'] = $this->currencies[$currencyId]->symbol;+ $transaction['currency_decimal_places'] = $this->currencies[$currencyId]->decimal_places;$transaction['primary_currency_id'] = (string)$this->primaryCurrency->id;$transaction['primary_currency_name'] = $this->primaryCurrency->name;@@ -602,7 +604,7 @@ class RecurringEnrichment implements EnrichmentInterface$transaction['foreign_currency_decimal_places'] = $this->currencies[$currencyId]->decimal_places;}unset($transaction['transaction_currency_id']);- $return[] = $transaction;+ $return[] = $transaction;}return $return;diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.phpindex 285e0ad37e..68c3dc0f12 100644--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php@@ -86,11 +86,11 @@ class SubscriptionEnrichment implements EnrichmentInterface$paidDates = $this->paidDates;$payDates = $this->payDates;$this->collection = $this->collection->map(function (Bill $item) use ($notes, $objectGroups, $paidDates, $payDates) {- $id = (int)$item->id;- $currency = $item->transactionCurrency;- $nem = $this->getNextExpectedMatch($payDates[$id] ?? []);+ $id = (int)$item->id;+ $currency = $item->transactionCurrency;+ $nem = $this->getNextExpectedMatch($payDates[$id] ?? []);- $meta = [+ $meta = ['notes' => null,'object_group_id' => null,'object_group_title' => null,@@ -101,7 +101,7 @@ class SubscriptionEnrichment implements EnrichmentInterface'nem' => $nem,'nem_diff' => $this->getNextExpectedMatchDiff($nem, $payDates[$id] ?? []),];- $amounts = [+ $amounts = ['amount_min' => Steam::bcround($item->amount_min, $currency->decimal_places),'amount_max' => Steam::bcround($item->amount_max, $currency->decimal_places),'average' => Steam::bcround(bcdiv(bcadd($item->amount_min, $item->amount_max), '2'), $currency->decimal_places),@@ -142,7 +142,7 @@ class SubscriptionEnrichment implements EnrichmentInterfacereturn $collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);@@ -177,13 +177,13 @@ class SubscriptionEnrichment implements EnrichmentInterface*/protected function lastPaidDate(Bill $subscription, Collection $dates, Carbon $default): Carbon{- $filtered = $dates->filter(fn(TransactionJournal $journal) => (int)$journal->bill_id === (int)$subscription->id);+ $filtered = $dates->filter(fn (TransactionJournal $journal) => (int)$journal->bill_id === (int)$subscription->id);Log::debug(sprintf('Filtered down from %d to %d entries for bill #%d.', $dates->count(), $filtered->count(), $subscription->id));if (0 === $filtered->count()) {return $default;}- $latest = $filtered->first()->date;+ $latest = $filtered->first()->date;/** @var TransactionJournal $journal */foreach ($filtered as $journal) {@@ -198,9 +198,10 @@ class SubscriptionEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->subscriptionIds)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', Bill::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', Bill::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -209,12 +210,13 @@ class SubscriptionEnrichment implements EnrichmentInterfaceprivate function collectObjectGroups(): void{- $set = DB::table('object_groupables')- ->whereIn('object_groupable_id', $this->subscriptionIds)- ->where('object_groupable_type', Bill::class)- ->get(['object_groupable_id', 'object_group_id']);+ $set = DB::table('object_groupables')+ ->whereIn('object_groupable_id', $this->subscriptionIds)+ ->where('object_groupable_type', Bill::class)+ ->get(['object_groupable_id', 'object_group_id'])+ ;- $ids = array_unique($set->pluck('object_group_id')->toArray());+ $ids = array_unique($set->pluck('object_group_id')->toArray());foreach ($set as $entry) {$this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;@@ -242,13 +244,13 @@ class SubscriptionEnrichment implements EnrichmentInterface// 2023-07-18 this particular date is used to search for the last paid date.// 2023-07-18 the cloned $searchDate is used to grab the correct transactions./** @var Carbon $start */- $start = clone $this->start;- $searchStart = clone $start;+ $start = clone $this->start;+ $searchStart = clone $start;$start->subDay();/** @var Carbon $end */- $end = clone $this->end;- $searchEnd = clone $end;+ $end = clone $this->end;+ $searchEnd = clone $end;// move the search dates to the start of the day.$searchStart->startOfDay();@@ -257,13 +259,13 @@ class SubscriptionEnrichment implements EnrichmentInterfaceLog::debug(sprintf('Search parameters are: start: %s, end: %s', $searchStart->format('Y-m-d H:i:s'), $searchEnd->format('Y-m-d H:i:s')));// Get from database when bills were paid.- $set = $this->user->transactionJournals()- ->whereIn('bill_id', $this->subscriptionIds)- ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')- ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')- ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')- ->where('transactions.amount', '>', 0)- ->before($searchEnd)->after($searchStart)->get(+ $set = $this->user->transactionJournals()+ ->whereIn('bill_id', $this->subscriptionIds)+ ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')+ ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')+ ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')+ ->where('transactions.amount', '>', 0)+ ->before($searchEnd)->after($searchStart)->get(['transaction_journals.id','transaction_journals.date',@@ -280,24 +282,25 @@ class SubscriptionEnrichment implements EnrichmentInterface'transactions.amount','transactions.foreign_amount',]- );+ )+ ;Log::debug(sprintf('Count %d entries in set', $set->count()));// for each bill, do a loop.- $converter = new ExchangeRateConverter();+ $converter = new ExchangeRateConverter();/** @var Bill $subscription */foreach ($this->collection as $subscription) {// Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date.Log::debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));- $lastPaidDate = $this->lastPaidDate($subscription, $set, $start);+ $lastPaidDate = $this->lastPaidDate($subscription, $set, $start);Log::debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));// At this point the "next match" is exactly after the last time the bill was paid.- $result = [];- $filtered = $set->filter(fn(TransactionJournal $journal) => (int)$journal->bill_id === (int)$subscription->id);+ $result = [];+ $filtered = $set->filter(fn (TransactionJournal $journal) => (int)$journal->bill_id === (int)$subscription->id);foreach ($filtered as $entry) {- $array = [+ $array = ['transaction_group_id' => (string)$entry->transaction_group_id,'transaction_journal_id' => (string)$entry->id,'date' => $entry->date->toAtomString(),@@ -360,12 +363,12 @@ class SubscriptionEnrichment implements EnrichmentInterface/** @var Bill $subscription */foreach ($this->collection as $subscription) {- $id = (int)$subscription->id;- $lastPaidDate = $this->getLastPaidDate($this->paidDates[$id] ?? []);- $payDates = $this->calculator->getPayDates($this->start, $this->end, $subscription->date, $subscription->repeat_freq, $subscription->skip, $lastPaidDate);- $payDatesFormatted = [];+ $id = (int)$subscription->id;+ $lastPaidDate = $this->getLastPaidDate($this->paidDates[$id] ?? []);+ $payDates = $this->calculator->getPayDates($this->start, $this->end, $subscription->date, $subscription->repeat_freq, $subscription->skip, $lastPaidDate);+ $payDatesFormatted = [];foreach ($payDates as $string) {- $date = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'));+ $date = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'));if (!$date instanceof Carbon) {$date = today(config('app.timezone'));}diff --git a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.phpindex 014aff8e68..a8dccfe9fc 100644--- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php+++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php@@ -83,7 +83,7 @@ class TransactionGroupEnrichment implements EnrichmentInterface}#[Override]- public function enrichSingle(array | Model $model): array | TransactionGroup+ public function enrichSingle(array|Model $model): array|TransactionGroup{Log::debug(__METHOD__);if (is_array($model)) {@@ -109,28 +109,28 @@ class TransactionGroupEnrichment implements EnrichmentInterfaceprivate function appendCollectedData(): void{- $notes = $this->notes;- $tags = $this->tags;- $metaData = $this->metaData;- $locations = $this->locations;- $attachmentCount = $this->attachmentCount;- $primaryCurrency = $this->primaryCurrency;+ $notes = $this->notes;+ $tags = $this->tags;+ $metaData = $this->metaData;+ $locations = $this->locations;+ $attachmentCount = $this->attachmentCount;+ $primaryCurrency = $this->primaryCurrency;$this->collection = $this->collection->map(function (array $item) use ($primaryCurrency, $notes, $tags, $metaData, $locations, $attachmentCount) {foreach ($item['transactions'] as $index => $transaction) {- $journalId = (int)$transaction['transaction_journal_id'];+ $journalId = (int)$transaction['transaction_journal_id'];// attach notes if they exist:- $item['transactions'][$index]['notes'] = array_key_exists($journalId, $notes) ? $notes[$journalId] : null;+ $item['transactions'][$index]['notes'] = array_key_exists($journalId, $notes) ? $notes[$journalId] : null;// attach tags if they exist:- $item['transactions'][$index]['tags'] = array_key_exists($journalId, $tags) ? $tags[$journalId] : [];+ $item['transactions'][$index]['tags'] = array_key_exists($journalId, $tags) ? $tags[$journalId] : [];// attachment count$item['transactions'][$index]['attachment_count'] = array_key_exists($journalId, $attachmentCount) ? $attachmentCount[$journalId] : 0;// default location data- $item['transactions'][$index]['location'] = [+ $item['transactions'][$index]['location'] = ['latitude' => null,'longitude' => null,'zoom_level' => null,@@ -146,8 +146,8 @@ class TransactionGroupEnrichment implements EnrichmentInterface];// append meta data- $item['transactions'][$index]['meta'] = [];- $item['transactions'][$index]['meta_date'] = [];+ $item['transactions'][$index]['meta'] = [];+ $item['transactions'][$index]['meta_date'] = [];if (array_key_exists($journalId, $metaData)) {// loop al meta data:foreach ($metaData[$journalId] as $name => $value) {@@ -175,11 +175,12 @@ class TransactionGroupEnrichment implements EnrichmentInterface// select count(id) as nr_of_attachments, attachable_id from attachments// group by attachable_id$attachments = Attachment::query()- ->whereIn('attachable_id', $this->journalIds)- ->where('attachable_type', TransactionJournal::class)- ->groupBy('attachable_id')- ->get(['attachable_id', DB::raw('COUNT(id) as nr_of_attachments')])- ->toArray();+ ->whereIn('attachable_id', $this->journalIds)+ ->where('attachable_type', TransactionJournal::class)+ ->groupBy('attachable_id')+ ->get(['attachable_id', DB::raw('COUNT(id) as nr_of_attachments')])+ ->toArray()+ ;foreach ($attachments as $row) {$this->attachmentCount[(int)$row['attachable_id']] = (int)$row['nr_of_attachments'];}@@ -199,14 +200,15 @@ class TransactionGroupEnrichment implements EnrichmentInterfaceprivate function collectLocations(): void{$locations = Location::query()->whereIn('locatable_id', $this->journalIds)- ->where('locatable_type', TransactionJournal::class)->get(['locations.locatable_id', 'locations.latitude', 'locations.longitude', 'locations.zoom_level'])->toArray();+ ->where('locatable_type', TransactionJournal::class)->get(['locations.locatable_id', 'locations.latitude', 'locations.longitude', 'locations.zoom_level'])->toArray()+ ;foreach ($locations as $location) {$this->locations[(int)$location['locatable_id']]= [- 'latitude' => (float)$location['latitude'],- 'longitude' => (float)$location['longitude'],- 'zoom_level' => (int)$location['zoom_level'],- ];+ 'latitude' => (float)$location['latitude'],+ 'longitude' => (float)$location['longitude'],+ 'zoom_level' => (int)$location['zoom_level'],+ ];}Log::debug(sprintf('Enrich with %d locations(s)', count($this->locations)));}@@ -215,8 +217,8 @@ class TransactionGroupEnrichment implements EnrichmentInterface{$set = TransactionJournalMeta::whereIn('transaction_journal_id', $this->journalIds)->get(['transaction_journal_id', 'name', 'data'])->toArray();foreach ($set as $entry) {- $name = $entry['name'];- $data = (string)$entry['data'];+ $name = $entry['name'];+ $data = (string)$entry['data'];if ('' === $data) {continue;}@@ -234,9 +236,10 @@ class TransactionGroupEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->journalIds)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', TransactionJournal::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', TransactionJournal::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -246,11 +249,12 @@ class TransactionGroupEnrichment implements EnrichmentInterfaceprivate function collectTags(): void{$set = Tag::leftJoin('tag_transaction_journal', 'tags.id', '=', 'tag_transaction_journal.tag_id')- ->whereIn('tag_transaction_journal.transaction_journal_id', $this->journalIds)- ->get(['tag_transaction_journal.transaction_journal_id', 'tags.tag'])->toArray();+ ->whereIn('tag_transaction_journal.transaction_journal_id', $this->journalIds)+ ->get(['tag_transaction_journal.transaction_journal_id', 'tags.tag'])->toArray()+ ;foreach ($set as $item) {$journalId = $item['transaction_journal_id'];- $this->tags[$journalId] ??= [];+ $this->tags[$journalId] ??= [];$this->tags[$journalId][] = $item['tag'];}}diff --git a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php b/app/Support/JsonApi/Enrichments/WebhookEnrichment.phpindex 0004c291c8..e847a16b0f 100644--- a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php+++ b/app/Support/JsonApi/Enrichments/WebhookEnrichment.php@@ -66,7 +66,7 @@ class WebhookEnrichment implements EnrichmentInterfacereturn $this->collection;}- public function enrichSingle(array | Model $model): array | Model+ public function enrichSingle(array|Model $model): array|Model{Log::debug(__METHOD__);$collection = new Collection()->push($model);diff --git a/app/Support/Models/AccountBalanceCalculator.php b/app/Support/Models/AccountBalanceCalculator.phpindex d9e616f9b9..5675f92adc 100644--- a/app/Support/Models/AccountBalanceCalculator.php+++ b/app/Support/Models/AccountBalanceCalculator.php@@ -65,9 +65,9 @@ class AccountBalanceCalculatorpublic static function recalculateForJournal(TransactionJournal $transactionJournal): void{Log::debug(__METHOD__);- $object = new self();+ $object = new self();- $set = [];+ $set = [];foreach ($transactionJournal->transactions as $transaction) {$set[$transaction->account_id] = $transaction->account;}@@ -81,17 +81,18 @@ class AccountBalanceCalculatorreturn '0';}Log::debug(sprintf('getLatestBalance: notBefore date is "%s", calculating', $notBefore->format('Y-m-d')));- $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')- ->whereNull('transactions.deleted_at')- ->where('transaction_journals.transaction_currency_id', $currencyId)- ->whereNull('transaction_journals.deleted_at')+ $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')+ ->whereNull('transactions.deleted_at')+ ->where('transaction_journals.transaction_currency_id', $currencyId)+ ->whereNull('transaction_journals.deleted_at')// this order is the same as GroupCollector- ->orderBy('transaction_journals.date', 'DESC')- ->orderBy('transaction_journals.order', 'ASC')- ->orderBy('transaction_journals.id', 'DESC')- ->orderBy('transaction_journals.description', 'DESC')- ->orderBy('transactions.amount', 'DESC')- ->where('transactions.account_id', $accountId);+ ->orderBy('transaction_journals.date', 'DESC')+ ->orderBy('transaction_journals.order', 'ASC')+ ->orderBy('transaction_journals.id', 'DESC')+ ->orderBy('transaction_journals.description', 'DESC')+ ->orderBy('transactions.amount', 'DESC')+ ->where('transactions.account_id', $accountId)+ ;$notBefore->startOfDay();$query->where('transaction_journals.date', '<', $notBefore);@@ -112,14 +113,15 @@ class AccountBalanceCalculator$balances = [];$count = 0;$query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')- ->whereNull('transactions.deleted_at')- ->whereNull('transaction_journals.deleted_at')+ ->whereNull('transactions.deleted_at')+ ->whereNull('transaction_journals.deleted_at')// this order is the same as GroupCollector, but in the exact reverse.- ->orderBy('transaction_journals.date', 'asc')- ->orderBy('transaction_journals.order', 'desc')- ->orderBy('transaction_journals.id', 'asc')- ->orderBy('transaction_journals.description', 'asc')- ->orderBy('transactions.amount', 'asc');+ ->orderBy('transaction_journals.date', 'asc')+ ->orderBy('transaction_journals.order', 'desc')+ ->orderBy('transaction_journals.id', 'asc')+ ->orderBy('transaction_journals.description', 'asc')+ ->orderBy('transactions.amount', 'asc')+ ;if ($accounts->count() > 0) {$query->whereIn('transactions.account_id', $accounts->pluck('id')->toArray());}@@ -128,7 +130,7 @@ class AccountBalanceCalculator$query->where('transaction_journals.date', '>=', $notBefore);}- $set = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']);+ $set = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']);Log::debug(sprintf('Counted %d transaction(s)', $set->count()));// the balance value is an array.@@ -141,8 +143,8 @@ class AccountBalanceCalculator$balances[$entry->account_id][$entry->transaction_currency_id] ??= [$this->getLatestBalance($entry->account_id, $entry->transaction_currency_id, $notBefore), null];// before and after are easy:- $before = $balances[$entry->account_id][$entry->transaction_currency_id][0];- $after = bcadd($before, (string)$entry->amount);+ $before = $balances[$entry->account_id][$entry->transaction_currency_id][0];+ $after = bcadd($before, (string)$entry->amount);if (true === $entry->balance_dirty || $accounts->count() > 0) {// update the transaction:$entry->balance_before = $before;diff --git a/app/Support/Models/BillDateCalculator.php b/app/Support/Models/BillDateCalculator.phpindex 9f40348777..3d49c867a3 100644--- a/app/Support/Models/BillDateCalculator.php+++ b/app/Support/Models/BillDateCalculator.php@@ -49,15 +49,15 @@ class BillDateCalculatorLog::debug(sprintf('Dates must be between %s and %s.', $earliest->format('Y-m-d'), $latest->format('Y-m-d')));Log::debug(sprintf('Bill started on %s, period is "%s", skip is %d, last paid = "%s".', $billStart->format('Y-m-d'), $period, $skip, $lastPaid?->format('Y-m-d')));- $daysUntilEOM = app('navigation')->daysUntilEndOfMonth($billStart);+ $daysUntilEOM = app('navigation')->daysUntilEndOfMonth($billStart);Log::debug(sprintf('For bill start, days until end of month is %d', $daysUntilEOM));- $set = new Collection();- $currentStart = clone $earliest;+ $set = new Collection();+ $currentStart = clone $earliest;// 2023-06-23 subDay to fix 7655$currentStart->subDay();- $loop = 0;+ $loop = 0;Log::debug('Start of loop');while ($currentStart <= $latest) {@@ -107,7 +107,7 @@ class BillDateCalculator// for the next loop, go to end of period, THEN add day.Log::debug('Add one day to nextExpectedMatch/currentStart.');$nextExpectedMatch->addDay();- $currentStart = clone $nextExpectedMatch;+ $currentStart = clone $nextExpectedMatch;++$loop;if ($loop > 31) {@@ -117,8 +117,8 @@ class BillDateCalculator}}Log::debug('end of loop');- $simple = $set->map( // @phpstan-ignore-line- static fn(Carbon $date) => $date->format('Y-m-d')+ $simple = $set->map( // @phpstan-ignore-line+ static fn (Carbon $date) => $date->format('Y-m-d'));Log::debug(sprintf('Found %d pay dates', $set->count()), $simple->toArray());@@ -140,7 +140,7 @@ class BillDateCalculatorreturn $billStartDate;}- $steps = app('navigation')->diffInPeriods($period, $skip, $earliest, $billStartDate);+ $steps = app('navigation')->diffInPeriods($period, $skip, $earliest, $billStartDate);if ($steps === $this->diffInMonths) {Log::debug(sprintf('Steps is %d, which is the same as diffInMonths (%d), so we add another 1.', $steps, $this->diffInMonths));++$steps;diff --git a/app/Support/Models/ReturnsIntegerIdTrait.php b/app/Support/Models/ReturnsIntegerIdTrait.phpindex d8178e07a5..f3fac096ce 100644--- a/app/Support/Models/ReturnsIntegerIdTrait.php+++ b/app/Support/Models/ReturnsIntegerIdTrait.php@@ -39,7 +39,7 @@ trait ReturnsIntegerIdTraitprotected function id(): Attribute{return Attribute::make(- get: static fn($value) => (int)$value,+ get: static fn ($value) => (int)$value,);}}diff --git a/app/Support/Models/ReturnsIntegerUserIdTrait.php b/app/Support/Models/ReturnsIntegerUserIdTrait.phpindex 8eca6e943c..3f1808923d 100644--- a/app/Support/Models/ReturnsIntegerUserIdTrait.php+++ b/app/Support/Models/ReturnsIntegerUserIdTrait.php@@ -37,14 +37,14 @@ trait ReturnsIntegerUserIdTraitprotected function userGroupId(): Attribute{return Attribute::make(- get: static fn($value) => (int)$value,+ get: static fn ($value) => (int)$value,);}protected function userId(): Attribute{return Attribute::make(- get: static fn($value) => (int)$value,+ get: static fn ($value) => (int)$value,);}}diff --git a/app/Support/Navigation.php b/app/Support/Navigation.phpindex a1e2c256c7..cb9ac29d9f 100644--- a/app/Support/Navigation.php+++ b/app/Support/Navigation.php@@ -77,10 +77,10 @@ class Navigationif (!array_key_exists($repeatFreq, $functionMap)) {Log::error(sprintf(- 'The periodicity %s is unknown. Choose one of available periodicity: %s',- $repeatFreq,- implode(', ', array_keys($functionMap))- ));+ 'The periodicity %s is unknown. Choose one of available periodicity: %s',+ $repeatFreq,+ implode(', ', array_keys($functionMap))+ ));return $theDate;}@@ -93,7 +93,7 @@ class Navigationif ($end < $start) {[$start, $end] = [$end, $start];}- $periods = [];+ $periods = [];// first, 13 periods of [range]$loopCount = 0;$loopDate = clone $end;@@ -151,13 +151,13 @@ class Navigationpublic function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int{Log::debug(sprintf(- 'diffInPeriods: %s (skip: %d), between %s and %s.',- $period,- $skip,- $beginning->format('Y-m-d'),- $end->format('Y-m-d')- ));- $map = [+ 'diffInPeriods: %s (skip: %d), between %s and %s.',+ $period,+ $skip,+ $beginning->format('Y-m-d'),+ $end->format('Y-m-d')+ ));+ $map = ['daily' => 'diffInDays','weekly' => 'diffInWeeks','monthly' => 'diffInMonths',@@ -170,7 +170,7 @@ class Navigationreturn 1;}- $func = $map[$period];+ $func = $map[$period];// first do the diff$floatDiff = $beginning->{$func}($end, true); // @phpstan-ignore-line@@ -185,7 +185,7 @@ class Navigation}// then do ceil()- $diff = ceil($floatDiff);+ $diff = ceil($floatDiff);Log::debug(sprintf('Diff is %f periods (%d rounded up)', $floatDiff, $diff));@@ -193,11 +193,11 @@ class Navigation$parameter = $skip + 1;$diff = ceil($diff / $parameter) * $parameter;Log::debug(sprintf(- 'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',- $skip,- $parameter,- $diff- ));+ 'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',+ $skip,+ $parameter,+ $diff+ ));}return (int)$diff;@@ -205,7 +205,7 @@ class Navigationpublic function endOfPeriod(Carbon $end, string $repeatFreq): Carbon{- $currentEnd = clone $end;+ $currentEnd = clone $end;// Log::debug(sprintf('Now in endOfPeriod("%s", "%s").', $currentEnd->toIso8601String(), $repeatFreq));$functionMap = [@@ -239,7 +239,7 @@ class NavigationLog::debug('Session data available.');/** @var Carbon $tStart */- $tStart = session('start', today(config('app.timezone'))->startOfMonth());+ $tStart = session('start', today(config('app.timezone'))->startOfMonth());/** @var Carbon $tEnd */$tEnd = session('end', today(config('app.timezone'))->endOfMonth());@@ -259,7 +259,7 @@ class Navigationreturn $end->endOfMonth();}- $result = match ($repeatFreq) {+ $result = match ($repeatFreq) {'last7' => $currentEnd->addDays(7)->startOfDay(),'last30' => $currentEnd->addDays(30)->startOfDay(),'last90' => $currentEnd->addDays(90)->startOfDay(),@@ -279,7 +279,7 @@ class Navigationreturn $end;}- $function = $functionMap[$repeatFreq];+ $function = $functionMap[$repeatFreq];if (array_key_exists($repeatFreq, $modifierMap)) {$currentEnd->{$function}($modifierMap[$repeatFreq])->milli(0); // @phpstan-ignore-line@@ -319,7 +319,7 @@ class Navigation'yearly' => 'endOfYear',];- $currentEnd = clone $theCurrentEnd;+ $currentEnd = clone $theCurrentEnd;if (array_key_exists($repeatFreq, $functionMap)) {$function = $functionMap[$repeatFreq];@@ -362,7 +362,7 @@ class Navigation*/public function listOfPeriods(Carbon $start, Carbon $end): array{- $locale = app('steam')->getLocale();+ $locale = app('steam')->getLocale();// define period to increment$increment = 'addDay';$format = $this->preferredCarbonFormat($start, $end);@@ -379,8 +379,8 @@ class Navigation$increment = 'addYear';$displayFormat = (string)trans('config.year_js');}- $begin = clone $start;- $entries = [];+ $begin = clone $start;+ $entries = [];while ($begin < $end) {$formatted = $begin->format($format);$displayed = $begin->isoFormat($displayFormat);@@ -439,6 +439,7 @@ class Navigation// special formatter for quarter of yearLog::error(sprintf('No date formats for frequency "%s"!', $repeatFrequency));+throw new FireflyException(sprintf('No date formats for frequency "%s"!', $repeatFrequency));return $date->format('Y-m-d');@@ -557,9 +558,9 @@ class Navigationpublic function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon{- $date = clone $theDate;+ $date = clone $theDate;// Log::debug(sprintf('Now in startOfPeriod("%s", "%s")', $date->toIso8601String(), $repeatFreq));- $functionMap = [+ $functionMap = ['1D' => 'startOfDay','daily' => 'startOfDay','1W' => 'startOfWeek',@@ -606,7 +607,7 @@ class Navigationreturn $date;}- $result = match ($repeatFreq) {+ $result = match ($repeatFreq) {'last7' => $date->subDays(7)->startOfDay(),'last30' => $date->subDays(30)->startOfDay(),'last90' => $date->subDays(90)->startOfDay(),@@ -638,7 +639,7 @@ class Navigationpublic function subtractPeriod(Carbon $theDate, string $repeatFreq, ?int $subtract = null): Carbon{$subtract ??= 1;- $date = clone $theDate;+ $date = clone $theDate;// 1D 1W 1M 3M 6M 1Y$functionMap = ['1D' => 'subDays',@@ -677,7 +678,7 @@ class Navigation// this is then subtracted from $theDate (* $subtract).if ('custom' === $repeatFreq) {/** @var Carbon $tStart */- $tStart = session('start', today(config('app.timezone'))->startOfMonth());+ $tStart = session('start', today(config('app.timezone'))->startOfMonth());/** @var Carbon $tEnd */$tEnd = session('end', today(config('app.timezone'))->endOfMonth());@@ -771,7 +772,7 @@ class Navigationreturn $fiscalHelper->endOfFiscalYear($end);}- $list = [+ $list = ['last7','last30','last90',diff --git a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.phpindex d71872971c..82f513a44e 100644--- a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php+++ b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php@@ -41,10 +41,10 @@ trait RecalculatesAvailableBudgetsTrait{private function calculateAmount(AvailableBudget $availableBudget): void{- $repository = app(BudgetLimitRepositoryInterface::class);+ $repository = app(BudgetLimitRepositoryInterface::class);$repository->setUser($availableBudget->user);- $newAmount = '0';- $abPeriod = Period::make($availableBudget->start_date, $availableBudget->end_date, Precision::DAY());+ $newAmount = '0';+ $abPeriod = Period::make($availableBudget->start_date, $availableBudget->end_date, Precision::DAY());Log::debug(sprintf('Now at AB #%d, ("%s" to "%s")',@@ -54,7 +54,7 @@ trait RecalculatesAvailableBudgetsTrait));// have to recalculate everything just in case.- $set = $repository->getAllBudgetLimitsByCurrency($availableBudget->transactionCurrency, $availableBudget->start_date, $availableBudget->end_date);+ $set = $repository->getAllBudgetLimitsByCurrency($availableBudget->transactionCurrency, $availableBudget->start_date, $availableBudget->end_date);Log::debug(sprintf('Found %d interesting budget limit(s).', $set->count()));/** @var BudgetLimit $budgetLimit */@@ -69,8 +69,8 @@ trait RecalculatesAvailableBudgetsTrait);// overlap in days:$limitPeriod = Period::make(- $budgetLimit->start_date,- $budgetLimit->end_date,+ $budgetLimit->start_date,+ $budgetLimit->end_date,precision : Precision::DAY(),boundaries: Boundaries::EXCLUDE_NONE());@@ -111,8 +111,8 @@ trait RecalculatesAvailableBudgetsTraitreturn '0';}$limitPeriod = Period::make(- $budgetLimit->start_date,- $budgetLimit->end_date,+ $budgetLimit->start_date,+ $budgetLimit->end_date,precision : Precision::DAY(),boundaries: Boundaries::EXCLUDE_NONE());@@ -130,7 +130,7 @@ trait RecalculatesAvailableBudgetsTraitLog::debug(sprintf('Now in updateAvailableBudget(limit #%d)', $budgetLimit->id));/** @var null|Budget $budget */- $budget = Budget::find($budgetLimit->budget_id);+ $budget = Budget::find($budgetLimit->budget_id);if (null === $budget) {Log::warning('Budget is null, probably deleted, find deleted version.');@@ -145,7 +145,7 @@ trait RecalculatesAvailableBudgetsTrait}/** @var null|User $user */- $user = $budget->user;+ $user = $budget->user;// sanity check. It happens when the budget has been deleted so the original user is unknown.if (null === $user) {@@ -161,7 +161,7 @@ trait RecalculatesAvailableBudgetsTrait// all have to be created or updated.try {$viewRange = app('preferences')->getForUser($user, 'viewRange', '1M')->data;- } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {+ } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {Log::error($e->getMessage());$viewRange = '1M';}@@ -169,20 +169,20 @@ trait RecalculatesAvailableBudgetsTraitif (null === $viewRange || is_array($viewRange)) {$viewRange = '1M';}- $viewRange = (string)$viewRange;+ $viewRange = (string)$viewRange;- $start = app('navigation')->startOfPeriod($budgetLimit->start_date, $viewRange);- $end = app('navigation')->startOfPeriod($budgetLimit->end_date, $viewRange);- $end = app('navigation')->endOfPeriod($end, $viewRange);+ $start = app('navigation')->startOfPeriod($budgetLimit->start_date, $viewRange);+ $end = app('navigation')->startOfPeriod($budgetLimit->end_date, $viewRange);+ $end = app('navigation')->endOfPeriod($end, $viewRange);// limit period in total is:$limitPeriod = Period::make($start, $end, precision: Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE());Log::debug(sprintf('Limit period is from %s to %s', $start->format('Y-m-d'), $end->format('Y-m-d')));// from the start until the end of the budget limit, need to loop!- $current = clone $start;+ $current = clone $start;while ($current <= $end) {- $currentEnd = app('navigation')->endOfPeriod($current, $viewRange);+ $currentEnd = app('navigation')->endOfPeriod($current, $viewRange);// create or find AB for this particular period, and set the amount accordingly./** @var null|AvailableBudget $availableBudget */@@ -227,7 +227,7 @@ trait RecalculatesAvailableBudgetsTrait}// prep for next loop- $current = app('navigation')->addPeriod($current, $viewRange, 0);+ $current = app('navigation')->addPeriod($current, $viewRange, 0);}}}diff --git a/app/Support/ParseDateString.php b/app/Support/ParseDateString.phpindex bd91585f8b..df60be3d1d 100644--- a/app/Support/ParseDateString.php+++ b/app/Support/ParseDateString.php@@ -29,6 +29,7 @@ use Carbon\CarbonInterface;use Carbon\Exceptions\InvalidFormatException;use FireflyIII\Exceptions\FireflyException;use Illuminate\Support\Facades\Log;+use function Safe\preg_match;/**@@ -78,15 +79,15 @@ class ParseDateStringpublic function parseDate(string $date): Carbon{Log::debug(sprintf('parseDate("%s")', $date));- $date = strtolower($date);+ $date = strtolower($date);// parse keywords:if (in_array($date, $this->keywords, true)) {return $this->parseKeyword($date);}// if regex for YYYY-MM-DD:- $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12]\d|3[01])$/';- $result = preg_match($pattern, $date);+ $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12]\d|3[01])$/';+ $result = preg_match($pattern, $date);if (0 !== $result) {return $this->parseDefaultDate($date);}@@ -355,11 +356,11 @@ class ParseDateStringforeach ($parts as $part) {Log::debug(sprintf('Now parsing part "%s"', $part));- $part = trim($part);+ $part = trim($part);// verify if correct- $pattern = '/[+-]\d+[wqmdy]/';- $result = preg_match($pattern, $part);+ $pattern = '/[+-]\d+[wqmdy]/';+ $result = preg_match($pattern, $part);if (0 === $result) {Log::error(sprintf('Part "%s" does not match regular expression. Will be skipped.', $part));@@ -373,7 +374,7 @@ class ParseDateStringcontinue;}- $func = $functions[$direction][$period];+ $func = $functions[$direction][$period];Log::debug(sprintf('Will now do %s(%d) on %s', $func, $number, $today->format('Y-m-d')));$today->{$func}($number); // @phpstan-ignore-lineLog::debug(sprintf('Resulting date is %s', $today->format('Y-m-d')));diff --git a/app/Support/Preferences.php b/app/Support/Preferences.phpindex f8fc423cc7..d622f1f66f 100644--- a/app/Support/Preferences.php+++ b/app/Support/Preferences.php@@ -48,12 +48,13 @@ class Preferences}return Preference::where('user_id', $user->id)- ->where('name', '!=', 'currencyPreference')- ->where(function (Builder $q) use ($user): void {- $q->whereNull('user_group_id');- $q->orWhere('user_group_id', $user->user_group_id);- })- ->get();+ ->where('name', '!=', 'currencyPreference')+ ->where(function (Builder $q) use ($user): void {+ $q->whereNull('user_group_id');+ $q->orWhere('user_group_id', $user->user_group_id);+ })+ ->get()+ ;}public function beginsWith(User $user, string $search): Collection@@ -89,7 +90,7 @@ class PreferencesCache::put($key, '', 5);}- public function get(string $name, array | bool | int | string | null $default = null): ?Preference+ public function get(string $name, array|bool|int|string|null $default = null): ?Preference{/** @var null|User $user */$user = auth()->user();@@ -107,12 +108,13 @@ class Preferences{$result = [];$preferences = Preference::where('user_id', $user->id)- ->where(function (Builder $q) use ($user): void {- $q->whereNull('user_group_id');- $q->orWhere('user_group_id', $user->user_group_id);- })- ->whereIn('name', $list)- ->get(['id', 'name', 'data']);+ ->where(function (Builder $q) use ($user): void {+ $q->whereNull('user_group_id');+ $q->orWhere('user_group_id', $user->user_group_id);+ })+ ->whereIn('name', $list)+ ->get(['id', 'name', 'data'])+ ;/** @var Preference $preference */foreach ($preferences as $preference) {@@ -154,7 +156,7 @@ class Preferencesreturn $result;}- public function getEncryptedForUser(User $user, string $name, array | bool | int | string | null $default = null): ?Preference+ public function getEncryptedForUser(User $user, string $name, array|bool|int|string|null $default = null): ?Preference{$result = $this->getForUser($user, $name, $default);if ('' === $result->data) {@@ -179,7 +181,7 @@ class Preferencesreturn $result;}- public function getForUser(User $user, string $name, array | bool | int | string | null $default = null): ?Preference+ public function getForUser(User $user, string $name, array|bool|int|string|null $default = null): ?Preference{// Log::debug(sprintf('getForUser(#%d, "%s")', $user->id, $name));// don't care about user group ID, except for some specific preferences.@@ -190,7 +192,7 @@ class Preferences$query->where('user_group_id', $userGroupId);}- $preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']);+ $preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']);if (null !== $preference && null === $preference->data) {$preference->delete();@@ -214,7 +216,7 @@ class Preferencesreturn $this->setForUser($user, $name, $default);}- public function getFresh(string $name, array | bool | int | string | null $default = null): ?Preference+ public function getFresh(string $name, array|bool|int|string|null $default = null): ?Preference{/** @var null|User $user */$user = auth()->user();@@ -233,8 +235,8 @@ class Preferences*/public function lastActivity(): string{- $instance = PreferencesSingleton::getInstance();- $pref = $instance->getPreference('last_activity');+ $instance = PreferencesSingleton::getInstance();+ $pref = $instance->getPreference('last_activity');if (null !== $pref) {// Log::debug(sprintf('Found last activity in singleton: %s', $pref));return $pref;@@ -248,7 +250,7 @@ class Preferencesif (is_array($lastActivity)) {$lastActivity = implode(',', $lastActivity);}- $setting = hash('sha256', (string)$lastActivity);+ $setting = hash('sha256', (string)$lastActivity);$instance->setPreference('last_activity', $setting);return $setting;@@ -262,7 +264,7 @@ class PreferencesSession::forget('first');}- public function set(string $name, array | bool | int | string | null $value): Preference+ public function set(string $name, array|bool|int|string|null $value): Preference{/** @var null|User $user */$user = auth()->user();@@ -291,21 +293,21 @@ class Preferencesreturn $this->set($name, $encrypted);}- public function setForUser(User $user, string $name, array | bool | int | string | null $value): Preference+ public function setForUser(User $user, string $name, array|bool|int|string|null $value): Preference{- $fullName = sprintf('preference%s%s', $user->id, $name);- $userGroupId = $this->getUserGroupId($user, $name);- $userGroupId = 0 === (int)$userGroupId ? null : (int)$userGroupId;+ $fullName = sprintf('preference%s%s', $user->id, $name);+ $userGroupId = $this->getUserGroupId($user, $name);+ $userGroupId = 0 === (int)$userGroupId ? null : (int)$userGroupId;Cache::forget($fullName);- $query = Preference::where('user_id', $user->id)->where('name', $name);+ $query = Preference::where('user_id', $user->id)->where('name', $name);if (null !== $userGroupId) {Log::debug('Include user group ID in query');$query->where('user_group_id', $userGroupId);}- $preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']);+ $preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']);if (null !== $preference && null === $value) {$preference->delete();diff --git a/app/Support/Report/Budget/BudgetReportGenerator.php b/app/Support/Report/Budget/BudgetReportGenerator.phpindex b859847748..2fd81217bb 100644--- a/app/Support/Report/Budget/BudgetReportGenerator.php+++ b/app/Support/Report/Budget/BudgetReportGenerator.php@@ -76,7 +76,7 @@ class BudgetReportGenerator/** @var Account $account */foreach ($this->accounts as $account) {- $accountId = $account->id;+ $accountId = $account->id;$this->report[$accountId] ??= ['name' => $account->name,'id' => $account->id,@@ -170,16 +170,16 @@ class BudgetReportGenerator'budget_limits' => [],];- $noBudget = $this->nbRepository->sumExpenses($this->start, $this->end, $this->accounts);+ $noBudget = $this->nbRepository->sumExpenses($this->start, $this->end, $this->accounts);foreach ($noBudget as $noBudgetEntry) {// currency information:- $nbCurrencyId = (int)($noBudgetEntry['currency_id'] ?? $this->currency->id);- $nbCurrencyCode = $noBudgetEntry['currency_code'] ?? $this->currency->code;- $nbCurrencyName = $noBudgetEntry['currency_name'] ?? $this->currency->name;- $nbCurrencySymbol = $noBudgetEntry['currency_symbol'] ?? $this->currency->symbol;- $nbCurrencyDp = $noBudgetEntry['currency_decimal_places'] ?? $this->currency->decimal_places;+ $nbCurrencyId = (int)($noBudgetEntry['currency_id'] ?? $this->currency->id);+ $nbCurrencyCode = $noBudgetEntry['currency_code'] ?? $this->currency->code;+ $nbCurrencyName = $noBudgetEntry['currency_name'] ?? $this->currency->name;+ $nbCurrencySymbol = $noBudgetEntry['currency_symbol'] ?? $this->currency->symbol;+ $nbCurrencyDp = $noBudgetEntry['currency_decimal_places'] ?? $this->currency->decimal_places;- $this->report['budgets'][0]['budget_limits'][] = [+ $this->report['budgets'][0]['budget_limits'][] = ['budget_limit_id' => null,'start_date' => $this->start,'end_date' => $this->end,@@ -195,7 +195,7 @@ class BudgetReportGenerator'currency_symbol' => $nbCurrencySymbol,'currency_decimal_places' => $nbCurrencyDp,];- $this->report['sums'][$nbCurrencyId]['spent'] = bcadd($this->report['sums'][$nbCurrencyId]['spent'] ?? '0', (string)$noBudgetEntry['sum']);+ $this->report['sums'][$nbCurrencyId]['spent'] = bcadd($this->report['sums'][$nbCurrencyId]['spent'] ?? '0', (string)$noBudgetEntry['sum']);// append currency info because it may be missing:$this->report['sums'][$nbCurrencyId]['currency_id'] = $nbCurrencyId;$this->report['sums'][$nbCurrencyId]['currency_code'] = $nbCurrencyCode;@@ -218,15 +218,15 @@ class BudgetReportGenerator// make percentages based on total amount.foreach ($this->report['budgets'] as $budgetId => $data) {foreach ($data['budget_limits'] as $limitId => $entry) {- $budgetId = (int)$budgetId;- $limitId = (int)$limitId;- $currencyId = (int)$entry['currency_id'];- $spent = $entry['spent'];- $totalSpent = $this->report['sums'][$currencyId]['spent'] ?? '0';- $spentPct = '0';- $budgeted = $entry['budgeted'];- $totalBudgeted = $this->report['sums'][$currencyId]['budgeted'] ?? '0';- $budgetedPct = '0';+ $budgetId = (int)$budgetId;+ $limitId = (int)$limitId;+ $currencyId = (int)$entry['currency_id'];+ $spent = $entry['spent'];+ $totalSpent = $this->report['sums'][$currencyId]['spent'] ?? '0';+ $spentPct = '0';+ $budgeted = $entry['budgeted'];+ $totalBudgeted = $this->report['sums'][$currencyId]['budgeted'] ?? '0';+ $budgetedPct = '0';if (0 !== bccomp((string)$spent, '0') && 0 !== bccomp($totalSpent, '0')) {$spentPct = round((float)bcmul(bcdiv((string)$spent, $totalSpent), '100'));@@ -234,7 +234,7 @@ class BudgetReportGeneratorif (0 !== bccomp((string)$budgeted, '0') && 0 !== bccomp($totalBudgeted, '0')) {$budgetedPct = round((float)bcmul(bcdiv((string)$budgeted, $totalBudgeted), '100'));}- $this->report['sums'][$currencyId]['budgeted'] ??= '0';+ $this->report['sums'][$currencyId]['budgeted'] ??= '0';$this->report['budgets'][$budgetId]['budget_limits'][$limitId]['spent_pct'] = $spentPct;$this->report['budgets'][$budgetId]['budget_limits'][$limitId]['budgeted_pct'] = $budgetedPct;}@@ -246,7 +246,7 @@ class BudgetReportGenerator*/private function processBudget(Budget $budget): void{- $budgetId = $budget->id;+ $budgetId = $budget->id;$this->report['budgets'][$budgetId] ??= ['budget_id' => $budgetId,'budget_name' => $budget->name,@@ -255,7 +255,7 @@ class BudgetReportGenerator];// get all budget limits for budget in period:- $limits = $this->blRepository->getBudgetLimits($budget, $this->start, $this->end);+ $limits = $this->blRepository->getBudgetLimits($budget, $this->start, $this->end);/** @var BudgetLimit $limit */foreach ($limits as $limit) {@@ -275,18 +275,18 @@ class BudgetReportGenerator$this->report[$sourceAccountId]['currencies'][$currencyId]??= [- 'currency_id' => $expenses['currency_id'],- 'currency_symbol' => $expenses['currency_symbol'],- 'currency_name' => $expenses['currency_name'],- 'currency_decimal_places' => $expenses['currency_decimal_places'],- 'budgets' => [],- ];+ 'currency_id' => $expenses['currency_id'],+ 'currency_symbol' => $expenses['currency_symbol'],+ 'currency_name' => $expenses['currency_name'],+ 'currency_decimal_places' => $expenses['currency_decimal_places'],+ 'budgets' => [],+ ];$this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId]??= '0';$this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId]- = bcadd($this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId], (string)$journal['amount']);+ = bcadd($this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId], (string)$journal['amount']);}}@@ -305,14 +305,14 @@ class BudgetReportGenerator*/private function processLimit(Budget $budget, BudgetLimit $limit): void{- $budgetId = $budget->id;- $limitId = $limit->id;- $limitCurrency = $limit->transactionCurrency ?? $this->currency;- $currencyId = $limitCurrency->id;- $expenses = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, $this->accounts, new Collection()->push($budget));- $spent = $expenses[$currencyId]['sum'] ?? '0';- $left = -1 === bccomp(bcadd($limit->amount, $spent), '0') ? '0' : bcadd($limit->amount, $spent);- $overspent = 1 === bccomp(bcmul($spent, '-1'), $limit->amount) ? bcadd($spent, $limit->amount) : '0';+ $budgetId = $budget->id;+ $limitId = $limit->id;+ $limitCurrency = $limit->transactionCurrency ?? $this->currency;+ $currencyId = $limitCurrency->id;+ $expenses = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, $this->accounts, new Collection()->push($budget));+ $spent = $expenses[$currencyId]['sum'] ?? '0';+ $left = -1 === bccomp(bcadd($limit->amount, $spent), '0') ? '0' : bcadd($limit->amount, $spent);+ $overspent = 1 === bccomp(bcmul($spent, '-1'), $limit->amount) ? bcadd($spent, $limit->amount) : '0';$this->report['budgets'][$budgetId]['budget_limits'][$limitId] ??= ['budget_limit_id' => $limitId,@@ -333,17 +333,17 @@ class BudgetReportGenerator// make sum information:$this->report['sums'][$currencyId]- ??= [- 'budgeted' => '0',- 'spent' => '0',- 'left' => '0',- 'overspent' => '0',- 'currency_id' => $currencyId,- 'currency_code' => $limitCurrency->code,- 'currency_name' => $limitCurrency->name,- 'currency_symbol' => $limitCurrency->symbol,- 'currency_decimal_places' => $limitCurrency->decimal_places,- ];+ ??= [+ 'budgeted' => '0',+ 'spent' => '0',+ 'left' => '0',+ 'overspent' => '0',+ 'currency_id' => $currencyId,+ 'currency_code' => $limitCurrency->code,+ 'currency_name' => $limitCurrency->name,+ 'currency_symbol' => $limitCurrency->symbol,+ 'currency_decimal_places' => $limitCurrency->decimal_places,+ ];$this->report['sums'][$currencyId]['budgeted'] = bcadd((string)$this->report['sums'][$currencyId]['budgeted'], $limit->amount);$this->report['sums'][$currencyId]['spent'] = bcadd((string)$this->report['sums'][$currencyId]['spent'], $spent);$this->report['sums'][$currencyId]['left'] = bcadd((string)$this->report['sums'][$currencyId]['left'], bcadd($limit->amount, $spent));diff --git a/app/Support/Report/Category/CategoryReportGenerator.php b/app/Support/Report/Category/CategoryReportGenerator.phpindex 8f800d411d..51570e7696 100644--- a/app/Support/Report/Category/CategoryReportGenerator.php+++ b/app/Support/Report/Category/CategoryReportGenerator.php@@ -62,17 +62,17 @@ class CategoryReportGenerator*/public function operations(): void{- $earnedWith = $this->opsRepository->listIncome($this->start, $this->end, $this->accounts);- $spentWith = $this->opsRepository->listExpenses($this->start, $this->end, $this->accounts);+ $earnedWith = $this->opsRepository->listIncome($this->start, $this->end, $this->accounts);+ $spentWith = $this->opsRepository->listExpenses($this->start, $this->end, $this->accounts);// also transferred out and transferred into these accounts in this category:$transferredIn = $this->opsRepository->listTransferredIn($this->start, $this->end, $this->accounts);$transferredOut = $this->opsRepository->listTransferredOut($this->start, $this->end, $this->accounts);- $earnedWithout = $this->noCatRepository->listIncome($this->start, $this->end, $this->accounts);- $spentWithout = $this->noCatRepository->listExpenses($this->start, $this->end, $this->accounts);+ $earnedWithout = $this->noCatRepository->listIncome($this->start, $this->end, $this->accounts);+ $spentWithout = $this->noCatRepository->listExpenses($this->start, $this->end, $this->accounts);- $this->report = [+ $this->report = ['categories' => [],'sums' => [],];@@ -106,7 +106,7 @@ class CategoryReportGeneratorprivate function processCategoryRow(int $currencyId, array $currencyRow, int $categoryId, array $categoryRow): void{- $key = sprintf('%s-%s', $currencyId, $categoryId);+ $key = sprintf('%s-%s', $currencyId, $categoryId);$this->report['categories'][$key] ??= ['id' => $categoryId,'title' => $categoryRow['name'],@@ -122,9 +122,9 @@ class CategoryReportGenerator// loop journals:foreach ($categoryRow['transaction_journals'] as $journal) {// sum of sums- $this->report['sums'][$currencyId]['sum'] = bcadd((string)$this->report['sums'][$currencyId]['sum'], (string)$journal['amount']);+ $this->report['sums'][$currencyId]['sum'] = bcadd((string)$this->report['sums'][$currencyId]['sum'], (string)$journal['amount']);// sum of spent:- $this->report['sums'][$currencyId]['spent'] = -1 === bccomp((string)$journal['amount'], '0') ? bcadd(+ $this->report['sums'][$currencyId]['spent'] = -1 === bccomp((string)$journal['amount'], '0') ? bcadd((string)$this->report['sums'][$currencyId]['spent'],(string)$journal['amount']) : $this->report['sums'][$currencyId]['spent'];@@ -135,14 +135,14 @@ class CategoryReportGenerator) : $this->report['sums'][$currencyId]['earned'];// sum of category- $this->report['categories'][$key]['sum'] = bcadd((string)$this->report['categories'][$key]['sum'], (string)$journal['amount']);+ $this->report['categories'][$key]['sum'] = bcadd((string)$this->report['categories'][$key]['sum'], (string)$journal['amount']);// total spent in category- $this->report['categories'][$key]['spent'] = -1 === bccomp((string)$journal['amount'], '0') ? bcadd(+ $this->report['categories'][$key]['spent'] = -1 === bccomp((string)$journal['amount'], '0') ? bcadd((string)$this->report['categories'][$key]['spent'],(string)$journal['amount']) : $this->report['categories'][$key]['spent'];// total earned in category- $this->report['categories'][$key]['earned'] = 1 === bccomp((string)$journal['amount'], '0') ? bcadd(+ $this->report['categories'][$key]['earned'] = 1 === bccomp((string)$journal['amount'], '0') ? bcadd((string)$this->report['categories'][$key]['earned'],(string)$journal['amount']) : $this->report['categories'][$key]['earned'];diff --git a/app/Support/Report/Summarizer/TransactionSummarizer.php b/app/Support/Report/Summarizer/TransactionSummarizer.phpindex 84e0ec3231..5660a239f0 100644--- a/app/Support/Report/Summarizer/TransactionSummarizer.php+++ b/app/Support/Report/Summarizer/TransactionSummarizer.php@@ -48,14 +48,14 @@ class TransactionSummarizerLog::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s", %s)', count($journals), $method, var_export($includeForeign, true)));$array = [];foreach ($journals as $journal) {- $field = 'amount';+ $field = 'amount';// grab default currency information.- $currencyId = (int)$journal['currency_id'];- $currencyName = $journal['currency_name'];- $currencySymbol = $journal['currency_symbol'];- $currencyCode = $journal['currency_code'];- $currencyDecimalPlaces = $journal['currency_decimal_places'];+ $currencyId = (int)$journal['currency_id'];+ $currencyName = $journal['currency_name'];+ $currencySymbol = $journal['currency_symbol'];+ $currencyCode = $journal['currency_code'];+ $currencyDecimalPlaces = $journal['currency_decimal_places'];// prepare foreign currency info:$foreignCurrencyId = 0;@@ -102,7 +102,7 @@ class TransactionSummarizer}// first process normal amount- $amount = (string)($journal[$field] ?? '0');+ $amount = (string)($journal[$field] ?? '0');$array[$currencyId] ??= ['sum' => '0','currency_id' => $currencyId,@@ -121,7 +121,7 @@ class TransactionSummarizer// then process foreign amount, if it exists.if (0 !== $foreignCurrencyId && true === $includeForeign) {- $amount = (string)($journal['foreign_amount'] ?? '0');+ $amount = (string)($journal['foreign_amount'] ?? '0');$array[$foreignCurrencyId] ??= ['sum' => '0','currency_id' => $foreignCurrencyId,@@ -179,7 +179,7 @@ class TransactionSummarizerif ($convertToPrimary && $journal['currency_id'] !== $primary->id && $primary->id === $journal['foreign_currency_id']) {$field = 'foreign_amount';}- $key = sprintf('%s-%s', $journal[$idKey], $currencyId);+ $key = sprintf('%s-%s', $journal[$idKey], $currencyId);// sum it all up or create a new array.$array[$key] ??= ['id' => $journal[$idKey],@@ -193,7 +193,7 @@ class TransactionSummarizer];// add the data from the $field to the array.- $array[$key]['sum'] = bcadd($array[$key]['sum'], Steam::{$method}((string)($journal[$field] ?? '0'))); // @phpstan-ignore-line+ $array[$key]['sum'] = bcadd($array[$key]['sum'], Steam::{$method}((string)($journal[$field] ?? '0'))); // @phpstan-ignore-lineLog::debug(sprintf('Field for transaction #%d is "%s" (%s). Sum: %s', $journal['transaction_group_id'], $currencyCode, $field, $array[$key]['sum']));// also do foreign amount, but only when convertToPrimary is false (otherwise we have it already)@@ -201,7 +201,7 @@ class TransactionSummarizerif ((!$convertToPrimary || $journal['foreign_currency_id'] !== $primary->id) && 0 !== (int)$journal['foreign_currency_id']) {Log::debug(sprintf('Use foreign amount from transaction #%d: %s %s. Sum: %s', $journal['transaction_group_id'], $currencyCode, $journal['foreign_amount'], $array[$key]['sum']));$key = sprintf('%s-%s', $journal[$idKey], $journal['foreign_currency_id']);- $array[$key] ??= [+ $array[$key] ??= ['id' => $journal[$idKey],'name' => $journal[$nameKey],'sum' => '0',diff --git a/app/Support/Repositories/Recurring/CalculateRangeOccurrences.php b/app/Support/Repositories/Recurring/CalculateRangeOccurrences.phpindex 4ca2c8c29e..df73a72f60 100644--- a/app/Support/Repositories/Recurring/CalculateRangeOccurrences.php+++ b/app/Support/Repositories/Recurring/CalculateRangeOccurrences.php@@ -82,8 +82,8 @@ trait CalculateRangeOccurrences*/protected function getNdomInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array{- $return = [];- $attempts = 0;+ $return = [];+ $attempts = 0;$start->startOfMonth();// this feels a bit like a cop out but why reinvent the wheel?$counters = [1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth'];@@ -108,12 +108,12 @@ trait CalculateRangeOccurrences*/protected function getWeeklyInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array{- $return = [];- $attempts = 0;+ $return = [];+ $attempts = 0;app('log')->debug('Rep is weekly.');// monday = 1// sunday = 7- $dayOfWeek = (int)$moment;+ $dayOfWeek = (int)$moment;app('log')->debug(sprintf('DoW in repetition is %d, in mutator is %d', $dayOfWeek, $start->dayOfWeekIso));if ($start->dayOfWeekIso > $dayOfWeek) {// day has already passed this week, add one week:@@ -154,8 +154,8 @@ trait CalculateRangeOccurrences}// is $date between $start and $end?- $obj = clone $date;- $count = 0;+ $obj = clone $date;+ $count = 0;while ($obj <= $end && $obj >= $start && $count < 10) {if (0 === $attempts % $skipMod) {$return[] = clone $obj;diff --git a/app/Support/Repositories/Recurring/CalculateXOccurrences.php b/app/Support/Repositories/Recurring/CalculateXOccurrences.phpindex 602cb03d02..f31171810f 100644--- a/app/Support/Repositories/Recurring/CalculateXOccurrences.php+++ b/app/Support/Repositories/Recurring/CalculateXOccurrences.php@@ -89,10 +89,10 @@ trait CalculateXOccurrences*/protected function getXNDomOccurrences(Carbon $date, int $count, int $skipMod, string $moment): array{- $return = [];- $total = 0;- $attempts = 0;- $mutator = clone $date;+ $return = [];+ $total = 0;+ $attempts = 0;+ $mutator = clone $date;$mutator->addDay(); // always assume today has passed.$mutator->startOfMonth();// this feels a bit like a cop out but why reinvent the wheel?@@ -120,14 +120,14 @@ trait CalculateXOccurrences*/protected function getXWeeklyOccurrences(Carbon $date, int $count, int $skipMod, string $moment): array{- $return = [];- $total = 0;- $attempts = 0;- $mutator = clone $date;+ $return = [];+ $total = 0;+ $attempts = 0;+ $mutator = clone $date;// monday = 1// sunday = 7$mutator->addDay(); // always assume today has passed.- $dayOfWeek = (int)$moment;+ $dayOfWeek = (int)$moment;if ($mutator->dayOfWeekIso > $dayOfWeek) {// day has already passed this week, add one week:$mutator->addWeek();@@ -164,7 +164,7 @@ trait CalculateXOccurrencesif ($mutator > $date) {$date->addYear();}- $obj = clone $date;+ $obj = clone $date;while ($total < $count) {if (0 === $attempts % $skipMod) {$return[] = clone $obj;diff --git a/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php b/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.phpindex bd4b44fd7d..2fc216493d 100644--- a/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php+++ b/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php@@ -87,7 +87,7 @@ trait CalculateXOccurrencesSince++$total;}++$attempts;- $mutator = $mutator->endOfMonth()->addDay();+ $mutator = $mutator->endOfMonth()->addDay();}Log::debug('Collected enough occurrences.');@@ -103,10 +103,10 @@ trait CalculateXOccurrencesSinceprotected function getXNDomOccurrencesSince(Carbon $date, Carbon $afterDate, int $count, int $skipMod, string $moment): array{Log::debug(sprintf('Now in %s', __METHOD__));- $return = [];- $total = 0;- $attempts = 0;- $mutator = clone $date;+ $return = [];+ $total = 0;+ $attempts = 0;+ $mutator = clone $date;$mutator->addDay(); // always assume today has passed.$mutator->startOfMonth();// this feels a bit like a cop out but why reinvent the wheel?@@ -137,15 +137,15 @@ trait CalculateXOccurrencesSinceprotected function getXWeeklyOccurrencesSince(Carbon $date, Carbon $afterDate, int $count, int $skipMod, string $moment): array{Log::debug(sprintf('Now in %s', __METHOD__));- $return = [];- $total = 0;- $attempts = 0;- $mutator = clone $date;+ $return = [];+ $total = 0;+ $attempts = 0;+ $mutator = clone $date;// monday = 1// sunday = 7// Removed assumption today has passed, see issue https://github.com/firefly-iii/firefly-iii/issues/4798// $mutator->addDay(); // always assume today has passed.- $dayOfWeek = (int)$moment;+ $dayOfWeek = (int)$moment;if ($mutator->dayOfWeekIso > $dayOfWeek) {// day has already passed this week, add one week:$mutator->addWeek();@@ -189,7 +189,7 @@ trait CalculateXOccurrencesSince$date->addYear();Log::debug(sprintf('Date is now %s', $date->format('Y-m-d')));}- $obj = clone $date;+ $obj = clone $date;while ($total < $count) {Log::debug(sprintf('total (%d) < count (%d) so go.', $total, $count));Log::debug(sprintf('attempts (%d) %% skipmod (%d) === %d', $attempts, $skipMod, $attempts % $skipMod));diff --git a/app/Support/Repositories/Recurring/FiltersWeekends.php b/app/Support/Repositories/Recurring/FiltersWeekends.phpindex 886679ced1..508e13f638 100644--- a/app/Support/Repositories/Recurring/FiltersWeekends.php+++ b/app/Support/Repositories/Recurring/FiltersWeekends.php@@ -46,7 +46,7 @@ trait FiltersWeekendsreturn $dates;}- $return = [];+ $return = [];/** @var Carbon $date */foreach ($dates as $date) {@@ -60,7 +60,7 @@ trait FiltersWeekends// is weekend and must set back to Friday?if (RecurrenceRepetitionWeekend::WEEKEND_TO_FRIDAY->value === $repetition->weekend) {- $clone = clone $date;+ $clone = clone $date;$clone->addDays(5 - $date->dayOfWeekIso);Log::debug(sprintf('Date is %s, and this is in the weekend, so corrected to %s (Friday).', $date->format('D d M Y'), $clone->format('D d M Y'))@@ -72,7 +72,7 @@ trait FiltersWeekends// postpone to Monday?if (RecurrenceRepetitionWeekend::WEEKEND_TO_MONDAY->value === $repetition->weekend) {- $clone = clone $date;+ $clone = clone $date;$clone->addDays(8 - $date->dayOfWeekIso);Log::debug(sprintf('Date is %s, and this is in the weekend, so corrected to %s (Monday).', $date->format('D d M Y'), $clone->format('D d M Y'))diff --git a/app/Support/Repositories/UserGroup/UserGroupInterface.php b/app/Support/Repositories/UserGroup/UserGroupInterface.phpindex 67e7fe3ea3..d7a737b919 100644--- a/app/Support/Repositories/UserGroup/UserGroupInterface.php+++ b/app/Support/Repositories/UserGroup/UserGroupInterface.php@@ -37,7 +37,7 @@ interface UserGroupInterfacepublic function getUserGroup(): ?UserGroup;- public function setUser(Authenticatable | User | null $user): void;+ public function setUser(Authenticatable|User|null $user): void;public function setUserGroup(UserGroup $userGroup): void;diff --git a/app/Support/Repositories/UserGroup/UserGroupTrait.php b/app/Support/Repositories/UserGroup/UserGroupTrait.phpindex b6a1c94f5a..98781e5596 100644--- a/app/Support/Repositories/UserGroup/UserGroupTrait.php+++ b/app/Support/Repositories/UserGroup/UserGroupTrait.php@@ -61,10 +61,10 @@ trait UserGroupTrait/*** @throws FireflyException*/- public function setUser(Authenticatable | User | null $user): void+ public function setUser(Authenticatable|User|null $user): void{if ($user instanceof User) {- $this->user = $user;+ $this->user = $user;if (null === $user->userGroup) {throw new FireflyException(sprintf('User #%d ("%s") has no user group.', $user->id, $user->email));}@@ -99,14 +99,15 @@ trait UserGroupTraitpublic function setUserGroupById(int $userGroupId): void{$memberships = GroupMembership::where('user_id', $this->user->id)- ->where('user_group_id', $userGroupId)- ->count();+ ->where('user_group_id', $userGroupId)+ ->count()+ ;if (0 === $memberships) {throw new FireflyException(sprintf('User #%d has no access to administration #%d', $this->user->id, $userGroupId));}/** @var null|UserGroup $userGroup */- $userGroup = UserGroup::find($userGroupId);+ $userGroup = UserGroup::find($userGroupId);if (null === $userGroup) {throw new FireflyException(sprintf('Cannot find administration for user #%d', $this->user->id));}diff --git a/app/Support/Request/AppendsLocationData.php b/app/Support/Request/AppendsLocationData.phpindex 01a6de40d3..b77cd9ee41 100644--- a/app/Support/Request/AppendsLocationData.php+++ b/app/Support/Request/AppendsLocationData.php@@ -96,12 +96,12 @@ trait AppendsLocationData$data['latitude'] = null;$data['zoom_level'] = null;- $longitudeKey = $this->getLocationKey($prefix, 'longitude');- $latitudeKey = $this->getLocationKey($prefix, 'latitude');- $zoomLevelKey = $this->getLocationKey($prefix, 'zoom_level');- $isValidPOST = $this->isValidPost($prefix);- $isValidPUT = $this->isValidPUT($prefix);- $isValidEmptyPUT = $this->isValidEmptyPUT($prefix);+ $longitudeKey = $this->getLocationKey($prefix, 'longitude');+ $latitudeKey = $this->getLocationKey($prefix, 'latitude');+ $zoomLevelKey = $this->getLocationKey($prefix, 'zoom_level');+ $isValidPOST = $this->isValidPost($prefix);+ $isValidPUT = $this->isValidPUT($prefix);+ $isValidEmptyPUT = $this->isValidEmptyPUT($prefix);// for a POST (store), all fields must be present and not NULL.if ($isValidPOST) {@@ -153,9 +153,9 @@ trait AppendsLocationData$zoomLevelKey = $this->getLocationKey($prefix, 'zoom_level');return (- null === $this->get($longitudeKey)- && null === $this->get($latitudeKey)- && null === $this->get($zoomLevelKey))+ null === $this->get($longitudeKey)+ && null === $this->get($latitudeKey)+ && null === $this->get($zoomLevelKey))&& ('PUT' === $this->method()|| ('POST' === $this->method() && $this->routeIs('*.update'))diff --git a/app/Support/Request/ChecksLogin.php b/app/Support/Request/ChecksLogin.phpindex 8576b17473..0f9753ee62 100644--- a/app/Support/Request/ChecksLogin.php+++ b/app/Support/Request/ChecksLogin.php@@ -40,7 +40,7 @@ trait ChecksLogin{app('log')->debug(sprintf('Now in %s', __METHOD__));// Only allow logged-in users- $check = auth()->check();+ $check = auth()->check();if (!$check) {return false;}@@ -79,7 +79,7 @@ trait ChecksLoginpublic function getUserGroup(): ?UserGroup{/** @var User $user */- $user = auth()->user();+ $user = auth()->user();app('log')->debug('Now in getUserGroup()');/** @var null|UserGroup $userGroup */@@ -91,7 +91,7 @@ trait ChecksLoginapp('log')->debug(sprintf('Request class has no user_group_id parameter, grab default from user (group #%d).', $user->user_group_id));$userGroupId = (int)$user->user_group_id;}- $userGroup = UserGroup::find($userGroupId);+ $userGroup = UserGroup::find($userGroupId);if (null === $userGroup) {app('log')->error(sprintf('Request class has user_group_id (#%d), but group does not exist.', $userGroupId));diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.phpindex aa3896eb72..5293a6f804 100644--- a/app/Support/Request/ConvertsDataTypes.php+++ b/app/Support/Request/ConvertsDataTypes.php@@ -31,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Support\Facades\Steam;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;+use function Safe\preg_replace;/**@@ -147,15 +148,15 @@ trait ConvertsDataTypespublic function convertSortParameters(string $field, string $class): array{// assume this all works, because the validator would have caught any errors.- $parameter = (string)request()->query->get($field);+ $parameter = (string)request()->query->get($field);if ('' === $parameter) {return [];}$parts = explode(',', $parameter);$sortParameters = [];foreach ($parts as $part) {- $part = trim($part);- $direction = 'asc';+ $part = trim($part);+ $direction = 'asc';if ('-' === $part[0]) {$part = substr($part, 1);$direction = 'desc';@@ -459,7 +460,7 @@ trait ConvertsDataTypesif (!is_array($entry)) {continue;}- $amount = null;+ $amount = null;if (array_key_exists('current_amount', $entry)) {$amount = $this->clearString((string)($entry['current_amount'] ?? '0'));if (null === $entry['current_amount']) {diff --git a/app/Support/Request/ValidatesWebhooks.php b/app/Support/Request/ValidatesWebhooks.phpindex dff1541fde..15d41f41ef 100644--- a/app/Support/Request/ValidatesWebhooks.php+++ b/app/Support/Request/ValidatesWebhooks.php@@ -40,9 +40,9 @@ trait ValidatesWebhooksif (count($validator->failed()) > 0) {return;}- $data = $validator->getData();- $triggers = $data['triggers'] ?? [];- $responses = $data['responses'] ?? [];+ $data = $validator->getData();+ $triggers = $data['triggers'] ?? [];+ $responses = $data['responses'] ?? [];if (0 === count($triggers) || 0 === count($responses)) {Log::debug('No trigger or response, return.');diff --git a/app/Support/Search/AccountSearch.php b/app/Support/Search/AccountSearch.phpindex fe6e817c72..44bb34e893 100644--- a/app/Support/Search/AccountSearch.php+++ b/app/Support/Search/AccountSearch.php@@ -28,6 +28,7 @@ use FireflyIII\User;use Illuminate\Contracts\Auth\Authenticatable;use Illuminate\Database\Eloquent\Builder;use Illuminate\Support\Collection;+use function Safe\json_encode;/**@@ -36,16 +37,16 @@ use function Safe\json_encode;class AccountSearch implements GenericSearchInterface{/** @var string */- public const string SEARCH_ALL = 'all';+ public const string SEARCH_ALL = 'all';/** @var string */- public const string SEARCH_IBAN = 'iban';+ public const string SEARCH_IBAN = 'iban';/** @var string */- public const string SEARCH_ID = 'id';+ public const string SEARCH_ID = 'id';/** @var string */- public const string SEARCH_NAME = 'name';+ public const string SEARCH_NAME = 'name';/** @var string */public const string SEARCH_NUMBER = 'number';@@ -62,9 +63,10 @@ class AccountSearch implements GenericSearchInterfacepublic function search(): Collection{$searchQuery = $this->user->accounts()- ->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id')- ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')- ->whereIn('account_types.type', $this->types);+ ->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id')+ ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')+ ->whereIn('account_types.type', $this->types)+ ;$like = sprintf('%%%s%%', $this->query);$originalQuery = $this->query;@@ -135,7 +137,7 @@ class AccountSearch implements GenericSearchInterface$this->types = $types;}- public function setUser(Authenticatable | User | null $user): void+ public function setUser(Authenticatable|User|null $user): void{if ($user instanceof User) {$this->user = $user;diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.phpindex 2e813bd125..5b2cc0776c 100644--- a/app/Support/Search/OperatorQuerySearch.php+++ b/app/Support/Search/OperatorQuerySearch.php@@ -117,7 +117,7 @@ class OperatorQuerySearch implements SearchInterface$operator = substr($operator, 1);}- $config = config(sprintf('search.operators.%s', $operator));+ $config = config(sprintf('search.operators.%s', $operator));if (null === $config) {throw new FireflyException(sprintf('No configuration for search operator "%s"', $operator));}@@ -186,7 +186,7 @@ class OperatorQuerySearch implements SearchInterfacetry {$parsedQuery = $parser->parse($query);- } catch (LogicException | TypeError $e) {+ } catch (LogicException|TypeError $e) {Log::error($e->getMessage());Log::error(sprintf('Could not parse search: "%s".', $query));@@ -278,7 +278,7 @@ class OperatorQuerySearch implements SearchInterface$value = $node->getValue();$prohibited = $node->isProhibited($flipProhibitedFlag);- $context = config(sprintf('search.operators.%s.needs_context', $operator));+ $context = config(sprintf('search.operators.%s.needs_context', $operator));// is an operator that needs no context, and value is false, then prohibited = true.if ('false' === $value && in_array($operator, $this->validOperators, true) && false === $context && !$prohibited) {@@ -292,14 +292,14 @@ class OperatorQuerySearch implements SearchInterface}// must be valid operator:- $inArray = in_array($operator, $this->validOperators, true);+ $inArray = in_array($operator, $this->validOperators, true);if ($inArray) {if ($this->updateCollector($operator, $value, $prohibited)) {$this->operators->push([- 'type' => self::getRootOperator($operator),- 'value' => $value,- 'prohibited' => $prohibited,- ]);+ 'type' => self::getRootOperator($operator),+ 'value' => $value,+ 'prohibited' => $prohibited,+ ]);Log::debug(sprintf('Added operator type "%s"', $operator));}}@@ -355,7 +355,7 @@ class OperatorQuerySearch implements SearchInterfaceprivate function handleStringNode(StringNode $node, bool $flipProhibitedFlag): void{- $string = $node->getValue();+ $string = $node->getValue();$prohibited = $node->isProhibited($flipProhibitedFlag);@@ -477,7 +477,7 @@ class OperatorQuerySearch implements SearchInterface}}// string position (default): starts with:- $stringMethod = 'str_starts_with';+ $stringMethod = 'str_starts_with';// string position: ends with:if (StringPosition::ENDS === $stringPosition) {@@ -491,7 +491,7 @@ class OperatorQuerySearch implements SearchInterface}// get accounts:- $accounts = $this->accountRepository->searchAccount($value, $searchTypes, 1337);+ $accounts = $this->accountRepository->searchAccount($value, $searchTypes, 1337);if (0 === $accounts->count() && false === $prohibited) {Log::warning('Found zero accounts, search for non existing account, NO results will be returned.');$this->collector->findNothing();@@ -504,8 +504,8 @@ class OperatorQuerySearch implements SearchInterfacereturn;}Log::debug(sprintf('Found %d accounts, will filter.', $accounts->count()));- $filtered = $accounts->filter(- static fn(Account $account) => $stringMethod(strtolower($account->name), strtolower($value))+ $filtered = $accounts->filter(+ static fn (Account $account) => $stringMethod(strtolower($account->name), strtolower($value)));if (0 === $filtered->count()) {@@ -557,7 +557,7 @@ class OperatorQuerySearch implements SearchInterface}// string position (default): starts with:- $stringMethod = 'str_starts_with';+ $stringMethod = 'str_starts_with';// string position: ends with:if (StringPosition::ENDS === $stringPosition) {@@ -571,7 +571,7 @@ class OperatorQuerySearch implements SearchInterface}// search for accounts:- $accounts = $this->accountRepository->searchAccountNr($value, $searchTypes, 1337);+ $accounts = $this->accountRepository->searchAccountNr($value, $searchTypes, 1337);if (0 === $accounts->count()) {Log::debug('Found zero accounts, search for invalid account.');Log::warning('Call to findNothing() from searchAccountNr().');@@ -582,7 +582,7 @@ class OperatorQuerySearch implements SearchInterface// if found, do filterLog::debug(sprintf('Found %d accounts, will filter.', $accounts->count()));- $filtered = $accounts->filter(+ $filtered = $accounts->filter(static function (Account $account) use ($value, $stringMethod) {// either IBAN or account number$ibanMatch = $stringMethod(strtolower((string)$account->iban), strtolower($value));@@ -1250,15 +1250,15 @@ class OperatorQuerySearch implements SearchInterfacethrow new FireflyException(sprintf('Unsupported search operator: "%s"', $operator));- // some search operators are ignored, basically:+ // some search operators are ignored, basically:case 'user_action':Log::info(sprintf('Ignore search operator "%s"', $operator));return false;- //- // all account related searches:- //+ //+ // all account related searches:+ //case 'account_is':$this->searchAccount($value, SearchDirection::BOTH, StringPosition::IS);@@ -1420,7 +1420,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'source_account_id':- $account = $this->accountRepository->find((int)$value);+ $account = $this->accountRepository->find((int)$value);if (null !== $account) {$this->collector->setSourceAccounts(new Collection()->push($account));}@@ -1433,7 +1433,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-source_account_id':- $account = $this->accountRepository->find((int)$value);+ $account = $this->accountRepository->find((int)$value);if (null !== $account) {$this->collector->excludeSourceAccounts(new Collection()->push($account));}@@ -1446,25 +1446,25 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'journal_id':- $parts = explode(',', $value);+ $parts = explode(',', $value);$this->collector->setJournalIds($parts);break;case '-journal_id':- $parts = explode(',', $value);+ $parts = explode(',', $value);$this->collector->excludeJournalIds($parts);break;case 'id':- $parts = explode(',', $value);+ $parts = explode(',', $value);$this->collector->setIds($parts);break;case '-id':- $parts = explode(',', $value);+ $parts = explode(',', $value);$this->collector->excludeIds($parts);break;@@ -1550,7 +1550,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'destination_account_id':- $account = $this->accountRepository->find((int)$value);+ $account = $this->accountRepository->find((int)$value);if (null !== $account) {$this->collector->setDestinationAccounts(new Collection()->push($account));}@@ -1562,7 +1562,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-destination_account_id':- $account = $this->accountRepository->find((int)$value);+ $account = $this->accountRepository->find((int)$value);if (null !== $account) {$this->collector->excludeDestinationAccounts(new Collection()->push($account));}@@ -1575,12 +1575,12 @@ class OperatorQuerySearch implements SearchInterfacecase 'account_id':Log::debug(sprintf('Now in "account_id" with value "%s"', $value));- $parts = explode(',', $value);- $collection = new Collection();+ $parts = explode(',', $value);+ $collection = new Collection();foreach ($parts as $accountId) {$accountId = (int)$accountId;Log::debug(sprintf('Searching for account with ID #%d', $accountId));- $account = $this->accountRepository->find($accountId);+ $account = $this->accountRepository->find($accountId);if (null !== $account) {Log::debug(sprintf('Found account with ID #%d ("%s")', $accountId, $account->name));$collection->push($account);@@ -1601,8 +1601,8 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-account_id':- $parts = explode(',', $value);- $collection = new Collection();+ $parts = explode(',', $value);+ $collection = new Collection();foreach ($parts as $accountId) {$account = $this->accountRepository->find((int)$accountId);if (null !== $account) {@@ -1619,48 +1619,48 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // cash account- //+ //+ // cash account+ //case 'source_is_cash':- $account = $this->getCashAccount();+ $account = $this->getCashAccount();$this->collector->setSourceAccounts(new Collection()->push($account));break;case '-source_is_cash':- $account = $this->getCashAccount();+ $account = $this->getCashAccount();$this->collector->excludeSourceAccounts(new Collection()->push($account));break;case 'destination_is_cash':- $account = $this->getCashAccount();+ $account = $this->getCashAccount();$this->collector->setDestinationAccounts(new Collection()->push($account));break;case '-destination_is_cash':- $account = $this->getCashAccount();+ $account = $this->getCashAccount();$this->collector->excludeDestinationAccounts(new Collection()->push($account));break;case 'account_is_cash':- $account = $this->getCashAccount();+ $account = $this->getCashAccount();$this->collector->setAccounts(new Collection()->push($account));break;case '-account_is_cash':- $account = $this->getCashAccount();+ $account = $this->getCashAccount();$this->collector->excludeAccounts(new Collection()->push($account));break;- //- // description- //+ //+ // description+ //case 'description_starts':$this->collector->descriptionStarts([$value]);@@ -1682,7 +1682,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'description_contains':- $this->words[] = $value;+ $this->words[] = $value;return false;@@ -1701,11 +1701,11 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // currency- //+ //+ // currency+ //case 'currency_is':- $currency = $this->findCurrency($value);+ $currency = $this->findCurrency($value);if ($currency instanceof TransactionCurrency) {$this->collector->setCurrency($currency);}@@ -1717,7 +1717,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-currency_is':- $currency = $this->findCurrency($value);+ $currency = $this->findCurrency($value);if ($currency instanceof TransactionCurrency) {$this->collector->excludeCurrency($currency);}@@ -1729,7 +1729,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'foreign_currency_is':- $currency = $this->findCurrency($value);+ $currency = $this->findCurrency($value);if ($currency instanceof TransactionCurrency) {$this->collector->setForeignCurrency($currency);}@@ -1741,7 +1741,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-foreign_currency_is':- $currency = $this->findCurrency($value);+ $currency = $this->findCurrency($value);if ($currency instanceof TransactionCurrency) {$this->collector->excludeForeignCurrency($currency);}@@ -1752,9 +1752,9 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // attachments- //+ //+ // attachments+ //case 'has_attachments':case '-has_no_attachments':Log::debug('Set collector to filter on attachments.');@@ -1769,8 +1769,8 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // categories+ //+ // categoriescase '-has_any_category':case 'has_no_category':$this->collector->withoutCategory();@@ -1784,7 +1784,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'category_is':- $category = $this->categoryRepository->findByName($value);+ $category = $this->categoryRepository->findByName($value);if (null !== $category) {$this->collector->setCategory($category);@@ -1796,7 +1796,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-category_is':- $category = $this->categoryRepository->findByName($value);+ $category = $this->categoryRepository->findByName($value);if (null !== $category) {$this->collector->excludeCategory($category);@@ -1806,7 +1806,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'category_ends':- $result = $this->categoryRepository->categoryEndsWith($value, 1337);+ $result = $this->categoryRepository->categoryEndsWith($value, 1337);if ($result->count() > 0) {$this->collector->setCategories($result);}@@ -1818,7 +1818,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-category_ends':- $result = $this->categoryRepository->categoryEndsWith($value, 1337);+ $result = $this->categoryRepository->categoryEndsWith($value, 1337);if ($result->count() > 0) {$this->collector->excludeCategories($result);}@@ -1830,7 +1830,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'category_starts':- $result = $this->categoryRepository->categoryStartsWith($value, 1337);+ $result = $this->categoryRepository->categoryStartsWith($value, 1337);if ($result->count() > 0) {$this->collector->setCategories($result);}@@ -1842,7 +1842,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-category_starts':- $result = $this->categoryRepository->categoryStartsWith($value, 1337);+ $result = $this->categoryRepository->categoryStartsWith($value, 1337);if ($result->count() > 0) {$this->collector->excludeCategories($result);}@@ -1854,7 +1854,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'category_contains':- $result = $this->categoryRepository->searchCategory($value, 1337);+ $result = $this->categoryRepository->searchCategory($value, 1337);if ($result->count() > 0) {$this->collector->setCategories($result);}@@ -1866,7 +1866,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-category_contains':- $result = $this->categoryRepository->searchCategory($value, 1337);+ $result = $this->categoryRepository->searchCategory($value, 1337);if ($result->count() > 0) {$this->collector->excludeCategories($result);}@@ -1877,9 +1877,9 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // budgets- //+ //+ // budgets+ //case '-has_any_budget':case 'has_no_budget':$this->collector->withoutBudget();@@ -1893,7 +1893,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'budget_contains':- $result = $this->budgetRepository->searchBudget($value, 1337);+ $result = $this->budgetRepository->searchBudget($value, 1337);if ($result->count() > 0) {$this->collector->setBudgets($result);}@@ -1905,7 +1905,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-budget_contains':- $result = $this->budgetRepository->searchBudget($value, 1337);+ $result = $this->budgetRepository->searchBudget($value, 1337);if ($result->count() > 0) {$this->collector->excludeBudgets($result);}@@ -1917,7 +1917,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'budget_is':- $budget = $this->budgetRepository->findByName($value);+ $budget = $this->budgetRepository->findByName($value);if (null !== $budget) {$this->collector->setBudget($budget);@@ -1929,7 +1929,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-budget_is':- $budget = $this->budgetRepository->findByName($value);+ $budget = $this->budgetRepository->findByName($value);if (null !== $budget) {$this->collector->excludeBudget($budget);@@ -1941,7 +1941,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'budget_ends':- $result = $this->budgetRepository->budgetEndsWith($value, 1337);+ $result = $this->budgetRepository->budgetEndsWith($value, 1337);if ($result->count() > 0) {$this->collector->setBudgets($result);}@@ -1953,7 +1953,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-budget_ends':- $result = $this->budgetRepository->budgetEndsWith($value, 1337);+ $result = $this->budgetRepository->budgetEndsWith($value, 1337);if ($result->count() > 0) {$this->collector->excludeBudgets($result);}@@ -1965,7 +1965,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'budget_starts':- $result = $this->budgetRepository->budgetStartsWith($value, 1337);+ $result = $this->budgetRepository->budgetStartsWith($value, 1337);if ($result->count() > 0) {$this->collector->setBudgets($result);}@@ -1977,7 +1977,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-budget_starts':- $result = $this->budgetRepository->budgetStartsWith($value, 1337);+ $result = $this->budgetRepository->budgetStartsWith($value, 1337);if ($result->count() > 0) {$this->collector->excludeBudgets($result);}@@ -1988,9 +1988,9 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // bill- //+ //+ // bill+ //case '-has_any_bill':case 'has_no_bill':$this->collector->withoutBill();@@ -2004,7 +2004,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'bill_contains':- $result = $this->billRepository->searchBill($value, 1337);+ $result = $this->billRepository->searchBill($value, 1337);if ($result->count() > 0) {$this->collector->setBills($result);@@ -2016,7 +2016,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-bill_contains':- $result = $this->billRepository->searchBill($value, 1337);+ $result = $this->billRepository->searchBill($value, 1337);if ($result->count() > 0) {$this->collector->excludeBills($result);@@ -2028,7 +2028,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'bill_is':- $bill = $this->billRepository->findByName($value);+ $bill = $this->billRepository->findByName($value);if (null !== $bill) {$this->collector->setBill($bill);@@ -2040,7 +2040,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-bill_is':- $bill = $this->billRepository->findByName($value);+ $bill = $this->billRepository->findByName($value);if (null !== $bill) {$this->collector->excludeBills(new Collection()->push($bill));@@ -2052,7 +2052,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'bill_ends':- $result = $this->billRepository->billEndsWith($value, 1337);+ $result = $this->billRepository->billEndsWith($value, 1337);if ($result->count() > 0) {$this->collector->setBills($result);}@@ -2064,7 +2064,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-bill_ends':- $result = $this->billRepository->billEndsWith($value, 1337);+ $result = $this->billRepository->billEndsWith($value, 1337);if ($result->count() > 0) {$this->collector->excludeBills($result);}@@ -2076,7 +2076,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'bill_starts':- $result = $this->billRepository->billStartsWith($value, 1337);+ $result = $this->billRepository->billStartsWith($value, 1337);if ($result->count() > 0) {$this->collector->setBills($result);}@@ -2088,7 +2088,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-bill_starts':- $result = $this->billRepository->billStartsWith($value, 1337);+ $result = $this->billRepository->billStartsWith($value, 1337);if ($result->count() > 0) {$this->collector->excludeBills($result);}@@ -2099,9 +2099,9 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // tags- //+ //+ // tags+ //case '-has_any_tag':case 'has_no_tag':$this->collector->withoutTags();@@ -2116,7 +2116,7 @@ class OperatorQuerySearch implements SearchInterfacecase '-tag_is_not':case 'tag_is':- $result = $this->tagRepository->findByTag($value);+ $result = $this->tagRepository->findByTag($value);if (null !== $result) {$this->includeTags[] = $result->id;$this->includeTags = array_unique($this->includeTags);@@ -2131,7 +2131,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'tag_contains':- $tags = $this->tagRepository->searchTag($value);+ $tags = $this->tagRepository->searchTag($value);if (0 === $tags->count()) {Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));Log::warning(sprintf('Call to findNothing() from %s.', $operator));@@ -2146,7 +2146,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'tag_starts':- $tags = $this->tagRepository->tagStartsWith($value);+ $tags = $this->tagRepository->tagStartsWith($value);if (0 === $tags->count()) {Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));Log::warning(sprintf('Call to findNothing() from %s.', $operator));@@ -2161,7 +2161,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-tag_starts':- $tags = $this->tagRepository->tagStartsWith($value);+ $tags = $this->tagRepository->tagStartsWith($value);if (0 === $tags->count()) {Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));Log::warning(sprintf('Call to findNothing() from %s.', $operator));@@ -2175,7 +2175,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case 'tag_ends':- $tags = $this->tagRepository->tagEndsWith($value);+ $tags = $this->tagRepository->tagEndsWith($value);if (0 === $tags->count()) {Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));Log::warning(sprintf('Call to findNothing() from %s.', $operator));@@ -2189,7 +2189,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-tag_ends':- $tags = $this->tagRepository->tagEndsWith($value);+ $tags = $this->tagRepository->tagEndsWith($value);if (0 === $tags->count()) {Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));Log::warning(sprintf('Call to findNothing() from %s.', $operator));@@ -2203,7 +2203,7 @@ class OperatorQuerySearch implements SearchInterfacebreak;case '-tag_contains':- $tags = $this->tagRepository->searchTag($value)->keyBy('id');+ $tags = $this->tagRepository->searchTag($value)->keyBy('id');if (0 === $tags->count()) {Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));@@ -2219,7 +2219,7 @@ class OperatorQuerySearch implements SearchInterfacecase '-tag_is':case 'tag_is_not':- $result = $this->tagRepository->findByTag($value);+ $result = $this->tagRepository->findByTag($value);if (null !== $result) {$this->excludeTags[] = $result->id;$this->excludeTags = array_unique($this->excludeTags);@@ -2227,9 +2227,9 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // notes- //+ //+ // notes+ //case 'notes_contains':$this->collector->notesContain($value);@@ -2292,14 +2292,14 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // amount- //+ //+ // amount+ //case 'amount_is':// strip comma's, make dots.Log::debug(sprintf('Original value "%s"', $value));- $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $value = str_replace(',', '.', $value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->amountIs($amount);@@ -2308,8 +2308,8 @@ class OperatorQuerySearch implements SearchInterfacecase '-amount_is':// strip comma's, make dots.Log::debug(sprintf('Original value "%s"', $value));- $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $value = str_replace(',', '.', $value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->amountIsNot($amount);@@ -2317,9 +2317,9 @@ class OperatorQuerySearch implements SearchInterfacecase 'foreign_amount_is':// strip comma's, make dots.- $value = str_replace(',', '.', $value);+ $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->foreignAmountIs($amount);@@ -2327,9 +2327,9 @@ class OperatorQuerySearch implements SearchInterfacecase '-foreign_amount_is':// strip comma's, make dots.- $value = str_replace(',', '.', $value);+ $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->foreignAmountIsNot($amount);@@ -2338,9 +2338,9 @@ class OperatorQuerySearch implements SearchInterfacecase '-amount_more':case 'amount_less':// strip comma's, make dots.- $value = str_replace(',', '.', $value);+ $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->amountLess($amount);@@ -2349,9 +2349,9 @@ class OperatorQuerySearch implements SearchInterfacecase '-foreign_amount_more':case 'foreign_amount_less':// strip comma's, make dots.- $value = str_replace(',', '.', $value);+ $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->foreignAmountLess($amount);@@ -2361,8 +2361,8 @@ class OperatorQuerySearch implements SearchInterfacecase 'amount_more':Log::debug(sprintf('Now handling operator "%s"', $operator));// strip comma's, make dots.- $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $value = str_replace(',', '.', $value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->amountMore($amount);@@ -2372,16 +2372,16 @@ class OperatorQuerySearch implements SearchInterfacecase 'foreign_amount_more':Log::debug(sprintf('Now handling operator "%s"', $operator));// strip comma's, make dots.- $value = str_replace(',', '.', $value);- $amount = app('steam')->positive($value);+ $value = str_replace(',', '.', $value);+ $amount = app('steam')->positive($value);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));$this->collector->foreignAmountMore($amount);break;- //- // transaction type- //+ //+ // transaction type+ //case 'transaction_type':$this->collector->setTypes([ucfirst($value)]);Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));@@ -2394,152 +2394,152 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // dates- //+ //+ // dates+ //case '-date_on':case 'date_on':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactDateParams($range, $prohibited);return false;case 'date_before':case '-date_after':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setDateBeforeParams($range);return false;case 'date_after':case '-date_before':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setDateAfterParams($range);return false;case 'interest_date_on':case '-interest_date_on':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactMetaDateParams('interest_date', $range, $prohibited);return false;case 'interest_date_before':case '-interest_date_after':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateBeforeParams('interest_date', $range);return false;case 'interest_date_after':case '-interest_date_before':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateAfterParams('interest_date', $range);return false;case 'book_date_on':case '-book_date_on':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactMetaDateParams('book_date', $range, $prohibited);return false;case 'book_date_before':case '-book_date_after':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateBeforeParams('book_date', $range);return false;case 'book_date_after':case '-book_date_before':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateAfterParams('book_date', $range);return false;case 'process_date_on':case '-process_date_on':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactMetaDateParams('process_date', $range, $prohibited);return false;case 'process_date_before':case '-process_date_after':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateBeforeParams('process_date', $range);return false;case 'process_date_after':case '-process_date_before':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateAfterParams('process_date', $range);return false;case 'due_date_on':case '-due_date_on':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactMetaDateParams('due_date', $range, $prohibited);return false;case 'due_date_before':case '-due_date_after':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateBeforeParams('due_date', $range);return false;case 'due_date_after':case '-due_date_before':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateAfterParams('due_date', $range);return false;case 'payment_date_on':case '-payment_date_on':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactMetaDateParams('payment_date', $range, $prohibited);return false;case 'payment_date_before':case '-payment_date_after':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateBeforeParams('payment_date', $range);return false;case 'payment_date_after':case '-payment_date_before':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateAfterParams('payment_date', $range);return false;case 'invoice_date_on':case '-invoice_date_on':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactMetaDateParams('invoice_date', $range, $prohibited);return false;case 'invoice_date_before':case '-invoice_date_after':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateBeforeParams('invoice_date', $range);return false;case 'invoice_date_after':case '-invoice_date_before':- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setMetaDateAfterParams('invoice_date', $range);return false;@@ -2547,7 +2547,7 @@ class OperatorQuerySearch implements SearchInterfacecase 'created_at_on':case '-created_at_on':Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactObjectDateParams('created_at', $range, $prohibited);return false;@@ -2555,7 +2555,7 @@ class OperatorQuerySearch implements SearchInterfacecase 'created_at_before':case '-created_at_after':Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setObjectDateBeforeParams('created_at', $range);return false;@@ -2563,7 +2563,7 @@ class OperatorQuerySearch implements SearchInterfacecase 'created_at_after':case '-created_at_before':Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setObjectDateAfterParams('created_at', $range);return false;@@ -2571,7 +2571,7 @@ class OperatorQuerySearch implements SearchInterfacecase 'updated_at_on':case '-updated_at_on':Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setExactObjectDateParams('updated_at', $range, $prohibited);return false;@@ -2579,7 +2579,7 @@ class OperatorQuerySearch implements SearchInterfacecase 'updated_at_before':case '-updated_at_after':Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setObjectDateBeforeParams('updated_at', $range);return false;@@ -2587,14 +2587,14 @@ class OperatorQuerySearch implements SearchInterfacecase 'updated_at_after':case '-updated_at_before':Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));- $range = $this->parseDateRange($operator, $value);+ $range = $this->parseDateRange($operator, $value);$this->setObjectDateAfterParams('updated_at', $range);return false;- //- // external URL- //+ //+ // external URL+ //case '-any_external_url':case 'no_external_url':$this->collector->withoutExternalUrl();@@ -2659,9 +2659,9 @@ class OperatorQuerySearch implements SearchInterfacebreak;- //- // other fields- //+ //+ // other fields+ //case 'external_id_is':$this->collector->setExternalId($value);diff --git a/app/Support/Search/QueryParser/GdbotsQueryParser.php b/app/Support/Search/QueryParser/GdbotsQueryParser.phpindex 0e670a21df..e532901696 100644--- a/app/Support/Search/QueryParser/GdbotsQueryParser.php+++ b/app/Support/Search/QueryParser/GdbotsQueryParser.php@@ -32,6 +32,7 @@ use Gdbots\QueryParser\QueryParser as BaseQueryParser;use Illuminate\Support\Facades\Log;use LogicException;use TypeError;+use function Safe\fwrite;class GdbotsQueryParser implements QueryParserInterface@@ -51,12 +52,12 @@ class GdbotsQueryParser implements QueryParserInterfacetry {$result = $this->parser->parse($query);$nodes = array_map(- fn(GdbotsNode\Node $node) => $this->convertNode($node),+ fn (GdbotsNode\Node $node) => $this->convertNode($node),$result->getNodes());return new NodeGroup($nodes);- } catch (LogicException | TypeError $e) {+ } catch (LogicException|TypeError $e) {fwrite(STDERR, "Setting up GdbotsQueryParserTest\n");app('log')->error($e->getMessage());app('log')->error(sprintf('Could not parse search: "%s".', $query));@@ -84,7 +85,7 @@ class GdbotsQueryParser implements QueryParserInterfacereturn new NodeGroup(array_map(- fn(GdbotsNode\Node $subNode) => $this->convertNode($subNode),+ fn (GdbotsNode\Node $subNode) => $this->convertNode($subNode),$node->getNodes()));diff --git a/app/Support/Search/QueryParser/QueryParser.php b/app/Support/Search/QueryParser/QueryParser.phpindex 2533bcc3a8..bef27a0ec9 100644--- a/app/Support/Search/QueryParser/QueryParser.php+++ b/app/Support/Search/QueryParser/QueryParser.php@@ -139,7 +139,7 @@ class QueryParser implements QueryParserInterfaceif ('' === $tokenUnderConstruction) {// In any other location, it's just a normal character$tokenUnderConstruction .= $char;- $skipNext = true;+ $skipNext = true;}if ('' !== $tokenUnderConstruction && !$skipNext) { // @phpstan-ignore-lineLog::debug(sprintf('Turns out that "%s" is a field name. Reset the token.', $tokenUnderConstruction));@@ -171,7 +171,7 @@ class QueryParser implements QueryParserInterface++$this->position;}- $finalNode = '' !== $tokenUnderConstruction || '' !== $fieldName+ $finalNode = '' !== $tokenUnderConstruction || '' !== $fieldName? $this->createNode($tokenUnderConstruction, $fieldName, $prohibited): null;@@ -184,7 +184,7 @@ class QueryParser implements QueryParserInterface$nodeResult = $this->buildNextNode($isSubquery);while ($nodeResult->node instanceof Node) {- $nodes[] = $nodeResult->node;+ $nodes[] = $nodeResult->node;if ($nodeResult->isSubqueryEnd) {break;}diff --git a/app/Support/Singleton/PreferencesSingleton.php b/app/Support/Singleton/PreferencesSingleton.phpindex e8ff779c5e..287a964361 100644--- a/app/Support/Singleton/PreferencesSingleton.php+++ b/app/Support/Singleton/PreferencesSingleton.php@@ -29,7 +29,7 @@ class PreferencesSingleton{private static ?PreferencesSingleton $instance = null;- private array $preferences = [];+ private array $preferences = [];private function __construct(){diff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex 32b7c160bd..46119a268a 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -38,6 +38,7 @@ use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;use Illuminate\Support\Str;use ValueError;+use function Safe\parse_url;use function Safe\preg_replace;@@ -49,45 +50,46 @@ class Steampublic function accountsBalancesOptimized(Collection $accounts, Carbon $date, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null): array{Log::debug(sprintf('accountsBalancesOptimized: Called for %d account(s) with date/time "%s"', $accounts->count(), $date->toIso8601String()));- $result = [];+ $result = [];$convertToPrimary ??= Amount::convertToPrimary();$primary ??= Amount::getPrimaryCurrency();- $currencies = $this->getCurrencies($accounts);+ $currencies = $this->getCurrencies($accounts);// balance(s) in all currencies for ALL accounts.$arrayOfSums = Transaction::whereIn('account_id', $accounts->pluck('id')->toArray())- ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')- ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')- ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))- ->groupBy(['transactions.account_id', 'transaction_currencies.code'])- ->get(['transactions.account_id', 'transaction_currencies.code', DB::raw('SUM(transactions.amount) as sum_of_amount')])->toArray();+ ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')+ ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')+ ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))+ ->groupBy(['transactions.account_id', 'transaction_currencies.code'])+ ->get(['transactions.account_id', 'transaction_currencies.code', DB::raw('SUM(transactions.amount) as sum_of_amount')])->toArray()+ ;/** @var Account $account */foreach ($accounts as $account) {// this array is PER account, so we wait a bit before we change code here.- $return = [+ $return = ['pc_balance' => '0','balance' => '0', // this key is overwritten right away, but I must remember it is always created.];- $currency = $currencies[$account->id];+ $currency = $currencies[$account->id];// second array- $accountSum = array_filter($arrayOfSums, fn($entry) => $entry['account_id'] === $account->id);+ $accountSum = array_filter($arrayOfSums, fn ($entry) => $entry['account_id'] === $account->id);if (0 === count($accountSum)) {$result[$account->id] = $return;continue;}- $accountSum = array_values($accountSum)[0];- $sumOfAmount = (string)$accountSum['sum_of_amount'];- $sumOfAmount = $this->floatalize('' === $sumOfAmount ? '0' : $sumOfAmount);- $sumsByCode = [+ $accountSum = array_values($accountSum)[0];+ $sumOfAmount = (string)$accountSum['sum_of_amount'];+ $sumOfAmount = $this->floatalize('' === $sumOfAmount ? '0' : $sumOfAmount);+ $sumsByCode = [$accountSum['code'] => $sumOfAmount,];// Log::debug('All balances are (joined)', $others);// if there is no request to convert, take this as "balance" and "pc_balance".- $return['balance'] = $sumsByCode[$currency->code] ?? '0';+ $return['balance'] = $sumsByCode[$currency->code] ?? '0';if (!$convertToPrimary) {unset($return['pc_balance']);// Log::debug(sprintf('Set balance to %s, unset pc_balance', $return['balance']));@@ -99,7 +101,7 @@ class Steam}// either way, the balance is always combined with the virtual balance:- $virtualBalance = (string)('' === (string)$account->virtual_balance ? '0' : $account->virtual_balance);+ $virtualBalance = (string)('' === (string)$account->virtual_balance ? '0' : $account->virtual_balance);if ($convertToPrimary) {// the primary currency balance is combined with a converted virtual_balance:@@ -140,10 +142,10 @@ class Steam// Log::debug(sprintf('Trying bcround("%s",%d)', $number, $precision));if (str_contains($number, '.')) {if ('-' !== $number[0]) {- return bcadd($number, '0.' . str_repeat('0', $precision) . '5', $precision);+ return bcadd($number, '0.'.str_repeat('0', $precision).'5', $precision);}- return bcsub($number, '0.' . str_repeat('0', $precision) . '5', $precision);+ return bcsub($number, '0.'.str_repeat('0', $precision).'5', $precision);}return $number;@@ -287,7 +289,7 @@ class Steampublic function finalAccountBalance(Account $account, Carbon $date, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null): array{- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($account->id);$cache->addProperty($date);if ($cache->has()) {@@ -303,7 +305,7 @@ class Steam$primary = Amount::getPrimaryCurrencyByUserGroup($account->user->userGroup);}// account balance thing.- $currencyPresent = isset($account->meta) && array_key_exists('currency', $account->meta) && null !== $account->meta['currency'];+ $currencyPresent = isset($account->meta) && array_key_exists('currency', $account->meta) && null !== $account->meta['currency'];if ($currencyPresent) {$accountCurrency = $account->meta['currency'];}@@ -311,19 +313,20 @@ class Steam$accountCurrency = $this->getAccountCurrency($account);}- $hasCurrency = null !== $accountCurrency;- $currency = $hasCurrency ? $accountCurrency : $primary;- $return = [+ $hasCurrency = null !== $accountCurrency;+ $currency = $hasCurrency ? $accountCurrency : $primary;+ $return = ['pc_balance' => '0','balance' => '0', // this key is overwritten right away, but I must remember it is always created.];// balance(s) in all currencies.- $array = $account->transactions()- ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')- ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')- ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))- ->get(['transaction_currencies.code', 'transactions.amount'])->toArray();- $others = $this->groupAndSumTransactions($array, 'code', 'amount');+ $array = $account->transactions()+ ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')+ ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')+ ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))+ ->get(['transaction_currencies.code', 'transactions.amount'])->toArray()+ ;+ $others = $this->groupAndSumTransactions($array, 'code', 'amount');// Log::debug('All balances are (joined)', $others);// if there is no request to convert, take this as "balance" and "pc_balance".$return['balance'] = $others[$currency->code] ?? '0';@@ -338,7 +341,7 @@ class Steam}// either way, the balance is always combined with the virtual balance:- $virtualBalance = (string)('' === (string)$account->virtual_balance ? '0' : $account->virtual_balance);+ $virtualBalance = (string)('' === (string)$account->virtual_balance ? '0' : $account->virtual_balance);if ($convertToPrimary) {// the primary currency balance is combined with a converted virtual_balance:@@ -352,7 +355,7 @@ class Steam$return['balance'] = bcadd($return['balance'], $virtualBalance);// Log::debug(sprintf('Virtual balance makes the (primary currency) total %s', $return['balance']));}- $final = array_merge($return, $others);+ $final = array_merge($return, $others);// Log::debug('Final balance is', $final);$cache->store($final);@@ -367,7 +370,7 @@ class SteamLog::debug(sprintf('finalAccountBalanceInRange(#%d, %s, %s)', $account->id, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));// set up cache- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($account->id);$cache->addProperty('final-balance-in-range');$cache->addProperty($start);@@ -377,22 +380,22 @@ class Steamreturn $cache->get();}- $balances = [];- $formatted = $start->format('Y-m-d');+ $balances = [];+ $formatted = $start->format('Y-m-d');/** To make sure the start balance is correct, we need to get the balance at the exact end of the previous day.* Since we just did "startOfDay" we can do subDay()->endOfDay() to get the correct moment.* THAT will be the start balance.*/- $request = clone $start;+ $request = clone $start;$request->subDay()->endOfDay();Log::debug('Get first balance to start.');Log::debug(sprintf('finalAccountBalanceInRange: Call finalAccountBalance with date/time "%s"', $request->toIso8601String()));- $startBalance = $this->finalAccountBalance($account, $request);- $primaryCurrency = Amount::getPrimaryCurrencyByUserGroup($account->user->userGroup);- $accountCurrency = $this->getAccountCurrency($account);- $hasCurrency = $accountCurrency instanceof TransactionCurrency;- $currency = $accountCurrency ?? $primaryCurrency;+ $startBalance = $this->finalAccountBalance($account, $request);+ $primaryCurrency = Amount::getPrimaryCurrencyByUserGroup($account->user->userGroup);+ $accountCurrency = $this->getAccountCurrency($account);+ $hasCurrency = $accountCurrency instanceof TransactionCurrency;+ $currency = $accountCurrency ?? $primaryCurrency;Log::debug(sprintf('Currency is %s', $currency->code));@@ -405,7 +408,7 @@ class SteamLog::debug(sprintf('Also set start balance in %s', $primaryCurrency->code));$startBalance[$primaryCurrency->code] ??= '0';}- $currencies = [+ $currencies = [$currency->id => $currency,$primaryCurrency->id => $primaryCurrency,];@@ -415,47 +418,48 @@ class Steam// sums up the balance changes per day.Log::debug(sprintf('Date >= %s and <= %s', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));- $set = $account->transactions()- ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')- ->where('transaction_journals.date', '>=', $start->format('Y-m-d H:i:s'))- ->where('transaction_journals.date', '<=', $end->format('Y-m-d H:i:s'))- ->groupBy('transaction_journals.date')- ->groupBy('transactions.transaction_currency_id')- ->orderBy('transaction_journals.date', 'ASC')- ->whereNull('transaction_journals.deleted_at')- ->get(- [ // @phpstan-ignore-line- 'transaction_journals.date',- 'transactions.transaction_currency_id',- DB::raw('SUM(transactions.amount) AS sum_of_day'),- ]- );-- $currentBalance = $startBalance;- $converter = new ExchangeRateConverter();+ $set = $account->transactions()+ ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')+ ->where('transaction_journals.date', '>=', $start->format('Y-m-d H:i:s'))+ ->where('transaction_journals.date', '<=', $end->format('Y-m-d H:i:s'))+ ->groupBy('transaction_journals.date')+ ->groupBy('transactions.transaction_currency_id')+ ->orderBy('transaction_journals.date', 'ASC')+ ->whereNull('transaction_journals.deleted_at')+ ->get(+ [ // @phpstan-ignore-line+ 'transaction_journals.date',+ 'transactions.transaction_currency_id',+ DB::raw('SUM(transactions.amount) AS sum_of_day'),+ ]+ )+ ;++ $currentBalance = $startBalance;+ $converter = new ExchangeRateConverter();/** @var Transaction $entry */foreach ($set as $entry) {// get date object- $carbon = new Carbon($entry->date, $entry->date_tz);- $carbonKey = $carbon->format('Y-m-d');+ $carbon = new Carbon($entry->date, $entry->date_tz);+ $carbonKey = $carbon->format('Y-m-d');// make sure sum is a string:- $sumOfDay = (string)($entry->sum_of_day ?? '0');+ $sumOfDay = (string)($entry->sum_of_day ?? '0');// #10426 make sure sum is not in scientific notation.- $sumOfDay = $this->floatalize($sumOfDay);+ $sumOfDay = $this->floatalize($sumOfDay);// find currency of this entry, does not have to exist.$currencies[$entry->transaction_currency_id] ??= Amount::getTransactionCurrencyById($entry->transaction_currency_id);// make sure this $entry has its own $entryCurrency/** @var TransactionCurrency $entryCurrency */- $entryCurrency = $currencies[$entry->transaction_currency_id];+ $entryCurrency = $currencies[$entry->transaction_currency_id];Log::debug(sprintf('Processing transaction(s) on moment %s', $carbon->format('Y-m-d H:i:s')));// add amount to current balance in currency code.- $currentBalance[$entryCurrency->code] ??= '0';+ $currentBalance[$entryCurrency->code] ??= '0';$currentBalance[$entryCurrency->code] = bcadd($sumOfDay, (string)$currentBalance[$entryCurrency->code]);// if not requested to convert to primary currency, add the amount to "balance", do nothing else.@@ -473,7 +477,7 @@ class Steam}}// add to final array.- $balances[$carbonKey] = $currentBalance;+ $balances[$carbonKey] = $currentBalance;Log::debug(sprintf('Updated entry [%s]', $carbonKey), $currentBalance);}$cache->store($balances);@@ -490,7 +494,7 @@ class Steam*/public function floatalize(string $value): string{- $value = strtoupper($value);+ $value = strtoupper($value);if (!str_contains($value, 'E')) {return $value;}@@ -514,8 +518,8 @@ class Steampublic function getAccountCurrency(Account $account): ?TransactionCurrency{- $type = $account->accountType->type;- $list = config('firefly.valid_currency_account_types');+ $type = $account->accountType->type;+ $list = config('firefly.valid_currency_account_types');// return null if not in this list.if (!in_array($type, $list, true)) {@@ -569,15 +573,15 @@ class Steam{$list = [];- $set = auth()->user()->transactions()- ->whereIn('transactions.account_id', $accounts)- ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])- ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]) // @phpstan-ignore-line+ $set = auth()->user()->transactions()+ ->whereIn('transactions.account_id', $accounts)+ ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])+ ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]) // @phpstan-ignore-line;/** @var Transaction $entry */foreach ($set as $entry) {- $date = new Carbon($entry->max_date, config('app.timezone'));+ $date = new Carbon($entry->max_date, config('app.timezone'));$date->setTimezone(config('app.timezone'));$list[(int)$entry->account_id] = $date;}@@ -591,24 +595,25 @@ class Steampublic function getLocale(): string // get preference{$singleton = PreferencesSingleton::getInstance();- $cached = $singleton->getPreference('locale');- if(null !== $cached) {+ $cached = $singleton->getPreference('locale');+ if (null !== $cached) {return $cached;}- $locale = app('preferences')->get('locale', config('firefly.default_locale', 'equal'))->data;+ $locale = app('preferences')->get('locale', config('firefly.default_locale', 'equal'))->data;if (is_array($locale)) {$locale = 'equal';}if ('equal' === $locale) {$locale = $this->getLanguage();}- $locale = (string)$locale;+ $locale = (string)$locale;// Check for Windows to replace the locale correctly.if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) {$locale = str_replace('_', '-', $locale);}$singleton->setPreference('locale', $locale);+return $locale;}@@ -642,9 +647,9 @@ class Steampublic function getSafeUrl(string $unknownUrl, string $safeUrl): string{// Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl));- $returnUrl = $safeUrl;- $unknownHost = parse_url($unknownUrl, PHP_URL_HOST);- $safeHost = parse_url($safeUrl, PHP_URL_HOST);+ $returnUrl = $safeUrl;+ $unknownHost = parse_url($unknownUrl, PHP_URL_HOST);+ $safeHost = parse_url($safeUrl, PHP_URL_HOST);if (null !== $unknownHost && $unknownHost === $safeHost) {$returnUrl = $unknownUrl;@@ -746,12 +751,12 @@ class Steamif (null === $preference) {$singleton->setPreference($key, $currency);}- $current = $amount;+ $current = $amount;if ($currency->id !== $primary->id) {$current = $converter->convert($currency, $primary, $date, $amount);Log::debug(sprintf('Convert %s %s to %s %s', $currency->code, $amount, $primary->code, $current));}- $total = bcadd($current, $total);+ $total = bcadd($current, $total);}return $total;@@ -765,8 +770,8 @@ class Steam$primary = Amount::getPrimaryCurrency();$currencies[$primary->id] = $primary;- $ids = $accounts->pluck('id')->toArray();- $result = AccountMeta::whereIn('account_id', $ids)->where('name', 'currency_id')->get();+ $ids = $accounts->pluck('id')->toArray();+ $result = AccountMeta::whereIn('account_id', $ids)->where('name', 'currency_id')->get();/** @var AccountMeta $item */foreach ($result as $item) {@@ -776,7 +781,7 @@ class Steam}}// collect those currencies, skip primary because we already have it.- $set = TransactionCurrency::whereIn('id', $accountPreferences)->where('id', '!=', $primary->id)->get();+ $set = TransactionCurrency::whereIn('id', $accountPreferences)->where('id', '!=', $primary->id)->get();foreach ($set as $item) {$currencies[$item->id] = $item;}@@ -787,7 +792,7 @@ class Steam$currencyPresent = isset($account->meta) && array_key_exists('currency', $account->meta) && null !== $account->meta['currency'];if ($currencyPresent) {$currencyId = $account->meta['currency']->id;- $currencies[$currencyId] ??= $account->meta['currency'];+ $currencies[$currencyId] ??= $account->meta['currency'];$accountCurrencies[$accountId] = $account->meta['currency'];}if (!$currencyPresent && !array_key_exists($accountId, $accountPreferences)) {diff --git a/app/Support/System/OAuthKeys.php b/app/Support/System/OAuthKeys.phpindex 1c1f2276cf..97bd74bd19 100644--- a/app/Support/System/OAuthKeys.php+++ b/app/Support/System/OAuthKeys.php@@ -31,6 +31,7 @@ use Illuminate\Support\Facades\Crypt;use Laravel\Passport\Console\KeysCommand;use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;+use function Safe\file_get_contents;use function Safe\file_put_contents;@@ -65,7 +66,7 @@ class OAuthKeystry {$privateKey = (string)app('fireflyconfig')->get(self::PRIVATE_KEY)?->data;$publicKey = (string)app('fireflyconfig')->get(self::PUBLIC_KEY)?->data;- } catch (ContainerExceptionInterface | FireflyException | NotFoundExceptionInterface $e) {+ } catch (ContainerExceptionInterface|FireflyException|NotFoundExceptionInterface $e) {app('log')->error(sprintf('Could not validate keysInDatabase(): %s', $e->getMessage()));app('log')->error($e->getTraceAsString());}@@ -98,8 +99,8 @@ class OAuthKeysreturn false;}- $private = storage_path('oauth-private.key');- $public = storage_path('oauth-public.key');+ $private = storage_path('oauth-private.key');+ $public = storage_path('oauth-public.key');file_put_contents($private, $privateContent);file_put_contents($public, $publicContent);diff --git a/app/Support/Twig/AmountFormat.php b/app/Support/Twig/AmountFormat.phpindex 49c9a6d11e..dbf22254b3 100644--- a/app/Support/Twig/AmountFormat.php+++ b/app/Support/Twig/AmountFormat.php@@ -145,13 +145,13 @@ class AmountFormat extends AbstractExtensionstatic function (string $amount, ?string $symbol = null, ?int $decimalPlaces = null, ?bool $coloured = null): string {if (null === $symbol) {- $message = sprintf('formatAmountBySymbol("%s", %s, %d, %s) was called without a symbol. Please browse to /flush to clear your cache.', $amount, var_export($symbol, true), $decimalPlaces, var_export($coloured, true));+ $message = sprintf('formatAmountBySymbol("%s", %s, %d, %s) was called without a symbol. Please browse to /flush to clear your cache.', $amount, var_export($symbol, true), $decimalPlaces, var_export($coloured, true));Log::error($message);$currency = Amount::getPrimaryCurrency();}if (null !== $symbol) {- $decimalPlaces ??= 2;- $coloured ??= true;+ $decimalPlaces ??= 2;+ $coloured ??= true;$currency = new TransactionCurrency();$currency->symbol = $symbol;$currency->decimal_places = $decimalPlaces;diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.phpindex 337e832312..485dfe1bd9 100644--- a/app/Support/Twig/General.php+++ b/app/Support/Twig/General.php@@ -37,6 +37,7 @@ use Override;use Twig\Extension\AbstractExtension;use Twig\TwigFilter;use Twig\TwigFunction;+use function Safe\parse_url;/**@@ -104,7 +105,7 @@ class General extends AbstractExtension'activeRoutePartialObjectType',static function ($context): string {[, $route, $objectType] = func_get_args();- $activeObjectType = $context['objectType'] ?? false;+ $activeObjectType = $context['objectType'] ?? false;if ($objectType === $activeObjectType&& false !== stripos(@@ -154,14 +155,14 @@ class General extends AbstractExtension}/** @var Carbon $date */- $date = session('end', today(config('app.timezone'))->endOfMonth());+ $date = session('end', today(config('app.timezone'))->endOfMonth());Log::debug(sprintf('twig balance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));$info = Steam::finalAccountBalance($account, $date);$currency = Steam::getAccountCurrency($account);$primary = Amount::getPrimaryCurrency();$convertToPrimary = Amount::convertToPrimary();$usePrimary = $convertToPrimary && $primary->id !== $currency->id;- $currency ??= $primary;+ $currency ??= $primary;$strings = [];foreach ($info as $key => $balance) {if ('balance' === $key) {@@ -196,7 +197,7 @@ class General extends AbstractExtension{return new TwigFunction('carbonize',- static fn(string $date): Carbon => new Carbon($date, config('app.timezone'))+ static fn (string $date): Carbon => new Carbon($date, config('app.timezone')));}@@ -225,15 +226,15 @@ class General extends AbstractExtensionstatic function (int $size): string {// less than one GB, more than one MBif ($size < (1024 * 1024 * 2014) && $size >= (1024 * 1024)) {- return round($size / (1024 * 1024), 2) . ' MB';+ return round($size / (1024 * 1024), 2).' MB';}// less than one MBif ($size < (1024 * 1024)) {- return round($size / 1024, 2) . ' KB';+ return round($size / 1024, 2).' KB';}- return $size . ' bytes';+ return $size.' bytes';});}@@ -337,7 +338,7 @@ class General extends AbstractExtension{return new TwigFilter('mimeIcon',- static fn(string $string): string => match ($string) {+ static fn (string $string): string => match ($string) {'application/pdf' => 'fa-file-pdf-o','image/webp', 'image/png', 'image/jpeg', 'image/svg+xml', 'image/heic', 'image/heic-sequence', 'application/vnd.oasis.opendocument.image' => 'fa-file-image-o','application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'application/x-iwork-pages-sffpages', 'application/vnd.sun.xml.writer', 'application/vnd.sun.xml.writer.template', 'application/vnd.sun.xml.writer.global', 'application/vnd.stardivision.writer', 'application/vnd.stardivision.writer-global', 'application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.text-template', 'application/vnd.oasis.opendocument.text-web', 'application/vnd.oasis.opendocument.text-master' => 'fa-file-word-o',@@ -380,7 +381,7 @@ class General extends AbstractExtension{return new TwigFunction('phpdate',- static fn(string $str): string => date($str)+ static fn (string $str): string => date($str));}}diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.phpindex 7ed872df8b..ea60a67a3e 100644--- a/app/Support/Twig/Rule.php+++ b/app/Support/Twig/Rule.php@@ -42,7 +42,7 @@ class Rule extends AbstractExtension$ruleActions = array_keys(Config::get('firefly.rule-actions'));$possibleActions = [];foreach ($ruleActions as $key) {- $possibleActions[$key] = (string)trans('firefly.rule_action_' . $key . '_choice');+ $possibleActions[$key] = (string)trans('firefly.rule_action_'.$key.'_choice');}unset($ruleActions);asort($possibleActions);@@ -56,7 +56,7 @@ class Rule extends AbstractExtension{return new TwigFunction('allJournalTriggers',- static fn() => [+ static fn () => ['store-journal' => (string)trans('firefly.rule_trigger_store_journal'),'update-journal' => (string)trans('firefly.rule_trigger_update_journal'),'manual-activation' => (string)trans('firefly.rule_trigger_manual'),@@ -73,7 +73,7 @@ class Rule extends AbstractExtension$possibleTriggers = [];foreach ($ruleTriggers as $key) {if ('user_action' !== $key) {- $possibleTriggers[$key] = (string)trans('firefly.rule_trigger_' . $key . '_choice');+ $possibleTriggers[$key] = (string)trans('firefly.rule_trigger_'.$key.'_choice');}}unset($ruleTriggers);diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.phpindex e2957ec3a1..3033a84872 100644--- a/app/Support/Twig/TransactionGroupTwig.php+++ b/app/Support/Twig/TransactionGroupTwig.php@@ -34,6 +34,7 @@ use Illuminate\Support\Facades\DB;use Override;use Twig\Extension\AbstractExtension;use Twig\TwigFunction;+use function Safe\json_decode;/**@@ -82,10 +83,11 @@ class TransactionGroupTwig extends AbstractExtensionstatic function (int $journalId, string $metaField) {/** @var null|TransactionJournalMeta $entry */$entry = DB::table('journal_meta')- ->where('name', $metaField)- ->where('transaction_journal_id', $journalId)- ->whereNull('deleted_at')- ->first();+ ->where('name', $metaField)+ ->where('transaction_journal_id', $journalId)+ ->whereNull('deleted_at')+ ->first()+ ;if (null === $entry) {return today(config('app.timezone'));}@@ -102,10 +104,11 @@ class TransactionGroupTwig extends AbstractExtensionstatic function (int $journalId, string $metaField) {/** @var null|TransactionJournalMeta $entry */$entry = DB::table('journal_meta')- ->where('name', $metaField)- ->where('transaction_journal_id', $journalId)- ->whereNull('deleted_at')- ->first();+ ->where('name', $metaField)+ ->where('transaction_journal_id', $journalId)+ ->whereNull('deleted_at')+ ->first()+ ;if (null === $entry) {return '';}@@ -121,10 +124,11 @@ class TransactionGroupTwig extends AbstractExtension'journalHasMeta',static function (int $journalId, string $metaField) {$count = DB::table('journal_meta')- ->where('name', $metaField)- ->where('transaction_journal_id', $journalId)- ->whereNull('deleted_at')- ->count();+ ->where('name', $metaField)+ ->where('transaction_journal_id', $journalId)+ ->whereNull('deleted_at')+ ->count()+ ;return 1 === $count;}@@ -157,9 +161,9 @@ class TransactionGroupTwig extends AbstractExtension*/private function foreignJournalArrayAmount(array $array): string{- $type = $array['transaction_type_type'] ?? TransactionTypeEnum::WITHDRAWAL->value;- $amount = $array['foreign_amount'] ?? '0';- $colored = true;+ $type = $array['transaction_type_type'] ?? TransactionTypeEnum::WITHDRAWAL->value;+ $amount = $array['foreign_amount'] ?? '0';+ $colored = true;$sourceType = $array['source_account_type'] ?? 'invalid';$amount = $this->signAmount($amount, $type, $sourceType);@@ -167,7 +171,7 @@ class TransactionGroupTwig extends AbstractExtensionif (TransactionTypeEnum::TRANSFER->value === $type) {$colored = false;}- $result = app('amount')->formatFlat($array['foreign_currency_symbol'], (int)$array['foreign_currency_decimal_places'], $amount, $colored);+ $result = app('amount')->formatFlat($array['foreign_currency_symbol'], (int)$array['foreign_currency_decimal_places'], $amount, $colored);if (TransactionTypeEnum::TRANSFER->value === $type) {return sprintf('<span class="text-info money-transfer">%s</span>', $result);}@@ -180,7 +184,7 @@ class TransactionGroupTwig extends AbstractExtension*/private function foreignJournalObjectAmount(TransactionJournal $journal): string{- $type = $journal->transactionType->type;+ $type = $journal->transactionType->type;/** @var Transaction $first */$first = $journal->transactions()->where('amount', '<', 0)->first();@@ -189,12 +193,12 @@ class TransactionGroupTwig extends AbstractExtension$colored = true;$sourceType = $first->account->accountType()->first()->type;- $amount = $this->signAmount($amount, $type, $sourceType);+ $amount = $this->signAmount($amount, $type, $sourceType);if (TransactionTypeEnum::TRANSFER->value === $type) {$colored = false;}- $result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);+ $result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);if (TransactionTypeEnum::TRANSFER->value === $type) {return sprintf('<span class="text-info money-transfer">%s</span>', $result);}@@ -225,7 +229,7 @@ class TransactionGroupTwig extends AbstractExtension$colored = false;}- $result = app('amount')->formatFlat($array['currency_symbol'], (int)$array['currency_decimal_places'], $amount, $colored);+ $result = app('amount')->formatFlat($array['currency_symbol'], (int)$array['currency_decimal_places'], $amount, $colored);if (TransactionTypeEnum::TRANSFER->value === $type) {return sprintf('<span class="text-info money-transfer">%s</span>', $result);}@@ -238,7 +242,7 @@ class TransactionGroupTwig extends AbstractExtension*/private function normalJournalObjectAmount(TransactionJournal $journal): string{- $type = $journal->transactionType->type;+ $type = $journal->transactionType->type;/** @var Transaction $first */$first = $journal->transactions()->where('amount', '<', 0)->first();@@ -247,12 +251,12 @@ class TransactionGroupTwig extends AbstractExtension$colored = true;$sourceType = $first->account->accountType()->first()->type;- $amount = $this->signAmount($amount, $type, $sourceType);+ $amount = $this->signAmount($amount, $type, $sourceType);if (TransactionTypeEnum::TRANSFER->value === $type) {$colored = false;}- $result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);+ $result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);if (TransactionTypeEnum::TRANSFER->value === $type) {return sprintf('<span class="text-info money-transfer">%s</span>', $result);}diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.phpindex e4f429f07e..d316895ed7 100644--- a/app/Support/Twig/Translation.php+++ b/app/Support/Twig/Translation.php@@ -39,7 +39,7 @@ class Translation extends AbstractExtensionreturn [new TwigFilter('_',- static fn($name) => (string)trans(sprintf('firefly.%s', $name)),+ static fn ($name) => (string)trans(sprintf('firefly.%s', $name)),['is_safe' => ['html']]),];diff --git a/composer.lock b/composer.lockindex 18cb3ef987..f3717d8cb4 100644--- a/composer.lock+++ b/composer.lock@@ -11511,21 +11511,21 @@},{"name": "phpstan/phpstan-strict-rules",- "version": "2.0.6",+ "version": "2.0.7","source": {"type": "git","url": "https://github.com/phpstan/phpstan-strict-rules.git",- "reference": "f9f77efa9de31992a832ff77ea52eb42d675b094"+ "reference": "d6211c46213d4181054b3d77b10a5c5cb0d59538"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/f9f77efa9de31992a832ff77ea52eb42d675b094",- "reference": "f9f77efa9de31992a832ff77ea52eb42d675b094",+ "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/d6211c46213d4181054b3d77b10a5c5cb0d59538",+ "reference": "d6211c46213d4181054b3d77b10a5c5cb0d59538","shasum": ""},"require": {"php": "^7.4 || ^8.0",- "phpstan/phpstan": "^2.0.4"+ "phpstan/phpstan": "^2.1.29"},"require-dev": {"php-parallel-lint/php-parallel-lint": "^1.2",@@ -11553,9 +11553,9 @@"description": "Extra strict and opinionated rules for PHPStan","support": {"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",- "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.6"+ "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.7"},- "time": "2025-07-21T12:19:29+00:00"+ "time": "2025-09-26T11:19:08+00:00"},{"name": "phpunit/php-code-coverage",diff --git a/config/firefly.php b/config/firefly.phpindex 3139bb0be9..cf0424ddc6 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => env('USE_RUNNING_BALANCE', false),// see cer.php for exchange rates feature flag.],- 'version' => 'develop/2025-09-25',- 'build_time' => 1758820163,+ 'version' => 'develop/2025-09-26',+ 'build_time' => 1758908498,'api_version' => '2.1.0', // field is no longer used.'db_version' => 27,diff --git a/package-lock.json b/package-lock.jsonindex d69416dc1e..09bb10c0a6 100644--- a/package-lock.json+++ b/package-lock.json@@ -5736,9 +5736,9 @@"license": "MIT"},"node_modules/electron-to-chromium": {- "version": "1.5.223",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.223.tgz",- "integrity": "sha512-qKm55ic6nbEmagFlTFczML33rF90aU+WtrJ9MdTCThrcvDNdUHN4p6QfVN78U06ZmguqXIyMPyYhw2TrbDUwPQ==",+ "version": "1.5.224",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.224.tgz",+ "integrity": "sha512-kWAoUu/bwzvnhpdZSIc6KUyvkI1rbRXMT0Eq8pKReyOyaPZcctMli+EgvcN1PAvwVc7Tdo4Fxi2PsLNDU05mdg==","dev": true,"license": "ISC"},