Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-08-25
JC505a78c384573
diff --git a/.ci/php-cs-fixer/composer.lock b/.ci/php-cs-fixer/composer.lockindex 2224bac211..228afad1c6 100644--- a/.ci/php-cs-fixer/composer.lock+++ b/.ci/php-cs-fixer/composer.lock@@ -1251,24 +1251,24 @@},{"name": "sebastian/diff",- "version": "9.0.0",+ "version": "9.0.1","source": {"type": "git","url": "https://github.com/sebastianbergmann/diff.git",- "reference": "a3fb6a298a265ff487a91bbea46e03cd01dbb226"+ "reference": "a2df6626c1baf31d5a88674882a3072f151b5a26"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a3fb6a298a265ff487a91bbea46e03cd01dbb226",- "reference": "a3fb6a298a265ff487a91bbea46e03cd01dbb226",+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a2df6626c1baf31d5a88674882a3072f151b5a26",+ "reference": "a2df6626c1baf31d5a88674882a3072f151b5a26","shasum": ""},"require": {"php": ">=8.4"},"require-dev": {- "phpunit/phpunit": "^13.2",- "symfony/process": "^7.4.13"+ "phpunit/phpunit": "^13.3.1",+ "symfony/process": "^7.4.17"},"type": "library","extra": {@@ -1306,7 +1306,7 @@"support": {"issues": "https://github.com/sebastianbergmann/diff/issues","security": "https://github.com/sebastianbergmann/diff/security/policy",- "source": "https://github.com/sebastianbergmann/diff/tree/9.0.0"+ "source": "https://github.com/sebastianbergmann/diff/tree/9.0.1"},"funding": [{@@ -1326,7 +1326,7 @@"type": "tidelift"}],- "time": "2026-06-05T03:04:51+00:00"+ "time": "2026-08-25T15:38:55+00:00"},{"name": "symfony/console",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 04d75cd738..de7337738f 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 39c60c3b9a..ceede3cd1c 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -135,13 +135,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));@@ -231,13 +225,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/composer.lock b/composer.lockindex 07ec887115..250088bb18 100644--- a/composer.lock+++ b/composer.lock@@ -1885,16 +1885,16 @@},{"name": "laravel/framework",- "version": "v13.26.1",+ "version": "v13.27.0","source": {"type": "git","url": "https://github.com/laravel/framework.git",- "reference": "e4a1bc52ef551d52e60244bb004256d6861da7ab"+ "reference": "f3fa8f3591fa2e8f0b7dedfffc3fc324d2aad31b"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/framework/zipball/e4a1bc52ef551d52e60244bb004256d6861da7ab",- "reference": "e4a1bc52ef551d52e60244bb004256d6861da7ab",+ "url": "https://api.github.com/repos/laravel/framework/zipball/f3fa8f3591fa2e8f0b7dedfffc3fc324d2aad31b",+ "reference": "f3fa8f3591fa2e8f0b7dedfffc3fc324d2aad31b","shasum": ""},"require": {@@ -2016,7 +2016,7 @@"phpstan/phpstan": "^2.0","phpunit/phpunit": "^11.5.50 || ^12.5.8 || ^13.0.3","predis/predis": "^2.3 || ^3.0",- "rector/rector": "^2.3",+ "rector/rector": "2.6.3","resend/resend-php": "^1.0","symfony/cache": "^7.4.0 || ^8.0.0","symfony/http-client": "^7.4.0 || ^8.0.0",@@ -2108,7 +2108,7 @@"issues": "https://github.com/laravel/framework/issues","source": "https://github.com/laravel/framework"},- "time": "2026-08-18T20:31:28+00:00"+ "time": "2026-08-25T14:16:00+00:00"},{"name": "laravel/passport",@@ -2187,16 +2187,16 @@},{"name": "laravel/prompts",- "version": "v0.3.23",+ "version": "v0.3.24","source": {"type": "git","url": "https://github.com/laravel/prompts.git",- "reference": "b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221"+ "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/prompts/zipball/b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221",- "reference": "b7b4c35e5bc47450f6b6238c6cc9c47ba19b2221",+ "url": "https://api.github.com/repos/laravel/prompts/zipball/5d3cdef29e93ca3b62b1871359db3078cd99908b",+ "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b","shasum": ""},"require": {@@ -2240,22 +2240,22 @@"description": "Add beautiful and user-friendly forms to your command-line applications.","support": {"issues": "https://github.com/laravel/prompts/issues",- "source": "https://github.com/laravel/prompts/tree/v0.3.23"+ "source": "https://github.com/laravel/prompts/tree/v0.3.24"},- "time": "2026-08-11T18:58:24+00:00"+ "time": "2026-08-20T12:55:36+00:00"},{"name": "laravel/serializable-closure",- "version": "v2.0.15",+ "version": "v2.0.16","source": {"type": "git","url": "https://github.com/laravel/serializable-closure.git",- "reference": "dccd8bcb851bb03fcc005df650b708b57cc52661"+ "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/dccd8bcb851bb03fcc005df650b708b57cc52661",- "reference": "dccd8bcb851bb03fcc005df650b708b57cc52661",+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",+ "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed","shasum": ""},"require": {@@ -2303,7 +2303,7 @@"issues": "https://github.com/laravel/serializable-closure/issues","source": "https://github.com/laravel/serializable-closure"},- "time": "2026-07-21T16:49:22+00:00"+ "time": "2026-08-18T20:28:54+00:00"},{"name": "laravel/slack-notification-channel",@@ -11761,23 +11761,23 @@},{"name": "phpunit/php-file-iterator",- "version": "7.0.1",+ "version": "7.0.2","source": {"type": "git","url": "https://github.com/sebastianbergmann/php-file-iterator.git",- "reference": "3ccaa29123548190af12fee7af078dcd7f3ddfab"+ "reference": "9bb4e6c58b62c1e043be995c66abec7c97307aae"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3ccaa29123548190af12fee7af078dcd7f3ddfab",- "reference": "3ccaa29123548190af12fee7af078dcd7f3ddfab",+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/9bb4e6c58b62c1e043be995c66abec7c97307aae",+ "reference": "9bb4e6c58b62c1e043be995c66abec7c97307aae","shasum": ""},"require": {"php": ">=8.4"},"require-dev": {- "phpunit/phpunit": "^13.3.0"+ "phpunit/phpunit": "^13.3.1"},"type": "library","extra": {@@ -11810,7 +11810,7 @@"support": {"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues","security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",- "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/7.0.1"+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/7.0.2"},"funding": [{@@ -11830,7 +11830,7 @@"type": "tidelift"}],- "time": "2026-08-10T06:43:12+00:00"+ "time": "2026-08-25T14:47:43+00:00"},{"name": "phpunit/php-invoker",@@ -12509,24 +12509,24 @@},{"name": "sebastian/diff",- "version": "9.0.0",+ "version": "9.0.1","source": {"type": "git","url": "https://github.com/sebastianbergmann/diff.git",- "reference": "a3fb6a298a265ff487a91bbea46e03cd01dbb226"+ "reference": "a2df6626c1baf31d5a88674882a3072f151b5a26"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a3fb6a298a265ff487a91bbea46e03cd01dbb226",- "reference": "a3fb6a298a265ff487a91bbea46e03cd01dbb226",+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a2df6626c1baf31d5a88674882a3072f151b5a26",+ "reference": "a2df6626c1baf31d5a88674882a3072f151b5a26","shasum": ""},"require": {"php": ">=8.4"},"require-dev": {- "phpunit/phpunit": "^13.2",- "symfony/process": "^7.4.13"+ "phpunit/phpunit": "^13.3.1",+ "symfony/process": "^7.4.17"},"type": "library","extra": {@@ -12564,7 +12564,7 @@"support": {"issues": "https://github.com/sebastianbergmann/diff/issues","security": "https://github.com/sebastianbergmann/diff/security/policy",- "source": "https://github.com/sebastianbergmann/diff/tree/9.0.0"+ "source": "https://github.com/sebastianbergmann/diff/tree/9.0.1"},"funding": [{@@ -12584,7 +12584,7 @@"type": "tidelift"}],- "time": "2026-06-05T03:04:51+00:00"+ "time": "2026-08-25T15:38:55+00:00"},{"name": "sebastian/environment",diff --git a/config/firefly.php b/config/firefly.phpindex 6938f2cf43..7a4498d8ac 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2026-08-25',-'build_time' => 1787642072,+'build_time' => 1787672610,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.