Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-18
JC5cfc208580c72
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/Factory/AccountFactory.php b/app/Factory/AccountFactory.phpindex 3660a964b0..620fc0bea1 100644--- a/app/Factory/AccountFactory.php+++ b/app/Factory/AccountFactory.php@@ -135,7 +135,7 @@ class AccountFactorypublic function setUser(User $user): void{- $this->user = $user;+ $this->user = $user;$this->userGroup = $user->userGroup;$this->accountRepository->setUser($user);$this->accountRepository->setUserGroup($this->userGroup);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 52c6f900e3..65429e59c1 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -272,10 +272,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/Models/Account.php b/app/Models/Account.phpindex d42334f47a..53e97d0c8c 100644--- a/app/Models/Account.php+++ b/app/Models/Account.php@@ -46,7 +46,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;/*** @property AccountType $accountType* @property User $user- * @property UserGroup $userGroup+ * @property UserGroup $userGroup*/#[ObservedBy([DeletedAccountObserver::class])]class Account extends Modeldiff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.phpindex efa1dd1948..06a76e13ea 100644--- a/app/Services/Internal/Update/AccountUpdateService.php+++ b/app/Services/Internal/Update/AccountUpdateService.php@@ -68,7 +68,7 @@ class AccountUpdateServicepublic function setUser(User $user): void{- $this->user = $user;+ $this->user = $user;$this->userGroup = $user->userGroup;}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/Search/AccountSearch.php b/app/Support/Search/AccountSearch.phpindex 6a5fba4529..3507ce54fe 100644--- a/app/Support/Search/AccountSearch.php+++ b/app/Support/Search/AccountSearch.php@@ -29,6 +29,7 @@ use FireflyIII\User;use Illuminate\Contracts\Auth\Authenticatable;use Illuminate\Database\Eloquent\Builder;use Illuminate\Support\Collection;+use function Safe\json_encode;/**@@ -36,20 +37,20 @@ use function Safe\json_encode;*/class AccountSearch implements GenericSearchInterface{- public const string SEARCH_ALL = 'all';+ public const string SEARCH_ALL = 'all';- public const string SEARCH_IBAN = 'iban';+ public const string SEARCH_IBAN = 'iban';- public const string SEARCH_ID = 'id';+ public const string SEARCH_ID = 'id';- public const string SEARCH_NAME = 'name';+ public const string SEARCH_NAME = 'name';public const string SEARCH_NUMBER = 'number';- private string $field;- private string $query;- private array $types = [];- private User $user;+ private string $field;+ private string $query;+ private array $types = [];+ private User $user;private UserGroup $userGroup;public function search(): Collection@@ -83,7 +84,7 @@ class AccountSearch implements GenericSearchInterfacebreak;case self::SEARCH_ID:- $searchQuery->where('accounts.id', '=', (int)$originalQuery);+ $searchQuery->where('accounts.id', '=', (int) $originalQuery);break;@@ -126,7 +127,7 @@ class AccountSearch implements GenericSearchInterface$this->types = $types;}- public function setUser(Authenticatable | User | null $user): void+ public function setUser(Authenticatable|User|null $user): void{if ($user instanceof User) {$this->user = $user;diff --git a/changelog.md b/changelog.mdindex 12adb9a07d..83cee898b9 100644--- a/changelog.md+++ b/changelog.md@@ -25,7 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).### Fixed-- #12819+- [Issue 12819](https://github.com/firefly-iii/firefly-iii/issues/12819) (Suscriptions with attachement in show page returns 500 error page) reported by @jsaneu### Securitydiff --git a/config/firefly.php b/config/firefly.phpindex 84f6661dd6..95c5fbf407 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' => '6.7.3',-'build_time' => 1789733447,+'version' => 'develop/2026-09-18',+'build_time' => 1789753876,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.