Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-07-01
JC55907d877e055
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/Exceptions/Handler.php b/app/Exceptions/Handler.phpindex b09fbca8dd..8d4cf94d88 100644--- a/app/Exceptions/Handler.php+++ b/app/Exceptions/Handler.php@@ -206,7 +206,6 @@ class Handler extends ExceptionHandlerreturn response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 429);}-if ($e instanceof FireflyException || $e instanceof ErrorException || $e instanceof OAuthServerException) {Log::debug('Return Firefly III error view.');$isDebug = config('app.debug');@@ -214,7 +213,6 @@ class Handler extends ExceptionHandlerreturn response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 500);}-Log::debug(sprintf('Error "%s" has no Firefly III treatment, parent will handle.', $e::class));Log::error($e->getMessage());diff --git a/app/Exceptions/LockedOutException.php b/app/Exceptions/LockedOutException.phpindex 4608bef144..6a698f3bc1 100644--- a/app/Exceptions/LockedOutException.php+++ b/app/Exceptions/LockedOutException.php@@ -1,4 +1,5 @@<?php+/** LockedOutException.php* Copyright (c) 2026 [email protected]@@ -23,7 +24,4 @@ declare(strict_types=1);namespace FireflyIII\Exceptions;-class LockedOutException extends FireflyException-{--}+class LockedOutException extends FireflyException {}diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.phpindex c982bff0e1..3241e87126 100644--- a/app/Http/Controllers/Auth/LoginController.php+++ b/app/Http/Controllers/Auth/LoginController.php@@ -27,7 +27,6 @@ use Carbon\Carbon;use FireflyIII\Events\Security\System\UnknownUserTriedLogin;use FireflyIII\Events\Security\User\UserFailedLoginAttempt;use FireflyIII\Events\Security\User\UserSuccessfullyLoggedIn;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Exceptions\LockedOutException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Providers\RouteServiceProvider;@@ -102,9 +101,10 @@ final class LoginController extends ControllerLog::error(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));$this->fireLockoutEvent($request);$seconds = $this->limiter()->availableIn($this->throttleKey($request));- $message = (string) trans('auth.throttle', ['seconds' => $seconds, 'minutes' => ceil($seconds / 60),]);+ $message = (string) trans('auth.throttle', ['seconds' => $seconds, 'minutes' => ceil($seconds / 60)]);Log::error(sprintf('Will SLEEP for %d second(s).', $seconds));sleep($seconds);+throw new LockedOutException($message);}diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.phpindex 2009369ae0..07947c2c85 100644--- a/app/Http/Controllers/Bill/IndexController.php+++ b/app/Http/Controllers/Bill/IndexController.php@@ -255,7 +255,10 @@ final class IndexController extends Controllerif (count($bill['paid_dates']) < count($bill['pay_dates'])) {$count = count($bill['pay_dates']) - count($bill['paid_dates']);if ($count > 0) {- $avg = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');+ $avg = bcdiv(+ bcadd((string) $bill['amount_min'], (string) $bill['amount_max']),+ '2'+ );$avg = bcmul($avg, (string) $count);$sums[$groupOrder][$currencyId]['total_left_to_pay'] = bcadd($sums[$groupOrder][$currencyId]['total_left_to_pay'], $avg);Log::debug(diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex 9632996690..b263d702a2 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 674f77fbee..750a88e633 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/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/app/Support/Navigation.php b/app/Support/Navigation.phpindex 3b958cf596..f6c391ce35 100644--- a/app/Support/Navigation.php+++ b/app/Support/Navigation.php@@ -347,9 +347,9 @@ class Navigationif (array_key_exists($repeatFreq, $modifierMap)) {$currentEnd->{$function}($modifierMap[$repeatFreq])->milli(0);// php stan: always do subDay.- //if (in_array($repeatFreq, $subDay, true)) {- $currentEnd->subDay();- //}+ // if (in_array($repeatFreq, $subDay, true)) {+ $currentEnd->subDay();+ // }$currentEnd->endOfDay()->milli(0);// add sanity check.diff --git a/composer.lock b/composer.lockindex 9d0f37d101..1af5a9ec92 100644--- a/composer.lock+++ b/composer.lock@@ -11561,11 +11561,11 @@},{"name": "phpstan/phpstan",- "version": "2.2.2",+ "version": "2.2.3","dist": {"type": "zip",- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5cc34d491a90e79c216d824f60fe21fd4d93bd6",- "reference": "e5cc34d491a90e79c216d824f60fe21fd4d93bd6",+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4048833dd47b377287818841877fb3087289509c",+ "reference": "4048833dd47b377287818841877fb3087289509c","shasum": ""},"require": {@@ -11621,7 +11621,7 @@"type": "github"}],- "time": "2026-06-05T09:00:01+00:00"+ "time": "2026-06-30T21:15:26+00:00"},{"name": "phpstan/phpstan-deprecation-rules",diff --git a/config/firefly.php b/config/firefly.phpindex ff19a4980d..afd9644b67 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-06-30',-'build_time' => 1782840949,+'version' => 'develop/2026-07-01',+'build_time' => 1782881975,'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 e4903feb1f..69e4be3e74 100644--- a/package-lock.json+++ b/package-lock.json@@ -5344,9 +5344,9 @@"license": "MIT"},"node_modules/electron-to-chromium": {- "version": "1.5.382",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.382.tgz",- "integrity": "sha512-8ETaWbV6SZOrno+G93Ffd9ENsMtetqdnqj4nlfxFW90Sm5GgnuV28Kf62hqQVD6VUgzm7qFQKsTsAPmeUiU3Ug==",+ "version": "1.5.383",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.383.tgz",+ "integrity": "sha512-I2484/KkAvl8lm9VyjH2JnbOIV0d/UCqT7gbzs6l+o6Vmn9wgB66uVcKX+Vk6HrXtY6fbWTOEXuv8waDTuFNCw==","dev": true,"license": "ISC"},