Skip to content

Firefly III: a personal finances manager

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

JC596394382e2f3
diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.php
index 1e82a7a875..4be1a8c2f5 100644
--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php
@@ -44,9 +44,9 @@ use Override;
final class TransactionController extends Controller
{
#[Override]
- protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+ protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
private TransactionGroupRepositoryInterface $groupRepository;
- private JournalRepositoryInterface $repository;
+ private JournalRepositoryInterface $repository;
/**
* TransactionController constructor.
@@ -69,7 +69,7 @@ final class TransactionController extends Controller
public function transactions(AutocompleteTransactionApiRequest $request): JsonResponse
{
- $result = $this->repository->searchJournalDescriptions($request->attributes->get('query'), $request->attributes->get('limit'));
+ $result = $this->repository->searchJournalDescriptions($request->attributes->get('query'), $request->attributes->get('limit'));
// limit and unique
$filtered = $result->unique('description');
@@ -78,8 +78,8 @@ final class TransactionController extends Controller
/** @var TransactionJournal $journal */
foreach ($filtered as $journal) {
$array[] = [
- 'id' => (string)$journal->id,
- 'transaction_group_id' => (string)$journal->transaction_group_id,
+ 'id' => (string) $journal->id,
+ 'transaction_group_id' => (string) $journal->transaction_group_id,
'name' => $journal->description,
'description' => $journal->description,
];
@@ -94,7 +94,7 @@ final class TransactionController extends Controller
$result = new Collection();
if (is_numeric($query)) {
// search for group, not journal.
- $firstResult = $this->groupRepository->find((int)$query);
+ $firstResult = $this->groupRepository->find((int) $query);
if ($firstResult instanceof TransactionGroup) {
// group may contain multiple journals, each a result:
foreach ($firstResult->transactionJournals as $journal) {
@@ -107,14 +107,14 @@ final class TransactionController extends Controller
}
// limit and unique
- $array = [];
+ $array = [];
/** @var TransactionJournal $journal */
foreach ($result as $journal) {
$currency = Amount::getCurrencyFromJournal($journal);
$array[] = [
- 'id' => (string)$journal->id,
- 'transaction_group_id' => (string)$journal->transaction_group_id,
+ 'id' => (string) $journal->id,
+ 'transaction_group_id' => (string) $journal->transaction_group_id,
'name' => $journal->description,
'description' => $journal->description,
'date' => $journal->date,
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/Console/Commands/Upgrade/UpgradesDatabase.php b/app/Console/Commands/Upgrade/UpgradesDatabase.php
index 9a3d1a9310..e77f53c37b 100644
--- a/app/Console/Commands/Upgrade/UpgradesDatabase.php
+++ b/app/Console/Commands/Upgrade/UpgradesDatabase.php
@@ -54,21 +54,21 @@ class UpgradesDatabase extends Command
{
$this->callInitialCommands();
$commands = [
-// 'upgrade:480-transaction-identifiers',
-// 'upgrade:480-migrate-to-groups',
-// 'upgrade:480-account-currencies',
-// 'upgrade:480-transfer-currencies',
-// 'upgrade:480-currency-information',
-// 'upgrade:480-notes',
-// 'upgrade:480-attachments',
-// 'upgrade:480-bills-to-rules',
-// 'upgrade:480-budget-limit-currencies',
-// 'upgrade:480-cc-liabilities',
-// 'upgrade:480-journal-meta-data',
-// 'upgrade:480-account-meta',
-// 'upgrade:481-recurrence-meta',
-// 'upgrade:500-tag-locations',
-// 'upgrade:560-liabilities',
+ // 'upgrade:480-transaction-identifiers',
+ // 'upgrade:480-migrate-to-groups',
+ // 'upgrade:480-account-currencies',
+ // 'upgrade:480-transfer-currencies',
+ // 'upgrade:480-currency-information',
+ // 'upgrade:480-notes',
+ // 'upgrade:480-attachments',
+ // 'upgrade:480-bills-to-rules',
+ // 'upgrade:480-budget-limit-currencies',
+ // 'upgrade:480-cc-liabilities',
+ // 'upgrade:480-journal-meta-data',
+ // 'upgrade:480-account-meta',
+ // 'upgrade:481-recurrence-meta',
+ // 'upgrade:500-tag-locations',
+ // 'upgrade:560-liabilities',
'upgrade:600-liabilities',
'upgrade:550-budget-limit-periods',
'upgrade:600-rule-actions',
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 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/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php
index f4f10e33a0..e121ffda71 100644
--- a/app/Repositories/Journal/JournalRepository.php
+++ b/app/Repositories/Journal/JournalRepository.php
@@ -38,9 +38,9 @@ use FireflyIII\Services\Internal\Update\JournalUpdateService;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
-use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Collection;
use Override;
+
use function Safe\json_encode;
/**
@@ -65,9 +65,10 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
public function countByMeta(string $field, string $value, bool $includeDeleted): int
{
$search = TransactionJournalMeta::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
- ->where('name', $field)
- ->where('data', json_encode($value))
- ->where('transaction_journals.user_id', $this->user->id);
+ ->where('name', $field)
+ ->where('data', json_encode($value))
+ ->where('transaction_journals.user_id', $this->user->id)
+ ;
if ($includeDeleted) {
$search->withTrashed();
}
@@ -79,10 +80,11 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
public function countByNotes(string $value, bool $includeDeleted): int
{
$search = Note::query()
- ->where('noteable_type', TransactionJournal::class)
- ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'notes.noteable_id')
- ->where('transaction_journals.user_id', $this->user->id)
- ->where('text', 'LIKE', sprintf('%%%s%%', $value));
+ ->where('noteable_type', TransactionJournal::class)
+ ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'notes.noteable_id')
+ ->where('transaction_journals.user_id', $this->user->id)
+ ->where('text', 'LIKE', sprintf('%%%s%%', $value))
+ ;
if ($includeDeleted) {
$search->withTrashed();
}
@@ -116,9 +118,10 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
public function findByType(array $types): Collection
{
return $this->user->transactionJournals()
- ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
- ->whereIn('transaction_types.type', $types)
- ->get(['transaction_journals.*']);
+ ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+ ->whereIn('transaction_types.type', $types)
+ ->get(['transaction_journals.*'])
+ ;
}
/**
@@ -149,7 +152,7 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
}
/** @var null|Account $res */
- $res = $transaction->account;
+ $res = $transaction->account;
if (null === $res) {
throw new FireflyException('Account is unexpectedly NULL.');
}
@@ -162,7 +165,7 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
*/
public function getJournalTotal(TransactionJournal $journal): string
{
- $cache = new CacheProperties();
+ $cache = new CacheProperties();
$cache->addProperty($journal->id);
$cache->addProperty('amount-positive');
if ($cache->has()) {
@@ -171,7 +174,7 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
// saves on queries:
$amount = $journal->transactions()->where('amount', '>', 0)->get()->sum('amount');
- $amount = (string)$amount;
+ $amount = (string) $amount;
$cache->store($amount);
return $amount;
@@ -188,7 +191,7 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
/** @var null|Note $note */
$note = $link->notes()->first();
- return (string)$note?->text;
+ return (string) $note?->text;
}
/**
@@ -223,7 +226,7 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
}
/** @var null|Account $res */
- $res = $transaction->account;
+ $res = $transaction->account;
if (null === $res) {
throw new FireflyException('Account is unexpectedly NULL.');
}
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/composer.lock b/composer.lock
index 1efbb9c376..380addb911 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3640,16 +3640,16 @@
},
{
"name": "nesbot/carbon",
- "version": "3.14.1",
+ "version": "3.14.2",
"source": {
"type": "git",
"url": "https://github.com/CarbonPHP/carbon.git",
- "reference": "34e9109535165bf1d7ff17a610492372ae73a896"
+ "reference": "94cfc34887f07ab5c0efa07914c8f527544e3224"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/34e9109535165bf1d7ff17a610492372ae73a896",
- "reference": "34e9109535165bf1d7ff17a610492372ae73a896",
+ "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/94cfc34887f07ab5c0efa07914c8f527544e3224",
+ "reference": "94cfc34887f07ab5c0efa07914c8f527544e3224",
"shasum": ""
},
"require": {
@@ -3669,7 +3669,7 @@
"doctrine/orm": "^2.15.2 || ^3.0",
"friendsofphp/php-cs-fixer": "^v3.87.1",
"kylekatarnls/multi-tester": "^2.5.3",
- "phpmd/phpmd": "^2.15.0",
+ "phpmd/phpmd": "^3.0@dev",
"phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan": "^2.1.22",
"phpunit/phpunit": "^10.5.53",
@@ -3741,7 +3741,7 @@
"type": "tidelift"
}
],
- "time": "2026-09-27T12:07:26+00:00"
+ "time": "2026-10-02T07:26:52+00:00"
},
{
"name": "nette/schema",
diff --git a/config/firefly.php b/config/firefly.php
index 0801d28656..7fb0fb1e14 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-02',
-'build_time' => 1790920331,
+'version' => 'develop/2026-10-03',
+'build_time' => 1790991757,
'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.json
index 3e3f29f1da..f351f11d72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1587,9 +1587,9 @@
}
},
"node_modules/eslint": {
- "version": "10.11.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.11.0.tgz",
- "integrity": "sha512-P7a6UEEqb9G95MYAtqkmsTbVXIYyzIfl6NGOIJk162PaahFxFyeGcrlXYFSiagECg4sEm8IseJdZBKR3rx6MsQ==",
+ "version": "10.12.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.12.0.tgz",
+ "integrity": "sha512-npHjrHb2o4ehH3mE+YuxABR+0gyb0aVWCIolgJDArwCiHEIsonBm3ZKjel5b0U5+a+MbEvIyRCGCzD3eKKK2NA==",
"dev": true,
"license": "MIT",
"workspaces": [
diff --git a/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.js b/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.js
index f3bd6c2944..6feeb4296d 100644
--- a/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.js
+++ b/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.js
@@ -26,9 +26,18 @@ export function createLinkAutocomplete(fieldIdentifier, url) {
const renderJournal = function (item) {
let locale = window.store.get("locale");
// return item.description;
- return item.description + '<br><small class="text-muted">#' + item.transaction_group_id + ', ' + formatMoney(item.amount, item.currency_code) + " @ " + format(new Date(item.date), window.i18next.t("config.date_time_fns", { lng: locale }), locale) + "</small>";
+ return (
+ item.description +
+ '<br><small class="text-muted">#' +
+ item.transaction_group_id +
+ ", " +
+ formatMoney(item.amount, item.currency_code) +
+ " @ " +
+ format(new Date(item.date), window.i18next.t("config.date_time_fns", { lng: locale }), locale) +
+ "</small>"
+ );
};
- console.log('Created link AC', fieldIdentifier);
+ console.log("Created link AC", fieldIdentifier);
Autocomplete.init("#" + fieldIdentifier, {
server: url,
labelField: "name",
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 1ec9977e15..89bdc1c865 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
@@ -71,8 +71,9 @@ export function disableSplitInputs() {
// unless the user changes it, in which case we will not overwrite it.
if (
"" === this.entries[i].destination_account.alpine_name &&
- "withdrawal" === this.groupProperties.transactionType) {
- console.log('Prefill destination account #', i, this.entries[i].destination_account);
+ "withdrawal" === this.groupProperties.transactionType
+ ) {
+ console.log("Prefill destination account #", i, this.entries[i].destination_account);
this.entries[i].destination_account = JSON.parse(
JSON.stringify(this.entries[i - 1].destination_account),
); //structuredClone();