Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-08-07
JC5b2934b86f48d
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex df99eef909..94be2ae461 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,7 +158,10 @@ 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 f92a7aa9f0..b7b85fd376 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,7 +155,10 @@ 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 de7337738f..04d75cd738 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,7 +198,13 @@ 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 215ebbd484..d40d4432a3 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -284,7 +284,10 @@ 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 ad724137dc..f4b32fe5c5 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,7 +539,13 @@ 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/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.phpindex c81ce9f3cd..8372500c41 100644--- a/app/Http/Controllers/Report/OperationsController.php+++ b/app/Http/Controllers/Report/OperationsController.php@@ -100,7 +100,7 @@ final class OperationsController extends Controllerpublic function income(Collection $accounts, Carbon $start, Carbon $end): string{// chart properties for cache:- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty('income-report');@@ -108,8 +108,8 @@ final class OperationsController extends Controllerif ($cache->has()) {return $cache->get();}- $report = $this->tasker->getIncomeReport($start, $end, $accounts);- $type = 'income-entry';+ $report = $this->tasker->getIncomeReport($start, $end, $accounts);+ $type = 'income-entry';$incomeTopLength = count($report['accounts']);try {diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex 93cf5e9364..d61661dd50 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -122,7 +122,13 @@ 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));@@ -212,7 +218,13 @@ 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 a3a940b1ba..a507156873 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,7 +222,14 @@ 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 d0c09bf027..2428353cb0 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,7 +354,11 @@ 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 9b216ddd34..54951f720b 100644--- a/composer.lock+++ b/composer.lock@@ -11652,16 +11652,16 @@},{"name": "phpunit/php-code-coverage",- "version": "14.2.4",+ "version": "14.3.0","source": {"type": "git","url": "https://github.com/sebastianbergmann/php-code-coverage.git",- "reference": "048a5c12bdb4580f4767ce2761793a16b170fbe4"+ "reference": "060a5c93e81afb01e97dbe8930a5d0c9bd46e54e"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/048a5c12bdb4580f4767ce2761793a16b170fbe4",- "reference": "048a5c12bdb4580f4767ce2761793a16b170fbe4",+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/060a5c93e81afb01e97dbe8930a5d0c9bd46e54e",+ "reference": "060a5c93e81afb01e97dbe8930a5d0c9bd46e54e","shasum": ""},"require": {@@ -11675,12 +11675,12 @@"sebastian/complexity": "^6.0","sebastian/environment": "^9.3.2","sebastian/git-state": "^1.0",- "sebastian/lines-of-code": "^5.0.1",+ "sebastian/lines-of-code": "^5.0.2","sebastian/version": "^7.0","theseer/tokenizer": "^2.0.1"},"require-dev": {- "phpunit/phpunit": "^13.2.2"+ "phpunit/phpunit": "^13.3"},"suggest": {"ext-pcov": "PHP extension that provides line coverage",@@ -11689,7 +11689,7 @@"type": "library","extra": {"branch-alias": {- "dev-main": "14.2.x-dev"+ "dev-main": "14.3.x-dev"}},"autoload": {@@ -11718,7 +11718,7 @@"support": {"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues","security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.2.4"+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.3.0"},"funding": [{@@ -11738,7 +11738,7 @@"type": "tidelift"}],- "time": "2026-07-30T17:01:07+00:00"+ "time": "2026-08-07T07:24:15+00:00"},{"name": "phpunit/php-file-iterator",@@ -12256,16 +12256,16 @@},{"name": "sebastian/comparator",- "version": "8.3.0",+ "version": "8.4.0","source": {"type": "git","url": "https://github.com/sebastianbergmann/comparator.git",- "reference": "c025fc7604afab3f195fab7cdaf72327331af241"+ "reference": "3b070e608146cba00fd6fd1f0ffba89e5a8897fb"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c025fc7604afab3f195fab7cdaf72327331af241",- "reference": "c025fc7604afab3f195fab7cdaf72327331af241",+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/3b070e608146cba00fd6fd1f0ffba89e5a8897fb",+ "reference": "3b070e608146cba00fd6fd1f0ffba89e5a8897fb","shasum": ""},"require": {@@ -12273,10 +12273,10 @@"ext-mbstring": "*","php": ">=8.4","sebastian/diff": "^9.0",- "sebastian/exporter": "^8.1.0"+ "sebastian/exporter": "^8.2"},"require-dev": {- "phpunit/phpunit": "^13.2"+ "phpunit/phpunit": "^13.3"},"suggest": {"ext-bcmath": "For comparing BcMath\\Number objects"@@ -12284,7 +12284,7 @@"type": "library","extra": {"branch-alias": {- "dev-main": "8.3-dev"+ "dev-main": "8.4-dev"}},"autoload": {@@ -12324,7 +12324,7 @@"support": {"issues": "https://github.com/sebastianbergmann/comparator/issues","security": "https://github.com/sebastianbergmann/comparator/security/policy",- "source": "https://github.com/sebastianbergmann/comparator/tree/8.3.0"+ "source": "https://github.com/sebastianbergmann/comparator/tree/8.4.0"},"funding": [{@@ -12344,7 +12344,7 @@"type": "tidelift"}],- "time": "2026-06-05T03:06:45+00:00"+ "time": "2026-08-07T07:23:13+00:00"},{"name": "sebastian/complexity",@@ -12573,30 +12573,30 @@},{"name": "sebastian/exporter",- "version": "8.1.1",+ "version": "8.2.1","source": {"type": "git","url": "https://github.com/sebastianbergmann/exporter.git",- "reference": "cfaa77c750dcad6f44c9bac8f62ac486e1c82c26"+ "reference": "24a3b69bba4a12ab615fca9d34680c5598d9ab7a"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/cfaa77c750dcad6f44c9bac8f62ac486e1c82c26",- "reference": "cfaa77c750dcad6f44c9bac8f62ac486e1c82c26",+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/24a3b69bba4a12ab615fca9d34680c5598d9ab7a",+ "reference": "24a3b69bba4a12ab615fca9d34680c5598d9ab7a","shasum": ""},"require": {"ext-mbstring": "*","php": ">=8.4",- "sebastian/recursion-context": "^8.0"+ "sebastian/recursion-context": "^8.0.1"},"require-dev": {- "phpunit/phpunit": "^13.2.4"+ "phpunit/phpunit": "^13.3"},"type": "library","extra": {"branch-alias": {- "dev-main": "8.1-dev"+ "dev-main": "8.2-dev"}},"autoload": {@@ -12639,7 +12639,7 @@"support": {"issues": "https://github.com/sebastianbergmann/exporter/issues","security": "https://github.com/sebastianbergmann/exporter/security/policy",- "source": "https://github.com/sebastianbergmann/exporter/tree/8.1.1"+ "source": "https://github.com/sebastianbergmann/exporter/tree/8.2.1"},"funding": [{@@ -12659,7 +12659,7 @@"type": "tidelift"}],- "time": "2026-07-13T11:35:11+00:00"+ "time": "2026-08-07T07:22:06+00:00"},{"name": "sebastian/file-filter",diff --git a/config/firefly.php b/config/firefly.phpindex 441023c305..e50a2b2611 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-08-06',-'build_time' => 1785985466,+'version' => 'develop/2026-08-07',+'build_time' => 1786088084,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex 96cd0a8bf8..790fd8e4de 100644--- a/package-lock.json+++ b/package-lock.json@@ -3953,9 +3953,9 @@}},"node_modules/caniuse-lite": {- "version": "1.0.30001806",- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz",- "integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==",+ "version": "1.0.30001807",+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001807.tgz",+ "integrity": "sha512-daRXJ9EB/rdRgu7kV+TTl1YUKtlsMWblPl2sLnpg9DZae16QCegol6A1SmCE31Lm9mXC1sRWGt/krouH+/dl7Q==","dev": true,"funding": [{@@ -8066,9 +8066,9 @@}},"node_modules/node-releases": {- "version": "2.0.52",- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.52.tgz",- "integrity": "sha512-MRlTqhAfoMx/4mhEbPo3Hi02g9LJZaJkka69V6h67Cb1gjrAG0jsTE4CZX1eptNx+VCAwJmfpnDIF4P0Nh1A7A==",+ "version": "2.0.53",+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.53.tgz",+ "integrity": "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==","dev": true,"license": "MIT","engines": {@@ -8550,9 +8550,9 @@}},"node_modules/postcss": {- "version": "8.5.25",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz",- "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==",+ "version": "8.5.26",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz",+ "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==","dev": true,"funding": [{@@ -8570,7 +8570,7 @@],"license": "MIT","dependencies": {- "nanoid": "^3.3.16",+ "nanoid": "^3.3.17","picocolors": "^1.1.1","source-map-js": "^1.2.1"},@@ -9813,9 +9813,9 @@}},"node_modules/sass/node_modules/readdirp": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",- "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz",+ "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==","dev": true,"license": "MIT","engines": {@@ -10977,9 +10977,9 @@}},"node_modules/update-browserslist-db": {- "version": "1.2.3",- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",- "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.0.tgz",+ "integrity": "sha512-x/M6q3w4Ybp91CNaS4S69UnliqR3BzRpOT6LWbksjth0S/+jhfaPJsWjt/TewpT8j9eLIojUf5jr29WextHroA==","dev": true,"funding": [{@@ -11105,16 +11105,16 @@}},"node_modules/vite": {- "version": "8.2.0",- "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.0.tgz",- "integrity": "sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==",+ "version": "8.2.1",+ "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.1.tgz",+ "integrity": "sha512-EU/eS7BH3XROHh2YnBefjM6DBKA6ZeMZEYQbj7NLWg5wHYlhB8B/Mayd5XsgWq+NFYccDOTemRpdETWR6Ka/lw==","dev": true,"license": "MIT","dependencies": {"lightningcss": "^1.33.0","picomatch": "^4.0.5",- "postcss": "^8.5.23",- "rolldown": "~1.2.0",+ "postcss": "^8.5.25",+ "rolldown": "~1.2.1","tinyglobby": "^0.2.17"},"bin": {