Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-07
JC5cdc439fddbae
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex 94be2ae461..df99eef909 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,10 +158,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];}}diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.phpindex b7b85fd376..f92a7aa9f0 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,10 +155,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float}}diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex d461374baa..2edb4f5531 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,13 +198,7 @@ final class BudgetLimitController extends Controllerif ($request->expectsJson()) {$array = $limit->toArray();// add some extra metadata:- $spentArr = $this->opsRepository->sumExpenses(- $limit->start_date,- $limit->end_date,- null,- new Collection()->push($budget),- $currency- );+ $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';$array['left_formatted'] = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));$array['amount_formatted'] = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.phpindex d40d4432a3..215ebbd484 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -284,10 +284,7 @@ final class IndexController extends Controllerif (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {$array['spent'][$currency->id]['spent'] = $spentArr[$currency->id]['sum'];- $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub(- $spentInLimits[$currency->id],- $spentArr[$currency->id]['sum']- ));+ $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));$array['spent'][$currency->id]['currency_id'] = $currency->id;$array['spent'][$currency->id]['currency_symbol'] = $currency->symbol;$array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.phpindex f4b32fe5c5..ad724137dc 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,13 +539,7 @@ final class BudgetController extends Controller}// get spent amount in this period for this currency.- $sum = $this->opsRepository->sumExpenses(- $currentStart,- $currentEnd,- $accounts,- new Collection()->push($budget),- $currency- );+ $sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex affea656a0..476da65ac3 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -132,13 +132,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));@@ -228,13 +222,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex a507156873..a3a940b1ba 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,14 +222,7 @@ trait AugumentData$currentEnd->addMonth();}// primary currency amount.- $expenses = $opsRepository->sumExpenses(- $currentStart,- $currentEnd,- null,- $budgetCollection,- $entry->transactionCurrency,- $this->convertToPrimary- );+ $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);$spent = $expenses[$currency->id]['sum'] ?? '0';$entry->pc_spent = $spent;diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex 2428353cb0..d0c09bf027 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,11 +354,7 @@ class RecurringEnrichment implements EnrichmentInterface/** @var RecurrenceRepetition $repetition */foreach ($set as $repetition) {- $recurrence = $this->collection->filter(- static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id- )- ->first()- ;+ $recurrence = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();$fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);$recurrenceId = (int) $repetition->recurrence_id;$repId = (int) $repetition->id;diff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex 5022809f1a..d53668b9be 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -159,19 +159,19 @@ class Steam// $return['pc_balance'] = bcadd($pcVirtualBalance, $return['pc_balance']);$sumsByCode[$primary->code] = bcadd($pcVirtualBalance, $sumsByCode[$primary->code] ?? '0');-// Log::debug(sprintf('Primary virtual balance (%s) makes the primary total %s', $pcVirtualBalance, $sumsByCode[$primary->code]));+ // Log::debug(sprintf('Primary virtual balance (%s) makes the primary total %s', $pcVirtualBalance, $sumsByCode[$primary->code]));}if (!$convertToPrimary) {// if not, also increase the balance + primary balance for consistency.// $return['balance'] = bcadd($return['balance'], $virtualBalance);$sumsByCode[$currency->code] = bcadd($virtualBalance, $sumsByCode[$currency->code] ?? '0');-// Log::debug(sprintf('Virtual balance (%s) makes the (primary currency) total %s', $virtualBalance, $sumsByCode[$currency->code]));+ // Log::debug(sprintf('Virtual balance (%s) makes the (primary currency) total %s', $virtualBalance, $sumsByCode[$currency->code]));}$final = array_merge($return, $sumsByCode);$result[$account->id] = $final;-// Log::debug(sprintf('Final balance for account #%d is', $account->id), $final);+ // Log::debug(sprintf('Final balance for account #%d is', $account->id), $final);}return $result;@@ -220,7 +220,7 @@ class Steampublic function filterAccountBalance(array $set, Account $account, bool $convertToPrimary, ?TransactionCurrency $currency = null): array{-// Log::debug(sprintf('filterAccountBalance(#%d)', $account->id), $set);+ // Log::debug(sprintf('filterAccountBalance(#%d)', $account->id), $set);if (0 === count($set)) {Log::debug(sprintf('Return empty array for account #%d', $account->id));@@ -229,30 +229,30 @@ class Steam$primaryCurrency = Amount::getPrimaryCurrency();if ($convertToPrimary) {if ($primaryCurrency->id === $currency?->id) {-// Log::debug(sprintf('Unset [%s] for account #%d (no longer unset "pc_balance")', $primaryCurrency->code, $account->id));+ // Log::debug(sprintf('Unset [%s] for account #%d (no longer unset "pc_balance")', $primaryCurrency->code, $account->id));unset($set[$primaryCurrency->code]);}// todo rethink this logic.if ($currency instanceof TransactionCurrency && $primaryCurrency->id !== $currency->id) {-// Log::debug(sprintf('Unset balance for account #%d', $account->id));+ // Log::debug(sprintf('Unset balance for account #%d', $account->id));unset($set['balance']);}if (!$currency instanceof TransactionCurrency) {-// Log::debug(sprintf('Unset balance for account #%d', $account->id));+ // Log::debug(sprintf('Unset balance for account #%d', $account->id));unset($set['balance']);}}if (!$convertToPrimary) {if (!$currency instanceof TransactionCurrency) {-// Log::debug(sprintf('Unset pc_balance and make primaryCurrency balance the balance for account #%d', $account->id));+ // Log::debug(sprintf('Unset pc_balance and make primaryCurrency balance the balance for account #%d', $account->id));$set['balance'] = $set[$primaryCurrency->code] ?? '0';unset($set[$primaryCurrency->code]);}if ($currency instanceof TransactionCurrency) {-// Log::debug(sprintf('Unset [%s] + [%s] balance for account #%d', $primaryCurrency->code, $currency->code, $account->id));+ // Log::debug(sprintf('Unset [%s] + [%s] balance for account #%d', $primaryCurrency->code, $currency->code, $account->id));unset($set[$primaryCurrency->code], $set[$currency->code]);}}@@ -264,19 +264,19 @@ class Steamif (array_key_exists('balance', $set)) {$set = ['balance' => $set['balance']] + $set;}-// Log::debug(sprintf('Return #%d', $account->id), $set);+ // Log::debug(sprintf('Return #%d', $account->id), $set);return $set;}public function filterAccountBalances(array $total, Account $account, bool $convertToPrimary, ?TransactionCurrency $currency = null): array{-// Log::debug(sprintf('filterAccountBalances(#%d)', $account->id));+ // Log::debug(sprintf('filterAccountBalances(#%d)', $account->id));$return = [];foreach ($total as $key => $value) {$return[$key] = $this->filterAccountBalance($value, $account, $convertToPrimary, $currency);}-// Log::debug(sprintf('end of filterAccountBalances(#%d)', $account->id));+ // Log::debug(sprintf('end of filterAccountBalances(#%d)', $account->id));return $return;}@@ -366,11 +366,11 @@ class Steam$cache->addProperty($account->id);$cache->addProperty($date);if ($cache->has()) {-// Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s, inclusive:%s)', $account->id, $date->format('Y-m-d H:i:s'), var_export($inclusive, true)));+ // Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s, inclusive:%s)', $account->id, $date->format('Y-m-d H:i:s'), var_export($inclusive, true)));return $cache->get();}-// Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));+ // Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));if (null === $convertToPrimary) {$convertToPrimary = Amount::convertToPrimary($account->user);}@@ -398,7 +398,7 @@ class Steam->toArray();$others = $this->groupAndSumTransactions($array, 'code', 'amount');-// Log::debug('All balances are (joined)', $others);+ // 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';if (!$convertToPrimary) {@@ -431,7 +431,7 @@ class Steam// Log::debug(sprintf('Virtual balance makes the (primary currency) total %s', $return['balance']));}$final = array_merge($return, $others);-// Log::debug('Final balance is', $final);+ // Log::debug('Final balance is', $final);$cache->store($final);return $final;@@ -445,7 +445,7 @@ class Steam// expand period.$start->startOfDay();$end->endOfDay();-// Log::debug(sprintf('called finalAccountBalanceInRange(#%d, %s, %s)', $account->id, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));+ // Log::debug(sprintf('called 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();@@ -455,56 +455,60 @@ class Steam$cache->addProperty($convertToPrimary);$cache->addProperty($end);if ($cache->has()) {-// Log::debug('Return cached finalAccountBalanceInRange');+ // Log::debug('Return cached finalAccountBalanceInRange');return $cache->get();}$balances = [];$formatted = $start->format('Y-m-d');-// Log::debug('Get first balance to start.');+ // Log::debug('Get first balance to start.');// 2025-10-08 replaced finalAccountBalance with accountsBalancesOptimized:$primaryCurrency = Amount::getPrimaryCurrencyByUserGroup($account->user->userGroup);$startBalance = $this->accountsBalancesOptimized(new Collection()->push($account), $start, $primaryCurrency, $convertToPrimary, false)[$account->id];$accountCurrency = $this->getAccountCurrency($account);$hasCurrency = $accountCurrency instanceof TransactionCurrency;$currency = $accountCurrency ?? $primaryCurrency;-// Log::debug(sprintf('Currency is %s', $currency->code));+ // Log::debug(sprintf('Currency is %s', $currency->code));// set start balances:if (!array_key_exists($currency->code, $startBalance)) {// set first balance to 0 or the virtual balance of the account.$startBalance[$currency->code] = (string) ('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance);-// Log::debug(sprintf('[a] Start balance in %s is %s', $currency->code, $startBalance[$currency->code]));++ // Log::debug(sprintf('[a] Start balance in %s is %s', $currency->code, $startBalance[$currency->code]));}if ($hasCurrency && !array_key_exists($accountCurrency->code, $startBalance)) {$startBalance[$currency->code] = (string) ('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance);-// Log::debug(sprintf('[b] Start balance in %s is %s', $currency->code, $startBalance[$currency->code]));++ // Log::debug(sprintf('[b] Start balance in %s is %s', $currency->code, $startBalance[$currency->code]));}if ($hasCurrency && !array_key_exists($primaryCurrency->code, $startBalance)) {if ($accountCurrency->id !== $primaryCurrency->id && $convertToPrimary) {$converter = new ExchangeRateConverter();$converted = $converter->convert($accountCurrency, $primaryCurrency, $start, $startBalance[$accountCurrency->code]);$startBalance[$primaryCurrency->code] = $converted;-// Log::debug(sprintf('[c] Also set start balance in %s to %s', $primaryCurrency->code, $converted));++ // Log::debug(sprintf('[c] Also set start balance in %s to %s', $primaryCurrency->code, $converted));}if ($accountCurrency->id !== $primaryCurrency->id && !$convertToPrimary) {$startBalance[$primaryCurrency->code] = (string) ('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance);-// Log::debug(sprintf('[d] Also set start balance in %s to %s', $primaryCurrency->code, $startBalance[$primaryCurrency->code]));++ // Log::debug(sprintf('[d] Also set start balance in %s to %s', $primaryCurrency->code, $startBalance[$primaryCurrency->code]));}}if (!$hasCurrency) {-// Log::debug(sprintf('[e] Also set start balance in %s', $primaryCurrency->code));+ // Log::debug(sprintf('[e] Also set start balance in %s', $primaryCurrency->code));$startBalance[$primaryCurrency->code] = (string) ('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance);}$currencies = [$currency->id => $currency, $primaryCurrency->id => $primaryCurrency];$balances[$formatted] = $startBalance;-// Log::debug('Final start balance: ', $startBalance);+ // Log::debug('Final start balance: ', $startBalance);// 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')));+ // 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')@@ -537,7 +541,7 @@ class Steam/** @var TransactionCurrency $entryCurrency */$entryCurrency = $currencies[$entry->transaction_currency_id];-// Log::debug(sprintf('Processing transaction(s) on moment %s', $carbon->format('Y-m-d H:i:s')));+ // 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';@@ -559,10 +563,11 @@ class Steam}// add to final array.$balances[$carbonKey] = $currentBalance;-// Log::debug(sprintf('Updated entry [%s]', $carbonKey), $currentBalance);++ // Log::debug(sprintf('Updated entry [%s]', $carbonKey), $currentBalance);}$cache->store($balances);-// Log::debug('End of method finalAccountBalanceInRange');+ // Log::debug('End of method finalAccountBalanceInRange');return $balances;}@@ -579,7 +584,7 @@ class Steamif (!str_contains($value, 'E')) {return $value;}-// Log::debug(sprintf('Floatalizing %s', $value));+ // Log::debug(sprintf('Floatalizing %s', $value));$number = substr($value, 0, (int) strpos($value, 'E'));if (str_contains($number, '.')) {@@ -758,10 +763,8 @@ class Steam*/public function getSafePreviousUrl(): string{- $res = $this->getSafeUrl(session()->previousUrl() ?? route('index'), route('index'));-// Log::debug(sprintf('getSafePreviousUrl: "%s"', $res));-- return $res;+ return $this->getSafeUrl(session()->previousUrl() ?? route('index'), route('index'));+ // Log::debug(sprintf('getSafePreviousUrl: "%s"', $res));}/**@@ -892,7 +895,8 @@ class Steam$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));++ // Log::debug(sprintf('Convert %s %s to %s %s', $currency->code, $amount, $primary->code, $current));}$total = bcadd((string) $current, $total);}diff --git a/composer.lock b/composer.lockindex 876947996c..eca5294e59 100644--- a/composer.lock+++ b/composer.lock@@ -189,16 +189,16 @@},{"name": "carbonphp/carbon-doctrine-types",- "version": "3.2.0",+ "version": "3.2.1","source": {"type": "git","url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",- "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"+ "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",- "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",+ "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc",+ "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc","shasum": ""},"require": {@@ -213,6 +213,11 @@"phpunit/phpunit": "^10.3"},"type": "library",+ "extra": {+ "branch-alias": {+ "dev-main": "3.x-dev"+ }+ },"autoload": {"psr-4": {"Carbon\\Doctrine\\": "src/Carbon/Doctrine/"@@ -238,7 +243,7 @@],"support": {"issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",- "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"+ "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.1"},"funding": [{@@ -254,7 +259,7 @@"type": "tidelift"}],- "time": "2024-02-09T16:56:22+00:00"+ "time": "2026-09-06T14:11:38+00:00"},{"name": "clue/stream-filter",diff --git a/config/firefly.php b/config/firefly.phpindex c93ebdda95..763b819192 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.// see cer.php for exchange rates feature flag.],-'version' => 'develop/2026-09-06',-'build_time' => 1788701399,+'version' => 'develop/2026-09-07',+'build_time' => 1788750859,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.