Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix some rector code.
James Coleac0113e445c3
diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.phpindex de08a181b5..25fc1f145e 100644--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php@@ -28,8 +28,10 @@ use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\PiggyBank;+use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;+use FireflyIII\Support\Facades\Amount;use Illuminate\Http\JsonResponse;/**@@ -96,6 +98,7 @@ class PiggyBankController extends Controller/** @var PiggyBank $piggy */foreach ($piggies as $piggy) {+ /** @var TransactionCurrency $currency */$currency = $piggy->transactionCurrency;$currentAmount = $this->piggyRepository->getCurrentAmount($piggy);$objectGroup = $piggy->objectGroups()->first();@@ -105,8 +108,8 @@ class PiggyBankController extends Controller'name_with_balance' => sprintf('%s (%s / %s)',$piggy->name,- app('amount')->formatAnything($currency, $currentAmount, false),- app('amount')->formatAnything($currency, $piggy->target_amount, false),+ Amount::formatAnything($currency, $currentAmount, false),+ Amount::formatAnything($currency, $piggy->target_amount, false),),'currency_id' => (string) $currency->id,'currency_name' => $currency->name,diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.phpindex 265a72b616..733517a506 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php@@ -72,7 +72,7 @@ class DestroyController extends Controllerpublic function destroySingleByDate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): JsonResponse{$exchangeRate = $this->repository->getSpecificRateOnDate($from, $to, $date);- if (null !== $exchangeRate) {+ if ($exchangeRate instanceof CurrencyExchangeRate) {$this->repository->deleteRate($exchangeRate);}diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.phpindex 3b2f8c6e4d..22a9756ab7 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php@@ -95,7 +95,7 @@ class ShowController extends Controller$transformer->setParameters($this->parameters);$exchangeRate = $this->repository->getSpecificRateOnDate($from, $to, $date);- if (null === $exchangeRate) {+ if (!$exchangeRate instanceof CurrencyExchangeRate) {throw new NotFoundHttpException();}diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.phpindex 8844407f7d..8326f44c52 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php@@ -74,7 +74,7 @@ class UpdateController extends Controllerpublic function updateByDate(UpdateRequest $request, TransactionCurrency $from, TransactionCurrency $to, Carbon $date): JsonResponse{$exchangeRate = $this->repository->getSpecificRateOnDate($from, $to, $date);- if (null === $exchangeRate) {+ if (!$exchangeRate instanceof CurrencyExchangeRate) {throw new NotFoundHttpException();}$date = $request->getDate();diff --git a/app/Casts/SeparateTimezoneCaster.php b/app/Casts/SeparateTimezoneCaster.phpindex 67a56ae83e..608f5fc1c9 100644--- a/app/Casts/SeparateTimezoneCaster.php+++ b/app/Casts/SeparateTimezoneCaster.php@@ -28,7 +28,6 @@ namespace FireflyIII\Casts;use Carbon\Carbon;use Illuminate\Contracts\Database\Eloquent\CastsAttributes;use Illuminate\Database\Eloquent\Model;-use Illuminate\Support\Facades\Log;/*** Class SeparateTimezoneCasterdiff --git a/app/Console/Commands/Tools/ApplyRules.php b/app/Console/Commands/Tools/ApplyRules.phpindex b2a891b5d6..c0ea4ed2db 100644--- a/app/Console/Commands/Tools/ApplyRules.php+++ b/app/Console/Commands/Tools/ApplyRules.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Tools;+use Carbon\CarbonInterface;use Carbon\Carbon;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Console\Commands\VerifiesAccessToken;@@ -283,7 +284,7 @@ class ApplyRules extends Commandif (null !== $endString && '' !== $endString) {$inputEnd = Carbon::createFromFormat('Y-m-d', $endString);}- if (null === $inputEnd || null === $inputStart) {+ if (!$inputEnd instanceof Carbon || null === $inputStart) {Log::error('Could not parse start or end date in verifyInputDate().');return;diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.phpindex 519ff3d538..21c573565e 100644--- a/app/Http/Controllers/Transaction/CreateController.php+++ b/app/Http/Controllers/Transaction/CreateController.php@@ -31,6 +31,7 @@ use FireflyIII\Http\Controllers\Controller;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;use FireflyIII\Services\Internal\Update\GroupCloneService;+use FireflyIII\Support\Facades\Preferences;use Illuminate\Contracts\View\Factory;use Illuminate\Contracts\View\View;use Illuminate\Http\JsonResponse;@@ -76,7 +77,7 @@ class CreateController extends Controller// event!event(new StoredTransactionGroup($newGroup, true, true));- app('preferences')->mark();+ Preferences::mark();$title = $newGroup->title ?? $newGroup->transactionJournals->first()->description;$link = route('transactions.show', [$newGroup->id]);@@ -103,7 +104,7 @@ class CreateController extends Controller* */public function create(?string $objectType){- app('preferences')->mark();+ Preferences::mark();$sourceId = (int) request()->get('source');$destinationId = (int) request()->get('destination');@@ -114,7 +115,8 @@ class CreateController extends Controller$preFilled = session()->has('preFilled') ? session('preFilled') : [];$subTitle = (string) trans(sprintf('breadcrumbs.create_%s', strtolower((string) $objectType)));$subTitleIcon = 'fa-plus';- $optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data;+ /** @var array|null $optionalFields */+ $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;$allowedOpposingTypes = config('firefly.allowed_opposing_types');$accountToTypes = config('firefly.account_to_transaction');$previousUrl = $this->rememberPreviousUrl('transactions.create.url');diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.phpindex e020782f40..d88bc16d0b 100644--- a/app/Repositories/Category/OperationsRepository.php+++ b/app/Repositories/Category/OperationsRepository.php@@ -510,9 +510,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn$summarizer->setConvertToPrimary($convertToPrimary);// filter $journals by range AND currency if it is present.- $expenses = array_filter($expenses, static function (array $expense) use ($category): bool {- return $expense['category_id'] === $category->id;- });+ $expenses = array_filter($expenses, static fn(array $expense): bool => $expense['category_id'] === $category->id);return $summarizer->groupByCurrencyId($expenses, $method, false);}diff --git a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.phpindex 612773a9e2..07523c5348 100644--- a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php+++ b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php@@ -68,7 +68,7 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterfaceLog::debug(sprintf('Saved #%d [currency #%d, Model %s #%d, %s to %s, %d, %s] as new statistic.',$stat->id,- get_class($model),+ $model::class,$model->id,$stat->transaction_currency_id,$stat->start->toW3cString(),diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.phpindex 0acb4b7ed8..e63da28927 100644--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php@@ -67,7 +67,7 @@ trait ModifiesPiggyBanks{$currentAmount = $this->getCurrentAmount($piggyBank, $account);$pivot = $piggyBank->accounts()->where('accounts.id', $account->id)->first()->pivot;- $pivot->current_amount = bcsub($currentAmount, $amount);+ $pivot->current_amount = bcsub((string) $currentAmount, $amount);$pivot->native_current_amount = null;// also update native_current_amount.@@ -90,7 +90,7 @@ trait ModifiesPiggyBanks{$currentAmount = $this->getCurrentAmount($piggyBank, $account);$pivot = $piggyBank->accounts()->where('accounts.id', $account->id)->first()->pivot;- $pivot->current_amount = bcadd($currentAmount, $amount);+ $pivot->current_amount = bcadd((string) $currentAmount, $amount);$pivot->native_current_amount = null;// also update native_current_amount.@@ -122,13 +122,13 @@ trait ModifiesPiggyBanksif (0 !== bccomp($piggyBank->target_amount, '0')) {- $leftToSave = bcsub($piggyBank->target_amount, $savedSoFar);- $maxAmount = 1 === bccomp($leftOnAccount, $leftToSave) ? $leftToSave : $leftOnAccount;+ $leftToSave = bcsub($piggyBank->target_amount, (string) $savedSoFar);+ $maxAmount = 1 === bccomp((string) $leftOnAccount, $leftToSave) ? $leftToSave : $leftOnAccount;Log::debug(sprintf('Left to save: %s', $leftToSave));Log::debug(sprintf('Maximum amount: %s', $maxAmount));}- $compare = bccomp($amount, $maxAmount);+ $compare = bccomp($amount, (string) $maxAmount);$result = $compare <= 0;Log::debug(sprintf('Compare <= 0? %d, so canAddAmount is %s', $compare, var_export($result, true)));@@ -140,7 +140,7 @@ trait ModifiesPiggyBanks{$savedSoFar = $this->getCurrentAmount($piggyBank, $account);- return bccomp($amount, $savedSoFar) <= 0;+ return bccomp($amount, (string) $savedSoFar) <= 0;}/**@@ -234,9 +234,9 @@ trait ModifiesPiggyBanks// if the piggy bank is now smaller than the sum of the money saved,// remove money from all accounts until the piggy bank is the right amount.$currentAmount = $this->getCurrentAmount($piggyBank);- if (1 === bccomp($currentAmount, (string)$piggyBank->target_amount) && 0 !== bccomp((string)$piggyBank->target_amount, '0')) {+ if (1 === bccomp((string) $currentAmount, (string)$piggyBank->target_amount) && 0 !== bccomp((string)$piggyBank->target_amount, '0')) {Log::debug(sprintf('Current amount is %s, target amount is %s', $currentAmount, $piggyBank->target_amount));- $difference = bcsub((string)$piggyBank->target_amount, $currentAmount);+ $difference = bcsub((string)$piggyBank->target_amount, (string) $currentAmount);// an amount will be removed, create "negative" event:// Log::debug(sprintf('ChangedAmount: is triggered with difference "%s"', $difference));diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.phpindex 06a41da184..576f6ec804 100644--- a/app/Repositories/Tag/TagRepository.php+++ b/app/Repositories/Tag/TagRepository.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Tag;+use Override;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Factory\TagFactory;@@ -380,7 +381,7 @@ class TagRepository implements TagRepositoryInterface, UserGroupInterfacereturn $tag->locations()->first();}- #[\Override]+ #[Override]public function periodCollection(Tag $tag, Carbon $start, Carbon $end): array{Log::debug(sprintf('periodCollection(#%d, %s, %s)', $tag->id, $start->format('Y-m-d'), $end->format('Y-m-d')));diff --git a/app/Services/Internal/Support/CreditRecalculateService.php b/app/Services/Internal/Support/CreditRecalculateService.phpindex eb6b33b8d4..66b5fc359c 100644--- a/app/Services/Internal/Support/CreditRecalculateService.php+++ b/app/Services/Internal/Support/CreditRecalculateService.php@@ -276,66 +276,66 @@ class CreditRecalculateServiceif ($isSameAccount && $isCredit && $this->isWithdrawalIn($usedAmount, $type)) { // case 1$usedAmount = app('steam')->positive($usedAmount);- return bcadd($leftOfDebt, $usedAmount);+ return bcadd($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 1 (withdrawal into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isCredit && $this->isWithdrawalOut($usedAmount, $type)) { // case 2$usedAmount = app('steam')->positive($usedAmount);- return bcsub($leftOfDebt, $usedAmount);+ return bcsub($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 2 (withdrawal away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isCredit && $this->isDepositOut($usedAmount, $type)) { // case 3$usedAmount = app('steam')->positive($usedAmount);- return bcsub($leftOfDebt, $usedAmount);+ return bcsub($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 3 (deposit away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isCredit && $this->isDepositIn($usedAmount, $type)) { // case 4$usedAmount = app('steam')->positive($usedAmount);- return bcadd($leftOfDebt, $usedAmount);+ return bcadd($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 4 (deposit into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isCredit && $this->isTransferIn($usedAmount, $type)) { // case 5$usedAmount = app('steam')->positive($usedAmount);- return bcadd($leftOfDebt, $usedAmount);+ return bcadd($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 5 (transfer into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isDebit && $this->isWithdrawalIn($usedAmount, $type)) { // case 6$usedAmount = app('steam')->positive($usedAmount);- return bcsub($leftOfDebt, $usedAmount);+ return bcsub($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 6 (withdrawal into debit liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isDebit && $this->isDepositOut($usedAmount, $type)) { // case 7$usedAmount = app('steam')->positive($usedAmount);- return bcadd($leftOfDebt, $usedAmount);+ return bcadd($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 7 (deposit away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isDebit && $this->isWithdrawalOut($usedAmount, $type)) { // case 8$usedAmount = app('steam')->positive($usedAmount);- return bcadd($leftOfDebt, $usedAmount);+ return bcadd($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case 8 (withdrawal away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isDebit && $this->isTransferIn($usedAmount, $type)) { // case 9$usedAmount = app('steam')->positive($usedAmount);- return bcsub($leftOfDebt, $usedAmount);+ return bcsub($leftOfDebt, (string) $usedAmount);// 2024-10-05, #9225 this used to say you would owe more, but a transfer INTO a debit from wherever means you owe LESS.// Log::debug(sprintf('Case 9 (transfer into debit liability, means you owe LESS): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}if ($isSameAccount && $isDebit && $this->isTransferOut($usedAmount, $type)) { // case 10$usedAmount = app('steam')->positive($usedAmount);- return bcadd($leftOfDebt, $usedAmount);+ return bcadd($leftOfDebt, (string) $usedAmount);// 2024-10-05, #9225 this used to say you would owe less, but a transfer OUT OF a debit from wherever means you owe MORE.// Log::debug(sprintf('Case 10 (transfer out of debit liability, means you owe MORE): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}@@ -344,7 +344,7 @@ class CreditRecalculateServiceif (in_array($type, [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value], true)) {$usedAmount = app('steam')->negative($usedAmount);- return bcadd($leftOfDebt, $usedAmount);+ return bcadd($leftOfDebt, (string) $usedAmount);// Log::debug(sprintf('Case X (all other cases): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));}diff --git a/app/Support/Debug/Timer.php b/app/Support/Debug/Timer.phpindex b23e941a0c..5f2d6bc283 100644--- a/app/Support/Debug/Timer.php+++ b/app/Support/Debug/Timer.php@@ -38,7 +38,7 @@ class Timerpublic static function getInstance(): self{- if (null === self::$instance) {+ if (!self::$instance instanceof \FireflyIII\Support\Debug\Timer) {self::$instance = new self();}diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.phpindex 3b9a708d88..98206c429e 100644--- a/app/Support/Http/Controllers/PeriodOverview.php+++ b/app/Support/Http/Controllers/PeriodOverview.php@@ -724,7 +724,7 @@ trait PeriodOverviewprotected function saveGroupedAsStatistics(Model $model, Carbon $start, Carbon $end, string $type, array $array): void{unset($array['count']);- Log::debug(sprintf('saveGroupedAsStatistics(%s #%d, %s, %s, "%s", array(%d))', get_class($model), $model->id, $start->format('Y-m-d'), $end->format('Y-m-d'), $type, count($array)));+ Log::debug(sprintf('saveGroupedAsStatistics(%s #%d, %s, %s, "%s", array(%d))', $model::class, $model->id, $start->format('Y-m-d'), $end->format('Y-m-d'), $type, count($array)));foreach ($array as $entry) {$this->periodStatisticRepo->saveStatistic($model, $entry['currency_id'], $start, $end, $type, $entry['count'], $entry['amount']);}@@ -899,7 +899,7 @@ trait PeriodOverview];- $return[$currencyId]['amount'] = bcadd($return[$currencyId]['amount'], $amount);+ $return[$currencyId]['amount'] = bcadd((string) $return[$currencyId]['amount'], $amount);++$return[$currencyId]['count'];++$return['count'];}diff --git a/app/Support/JsonApi/Enrichments/CategoryEnrichment.php b/app/Support/JsonApi/Enrichments/CategoryEnrichment.phpindex 975227844f..b5ddd22c52 100644--- a/app/Support/JsonApi/Enrichments/CategoryEnrichment.php+++ b/app/Support/JsonApi/Enrichments/CategoryEnrichment.php@@ -135,7 +135,7 @@ class CategoryEnrichment implements EnrichmentInterfaceprivate function collectTransactions(): void{- if (null !== $this->start && null !== $this->end) {+ if ($this->start instanceof Carbon && $this->end instanceof Carbon) {/** @var OperationsRepositoryInterface $opsRepository */$opsRepository = app(OperationsRepositoryInterface::class);$opsRepository->setUser($this->user);diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.phpindex e1afbe0042..7c6a8a8a5b 100644--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php@@ -142,9 +142,9 @@ class PiggyBankEnrichment implements EnrichmentInterface'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'], (string) $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['pc_current_amount'] = null === $row['pc_current_amount'] ? null : bcadd((string) $meta['pc_current_amount'], (string) $row['pc_current_amount']);}$meta['current_amount'] = Steam::bcround($meta['current_amount'], $currency->decimal_places);// only round this number when pc_current_amount is set.@@ -152,8 +152,8 @@ class PiggyBankEnrichment implements EnrichmentInterface// calculate left to save, only when there is a target amount.if (null !== $targetAmount) {- $meta['left_to_save'] = bcsub($meta['target_amount'], $meta['current_amount']);- $meta['pc_left_to_save'] = null === $meta['pc_target_amount'] ? null : bcsub($meta['pc_target_amount'], $meta['pc_current_amount']);+ $meta['left_to_save'] = bcsub((string) $meta['target_amount'], (string) $meta['current_amount']);+ $meta['pc_left_to_save'] = null === $meta['pc_target_amount'] ? null : bcsub((string) $meta['pc_target_amount'], (string) $meta['pc_current_amount']);}// get suggested per month.@@ -199,7 +199,7 @@ class PiggyBankEnrichment implements EnrichmentInterface'pc_current_amount' => '0',];}- $this->amounts[$id][$accountId]['current_amount'] = bcadd($this->amounts[$id][$accountId]['current_amount'], (string)$item->current_amount);+ $this->amounts[$id][$accountId]['current_amount'] = bcadd((string) $this->amounts[$id][$accountId]['current_amount'], (string)$item->current_amount);if (null !== $this->amounts[$id][$accountId]['pc_current_amount'] && null !== $item->native_current_amount) {$this->amounts[$id][$accountId]['pc_current_amount'] = bcadd($this->amounts[$id][$accountId]['pc_current_amount'], (string)$item->native_current_amount);}diff --git a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.phpindex 82f513a44e..0c77493667 100644--- a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php+++ b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php@@ -197,7 +197,7 @@ trait RecalculatesAvailableBudgetsTrait// if not exists:$currentPeriod = Period::make($current, $currentEnd, precision: Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE());$daily = $this->getDailyAmount($budgetLimit);- $amount = bcmul($daily, (string)$currentPeriod->length(), 12);+ $amount = bcmul((string) $daily, (string)$currentPeriod->length(), 12);// no need to calculate if period is equal.if ($currentPeriod->equals($limitPeriod)) {diff --git a/app/Support/Report/Summarizer/TransactionSummarizer.php b/app/Support/Report/Summarizer/TransactionSummarizer.phpindex 5660a239f0..83f057c68c 100644--- a/app/Support/Report/Summarizer/TransactionSummarizer.php+++ b/app/Support/Report/Summarizer/TransactionSummarizer.php@@ -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'], (string) 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)@@ -211,7 +211,7 @@ class TransactionSummarizer'currency_code' => $journal['foreign_currency_code'],'currency_decimal_places' => $journal['foreign_currency_decimal_places'],];- $array[$key]['sum'] = bcadd($array[$key]['sum'], Steam::{$method}((string)$journal['foreign_amount'])); // @phpstan-ignore-line+ $array[$key]['sum'] = bcadd($array[$key]['sum'], (string) Steam::{$method}((string)$journal['foreign_amount'])); // @phpstan-ignore-line}}diff --git a/app/Support/Singleton/PreferencesSingleton.php b/app/Support/Singleton/PreferencesSingleton.phpindex 287a964361..716eddc1e8 100644--- a/app/Support/Singleton/PreferencesSingleton.php+++ b/app/Support/Singleton/PreferencesSingleton.php@@ -38,7 +38,7 @@ class PreferencesSingletonpublic static function getInstance(): self{- if (null === self::$instance) {+ if (!self::$instance instanceof PreferencesSingleton) {self::$instance = new self();}diff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex 46119a268a..71d5e788f3 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -756,7 +756,7 @@ class Steam$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((string) $current, $total);}return $total;diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.phpindex a9724ddc57..a0a43ecc59 100644--- a/app/Transformers/PiggyBankEventTransformer.php+++ b/app/Transformers/PiggyBankEventTransformer.php@@ -35,7 +35,7 @@ use FireflyIII\Support\Facades\Steam;*/class PiggyBankEventTransformer extends AbstractTransformer{- private TransactionCurrency $primaryCurrency;+ private readonly TransactionCurrency $primaryCurrency;private bool $convertToPrimary = false;/**