Skip to content

Firefly III: a personal finances manager

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

JC57e44ea98af60
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php
index 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.php
index 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.php
index 2edb4f5531..d461374baa 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -198,7 +198,13 @@ 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 65429e59c1..52c6f900e3 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -272,7 +272,10 @@ 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 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.php
index 476da65ac3..affea656a0 100644
--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@@ -132,7 +132,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));
@@ -222,7 +228,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.php
index 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.php
index 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.lock
index 380addb911..de5f142528 100644
--- a/composer.lock
+++ b/composer.lock
@@ -10215,16 +10215,16 @@
},
{
"name": "carthage-software/mago",
- "version": "1.51.0",
+ "version": "1.51.1",
"source": {
"type": "git",
"url": "https://github.com/carthage-software/mago.git",
- "reference": "9a62f0a1829490dcff31f62808589f7ab86779b5"
+ "reference": "59c9265b5b79c2174b921b3b9ef6b933edcad939"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/carthage-software/mago/zipball/9a62f0a1829490dcff31f62808589f7ab86779b5",
- "reference": "9a62f0a1829490dcff31f62808589f7ab86779b5",
+ "url": "https://api.github.com/repos/carthage-software/mago/zipball/59c9265b5b79c2174b921b3b9ef6b933edcad939",
+ "reference": "59c9265b5b79c2174b921b3b9ef6b933edcad939",
"shasum": ""
},
"require": {
@@ -10266,7 +10266,7 @@
],
"support": {
"issues": "https://github.com/carthage-software/mago/issues",
- "source": "https://github.com/carthage-software/mago/tree/1.51.0"
+ "source": "https://github.com/carthage-software/mago/tree/1.51.1"
},
"funding": [
{
@@ -10274,7 +10274,7 @@
"type": "github"
}
],
- "time": "2026-10-01T20:37:34+00:00"
+ "time": "2026-10-03T03:54:49+00:00"
},
{
"name": "cloudcreativity/json-api-testing",
@@ -12044,23 +12044,23 @@
},
{
"name": "phpunit/php-text-template",
- "version": "6.0.0",
+ "version": "6.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "a47af19f93f76aa3368303d752aa5272ca3299f4"
+ "reference": "97107691cb2b6c743b5e0c44be19e983cb337a02"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/a47af19f93f76aa3368303d752aa5272ca3299f4",
- "reference": "a47af19f93f76aa3368303d752aa5272ca3299f4",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/97107691cb2b6c743b5e0c44be19e983cb337a02",
+ "reference": "97107691cb2b6c743b5e0c44be19e983cb337a02",
"shasum": ""
},
"require": {
"php": ">=8.4"
},
"require-dev": {
- "phpunit/phpunit": "^13.0"
+ "phpunit/phpunit": "^13.3.6"
},
"type": "library",
"extra": {
@@ -12092,7 +12092,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-text-template/issues",
"security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
- "source": "https://github.com/sebastianbergmann/php-text-template/tree/6.0.0"
+ "source": "https://github.com/sebastianbergmann/php-text-template/tree/6.0.1"
},
"funding": [
{
@@ -12112,7 +12112,7 @@
"type": "tidelift"
}
],
- "time": "2026-02-06T04:36:37+00:00"
+ "time": "2026-10-03T04:54:24+00:00"
},
{
"name": "phpunit/php-timer",
diff --git a/config/firefly.php b/config/firefly.php
index 7fb0fb1e14..b023de7d88 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-10-03',
-'build_time' => 1790991757,
+'build_time' => 1791008235,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.
diff --git a/resources/assets/v3/js/form/get-expected-account-types.js b/resources/assets/v3/js/form/get-expected-account-types.js
index d5190a2d58..29f22ea472 100644
--- a/resources/assets/v3/js/form/get-expected-account-types.js
+++ b/resources/assets/v3/js/form/get-expected-account-types.js
@@ -20,7 +20,14 @@
export default function getExpectedAccountTypes(transactionType, sourceType, destinationType) {
transactionType = transactionType.toLowerCase();
- console.log('getExpectedAccountTypes: transactionType=' + transactionType + ', sourceType=' + sourceType + ', destinationType=' + destinationType);
+ console.log(
+ "getExpectedAccountTypes: transactionType=" +
+ transactionType +
+ ", sourceType=" +
+ sourceType +
+ ", destinationType=" +
+ destinationType,
+ );
// is withdrawal and source is asset? limit destination types
if ("withdrawal" === transactionType && "Asset account" === sourceType) {
diff --git a/resources/assets/v3/js/pages/transactions/shared/add-autocomplete.js b/resources/assets/v3/js/pages/transactions/shared/add-autocomplete.js
index 644a412b00..82c148a923 100644
--- a/resources/assets/v3/js/pages/transactions/shared/add-autocomplete.js
+++ b/resources/assets/v3/js/pages/transactions/shared/add-autocomplete.js
@@ -54,8 +54,8 @@ export function addAllAutocompleteToForm() {
// the available account types may be limited.
let transactionType = this.groupProperties.transactionType;
- let sourceType = this.entries[0].source_account.type ?? 'unknown';
- let destinationType = this.entries[0].destination_account.type ?? 'unknown';
+ let sourceType = this.entries[0].source_account.type ?? "unknown";
+ let destinationType = this.entries[0].destination_account.type ?? "unknown";
filters.destination = getExpectedAccountTypes(transactionType, sourceType, destinationType);
console.log("Filters for autocomplete: ", filters);
@@ -143,7 +143,7 @@ export function addAllAutocompleteToForm() {
}
export function addAutocomplete(options) {
- console.log('addAutocomplete("'+options.serverUrl+'")');
+ console.log('addAutocomplete("' + options.serverUrl + '")');
const params = {
server: options.serverUrl,
serverParams: {},
@@ -165,7 +165,7 @@ export function addAutocomplete(options) {
liveServer: true,
};
if (typeof options.account_types !== "undefined" && options.account_types.length > 0) {
- console.log('Add account types');
+ console.log("Add account types");
params.serverParams["types"] = options.account_types;
}
if (typeof options.onRenderItem !== "undefined" && null !== options.onRenderItem) {
diff --git a/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js b/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js
index 236227a71b..578e40d102 100644
--- a/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js
+++ b/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js
@@ -22,7 +22,6 @@
import Autocomplete from "bootstrap5-autocomplete";
import getExpectedAccountTypes from "../../../form/get-expected-account-types.js";
-
export function disableSplitInputs() {
let isTransferOrWithdrawal =
"transfer" === this.groupProperties.transactionType || "withdrawal" === this.groupProperties.transactionType;
diff --git a/resources/assets/v3/js/pages/transactions/shared/show-message-or-redirect.js b/resources/assets/v3/js/pages/transactions/shared/show-message-or-redirect.js
index 2588cbe4db..9a5bf81a22 100644
--- a/resources/assets/v3/js/pages/transactions/shared/show-message-or-redirect.js
+++ b/resources/assets/v3/js/pages/transactions/shared/show-message-or-redirect.js
@@ -85,8 +85,8 @@ export function showMessageOrRedirectUser(sourceOfCall) {
}
}
if ("" !== parts.search) {
- if(parts.search.includes('&')) {
- parts.search = parts.search.replaceAll('&', '&');
+ if (parts.search.includes("&")) {
+ parts.search = parts.search.replaceAll("&", "&");
}
let obj = new URLSearchParams(parts.search);
let pathName = parts.pathname; // we redirect here!
diff --git a/resources/assets/v3/sass/app.scss b/resources/assets/v3/sass/app.scss
index 1d89dc4abf..48a9e28d41 100644
--- a/resources/assets/v3/sass/app.scss
+++ b/resources/assets/v3/sass/app.scss
@@ -53,7 +53,7 @@ $primary: #1e6581; // original
// btn-outline-secondary
.btn-outline-secondary {
- color:rgb(222, 226, 230);
+ color: rgb(222, 226, 230);
}
// for sortable tables