Skip to content

Firefly III: a personal finances manager

🤖 Auto commit for release 'develop' on 2026-10-10

JC51e20b4fcfde9
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php
index 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.php
index 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.php
index 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 Controller
if ($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.php
index 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 Controller
if (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.php
index 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.php
index ca2d5f0255..cb2ef13f38 100644
--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@@ -133,13 +133,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));
@@ -229,13 +223,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/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php
index 0b3e49561b..9535b7404c 100644
--- a/app/Repositories/Currency/CurrencyRepository.php
+++ b/app/Repositories/Currency/CurrencyRepository.php
@@ -402,10 +402,12 @@ class CurrencyRepository implements CurrencyRepositoryInterface, UserGroupInterf
{
$query = TransactionCurrency::query()->orderBy('code', 'ASC');
if ('' !== $search) {
- $query->where(function(Builder $q1) use ($search) {
- $q1->whereLike('code', sprintf('%%%s%%', $search))
+ $query->where(function (Builder $q1) use ($search): void {
+ $q1
+ ->whereLike('code', sprintf('%%%s%%', $search))
->orWhereLike('name', sprintf('%%%s%%', $search))
- ->orWhereLike('symbol', sprintf('%%%s%%', $search));
+ ->orWhereLike('symbol', sprintf('%%%s%%', $search))
+ ;
});
}
diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.php
index 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.php
index 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/changelog.md b/changelog.md
index 3a0ecc6768..038cf8d565 100644
--- a/changelog.md
+++ b/changelog.md
@@ -22,7 +22,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- [Issue 12968](https://github.com/firefly-iii/firefly-iii/issues/12968) (Report option Income/Outcome Account show multiple duplicate account in the "Select Account List") reported by @no-coders
- [Issue 12973](https://github.com/firefly-iii/firefly-iii/issues/12973) (Text on secondary buttons is hard to read in light theme) reported by @Tommy78649
- [Issue 12978](https://github.com/firefly-iii/firefly-iii/issues/12978) (When making an internal transfer between asset accounts, amount shows a minus sign on both accounts) reported by @rdjong80
-- [Issue 12979](https://github.com/firefly-iii/firefly-iii/issues/12979) ([Translation/UI] Inconsistent French apostrophe ("aujourd'hui" vs "aujourd'hui") on account charts) reported by @carlgregoire
+- [Issue 12979](https://github.com/firefly-iii/firefly-iii/issues/12979) ([Translation/UI] Inconsistent French apostrophe ("aujourd'hui" vs "aujourd&[Issue 39](https://github.com/firefly-iii/firefly-iii/issues/39) (Allow users to create transactions with other currencies) reported by @JC5;hui") on account charts) reported by @carlgregoire
- [Issue 12980](https://github.com/firefly-iii/firefly-iii/issues/12980) (Display amounts in your primary currency not doing exchange rate properly in account page) reported by @kyalpha313
- [Issue 12983](https://github.com/firefly-iii/firefly-iii/issues/12983) (links to inactive accounts not working after disabling all liabilities accounts) reported by @kyalpha313
- [Issue 12988](https://github.com/firefly-iii/firefly-iii/issues/12988) (Auto-completion in Rules triggers offers phantom selectors) reported by @ppslim
@@ -31,7 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- [Issue 12992](https://github.com/firefly-iii/firefly-iii/issues/12992) ("Reset form after submission" doesn't reset tags) reported by @Tommy78649
- [Issue 13003](https://github.com/firefly-iii/firefly-iii/issues/13003) (Firefly stopped sync exchange rates) reported by @Toshik1978
- [Issue 13006](https://github.com/firefly-iii/firefly-iii/issues/13006) (No "Expires At" date for all my PATs) reported by @Toshik1978
-- #13016
+- [Issue 13016](https://github.com/firefly-iii/firefly-iii/issues/13016) (Test group rules endpoint always returns no results unless optional accounts argument is passed) reported by @oerkel47
### Security
diff --git a/composer.lock b/composer.lock
index d81fc4742a..f1f674d49d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9911,12 +9911,12 @@
"version": "v5.7.0",
"source": {
"type": "git",
- "url": "https://github.com/vlucas/phpdotenv.git",
+ "url": "https://github.com/phpdotenv/phpdotenv.git",
"reference": "301c07936b16d88628b126b01d082ba153cf4c40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/301c07936b16d88628b126b01d082ba153cf4c40",
+ "url": "https://api.github.com/repos/phpdotenv/phpdotenv/zipball/301c07936b16d88628b126b01d082ba153cf4c40",
"reference": "301c07936b16d88628b126b01d082ba153cf4c40",
"shasum": ""
},
@@ -10215,16 +10215,16 @@
},
{
"name": "carthage-software/mago",
- "version": "1.54.0",
+ "version": "1.55.0",
"source": {
"type": "git",
"url": "https://github.com/carthage-software/mago.git",
- "reference": "9a86b1847d12f4f2fe073ecbb2614eb7b2b1614c"
+ "reference": "2487de2818449cab3b7fde26be7b00d3a63f6a61"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/carthage-software/mago/zipball/9a86b1847d12f4f2fe073ecbb2614eb7b2b1614c",
- "reference": "9a86b1847d12f4f2fe073ecbb2614eb7b2b1614c",
+ "url": "https://api.github.com/repos/carthage-software/mago/zipball/2487de2818449cab3b7fde26be7b00d3a63f6a61",
+ "reference": "2487de2818449cab3b7fde26be7b00d3a63f6a61",
"shasum": ""
},
"require": {
@@ -10266,7 +10266,7 @@
],
"support": {
"issues": "https://github.com/carthage-software/mago/issues",
- "source": "https://github.com/carthage-software/mago/tree/1.54.0"
+ "source": "https://github.com/carthage-software/mago/tree/1.55.0"
},
"funding": [
{
@@ -10274,7 +10274,7 @@
"type": "github"
}
],
- "time": "2026-10-08T18:27:19+00:00"
+ "time": "2026-10-09T22:43:14+00:00"
},
{
"name": "cloudcreativity/json-api-testing",
diff --git a/config/firefly.php b/config/firefly.php
index 2bd808059c..f6065b9115 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-10-09',
-'build_time' => 1791555166,
+'version' => 'develop/2026-10-10',
+'build_time' => 1791608989,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.