Skip to content

Firefly III: a personal finances manager

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

JC5c53ed44ea31f
diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php
index 6c68c38c83..31561b6433 100644
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -778,8 +778,8 @@ class GroupCollector implements GroupCollectorInterface
{
$newArray = $newJournal->toArray();
if (array_key_exists('attachment_id', $newArray)) {
- $attachmentId = (int) $newJournal['attachment_id'];
- if(0 !== $attachmentId) {
+ $attachmentId = (int) $newJournal['attachment_id'];
+ if (0 !== $attachmentId) {
$existingJournal['attachments'][$attachmentId] = ['id' => $attachmentId];
}
}
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 0af4ca9201..513c018e1c 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -248,7 +248,7 @@ class TagController extends Controller
// collect transaction journal IDs in repository,
// this makes the collector faster and more accurate.
- $journalIds = $this->repository->getJournalIds($tag);
+ $journalIds = $this->repository->getJournalIds($tag);
$collector
->setRange($start, $end)
@@ -303,7 +303,7 @@ class TagController extends Controller
// collect transaction journal IDs in repository,
// this makes the collector faster and more accurate.
- $journalIds = $this->repository->getJournalIds($tag);
+ $journalIds = $this->repository->getJournalIds($tag);
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
diff --git a/app/Listeners/Model/Account/UpdatesAccountInformation.php b/app/Listeners/Model/Account/UpdatesAccountInformation.php
index 6875d283c7..3968fcc9c2 100644
--- a/app/Listeners/Model/Account/UpdatesAccountInformation.php
+++ b/app/Listeners/Model/Account/UpdatesAccountInformation.php
@@ -51,7 +51,7 @@ class UpdatesAccountInformation implements ShouldQueue
private function correctRuleActions(Account $account, array $oldData, Rule $rule): void
{
- $fields = ['set_source_account', 'set_destination_account','convert_withdrawal','convert_deposit','convert_transfer'];
+ $fields = ['set_source_account', 'set_destination_account', 'convert_withdrawal', 'convert_deposit', 'convert_transfer'];
Log::debug(sprintf('Check if rule #%d actions reference account #%d "%s"', $rule->id, $account->id, $account->name));
$fixed = 0;
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 39d79c13e7..efef221896 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -135,6 +135,12 @@ class TagRepository implements TagRepositoryInterface, UserGroupInterface
});
}
+ #[Override]
+ public function getJournalIds(Tag $tag): array
+ {
+ return $tag->transactionJournals->pluck('id')->toArray();
+ }
+
public function getLocation(Tag $tag): ?Location
{
/** @var null|Location */
@@ -451,10 +457,4 @@ class TagRepository implements TagRepositoryInterface, UserGroupInterface
return $tag;
}
-
- #[\Override]
- public function getJournalIds(Tag $tag): array
- {
- return $tag->transactionJournals->pluck('id')->toArray();
- }
}
diff --git a/config/firefly.php b/config/firefly.php
index 3d6d123b33..d9d7c56b1c 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
// see cer.php for exchange rates feature flag.
],
- 'version' => 'develop/2026-03-01',
- 'build_time' => 1772370892,
+ 'version' => 'develop/2026-03-02',
+ 'build_time' => 1772423334,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.