Skip to content

Firefly III: a personal finances manager

🤖 Auto commit for release 'develop' on 2026-01-05

JC5e5b3c3e6bd2c
diff --git a/.ci/php-cs-fixer/composer.lock b/.ci/php-cs-fixer/composer.lock
index cca0ee2946..f686a86fb2 100644
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -402,16 +402,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.92.3",
+ "version": "v3.92.4",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8"
+ "reference": "9e7488b19403423e02e8403cc1eb596baf4673b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
- "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/9e7488b19403423e02e8403cc1eb596baf4673b0",
+ "reference": "9e7488b19403423e02e8403cc1eb596baf4673b0",
"shasum": ""
},
"require": {
@@ -443,17 +443,17 @@
},
"require-dev": {
"facile-it/paraunit": "^1.3.1 || ^2.7",
- "infection/infection": "^0.31.0",
- "justinrainbow/json-schema": "^6.5",
- "keradus/cli-executor": "^2.2",
+ "infection/infection": "^0.31",
+ "justinrainbow/json-schema": "^6.6",
+ "keradus/cli-executor": "^2.3",
"mikey179/vfsstream": "^1.6.12",
"php-coveralls/php-coveralls": "^2.9",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
- "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+ "phpunit/phpunit": "^9.6.31 || ^10.5.60 || ^11.5.46",
"symfony/polyfill-php85": "^1.33",
- "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2 || ^8.0",
- "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2 || ^8.0"
+ "symfony/var-dumper": "^5.4.48 || ^6.4.26 || ^7.4.0 || ^8.0",
+ "symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@@ -494,7 +494,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.3"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.4"
},
"funding": [
{
@@ -502,7 +502,7 @@
"type": "github"
}
],
- "time": "2025-12-18T10:45:02+00:00"
+ "time": "2026-01-04T00:38:52+00:00"
},
{
"name": "psr/container",
diff --git a/app/Api/V1/Controllers/Search/TransactionController.php b/app/Api/V1/Controllers/Search/TransactionController.php
index ac04fb2bb5..cc5768fce1 100644
--- a/app/Api/V1/Controllers/Search/TransactionController.php
+++ b/app/Api/V1/Controllers/Search/TransactionController.php
@@ -30,7 +30,6 @@ use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
use FireflyIII\Support\Search\SearchInterface;
use FireflyIII\Transformers\TransactionGroupTransformer;
use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection;
diff --git a/app/Api/V1/Requests/Search/SearchQueryRequest.php b/app/Api/V1/Requests/Search/SearchQueryRequest.php
index 73640dc8ee..f3c4d9a0f3 100644
--- a/app/Api/V1/Requests/Search/SearchQueryRequest.php
+++ b/app/Api/V1/Requests/Search/SearchQueryRequest.php
@@ -1,4 +1,6 @@
<?php
+
+declare(strict_types=1);
/*
* SearchQueryRequest.php
* Copyright (c) 2026 [email protected]
@@ -33,7 +35,6 @@ class SearchQueryRequest extends ApiRequest
];
}
-
public function withValidator(Validator $validator): void
{
$validator->after(
@@ -46,5 +47,4 @@ class SearchQueryRequest extends ApiRequest
}
);
}
-
}
diff --git a/app/Api/V1/Requests/Search/TransactionSearchRequest.php b/app/Api/V1/Requests/Search/TransactionSearchRequest.php
index f1bed30e15..fa6df367b1 100644
--- a/app/Api/V1/Requests/Search/TransactionSearchRequest.php
+++ b/app/Api/V1/Requests/Search/TransactionSearchRequest.php
@@ -1,4 +1,6 @@
<?php
+
+declare(strict_types=1);
/*
* SearchRequest.php
* Copyright (c) 2026 [email protected]
@@ -24,11 +26,11 @@ namespace FireflyIII\Api\V1\Requests\Search;
use FireflyIII\Api\V1\Requests\AggregateFormRequest;
use FireflyIII\Api\V1\Requests\PaginationRequest;
use FireflyIII\Models\TransactionJournal;
+use Override;
class TransactionSearchRequest extends AggregateFormRequest
{
-
- #[\Override]
+ #[Override]
protected function getRequests(): array
{
return [
diff --git a/app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php b/app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php
index b0826f1144..e913a7e70d 100644
--- a/app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php
+++ b/app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php
@@ -36,7 +36,8 @@ class TriggeredStoredTransactionGroup extends Event
/**
* Create a new event instance.
*/
- public function __construct(public TransactionGroup $transactionGroup, ?RuleGroup $ruleGroup = null) {
+ public function __construct(public TransactionGroup $transactionGroup, ?RuleGroup $ruleGroup = null)
+ {
$this->ruleGroup = $ruleGroup;
}
}
diff --git a/app/Handlers/Events/StoredGroupEventHandler.php b/app/Handlers/Events/StoredGroupEventHandler.php
index d9facddc15..30e0973a49 100644
--- a/app/Handlers/Events/StoredGroupEventHandler.php
+++ b/app/Handlers/Events/StoredGroupEventHandler.php
@@ -71,14 +71,14 @@ class StoredGroupEventHandler
}
Log::debug('Now in StoredGroupEventHandler::processRules()');
- $journals = $storedGroupEvent->transactionGroup->transactionJournals;
- $array = [];
+ $journals = $storedGroupEvent->transactionGroup->transactionJournals;
+ $array = [];
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {
$array[] = $journal->id;
}
- $journalIds = implode(',', $array);
+ $journalIds = implode(',', $array);
Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));
// collect rules:
@@ -97,7 +97,7 @@ class StoredGroupEventHandler
}
// create and fire rule engine.
- $newRuleEngine = app(RuleEngineInterface::class);
+ $newRuleEngine = app(RuleEngineInterface::class);
$newRuleEngine->setUser($storedGroupEvent->transactionGroup->user);
$newRuleEngine->addOperator(['type' => 'journal_id', 'value' => $journalIds]);
$newRuleEngine->setRuleGroups($groups);
@@ -106,7 +106,7 @@ class StoredGroupEventHandler
private function recalculateCredit(StoredTransactionGroup $event): void
{
- $group = $event->transactionGroup;
+ $group = $event->transactionGroup;
/** @var CreditRecalculateService $object */
$object = app(CreditRecalculateService::class);
@@ -122,10 +122,10 @@ class StoredGroupEventHandler
/** @var TransactionJournal $journal */
foreach ($event->transactionGroup->transactionJournals as $journal) {
/** @var null|Transaction $source */
- $source = $journal->transactions()->where('amount', '<', '0')->first();
+ $source = $journal->transactions()->where('amount', '<', '0')->first();
/** @var null|Transaction $dest */
- $dest = $journal->transactions()->where('amount', '>', '0')->first();
+ $dest = $journal->transactions()->where('amount', '>', '0')->first();
if (null !== $source) {
$repository->deleteStatisticsForModel($source->account, $journal->date);
@@ -160,14 +160,14 @@ class StoredGroupEventHandler
private function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void
{
Log::debug(__METHOD__);
- $group = $storedGroupEvent->transactionGroup;
+ $group = $storedGroupEvent->transactionGroup;
if (false === $storedGroupEvent->fireWebhooks) {
Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));
return;
}
- $user = $group->user;
+ $user = $group->user;
/** @var MessageGeneratorInterface $engine */
$engine = app(MessageGeneratorInterface::class);
diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.php
index 332c9c6f3f..ecf02825a1 100644
--- a/app/Http/Controllers/RuleGroup/ExecutionController.php
+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php
@@ -74,14 +74,14 @@ class ExecutionController extends Controller
Log::debug(sprintf('You have selected rule group #%d', $ruleGroup->id));
// Get parameters specified by the user
$accounts = $request->get('accounts');
- $set = new Collection();
- if(is_array($accounts)) {
- $set = $this->repository->getAccountsById($accounts);
+ $set = new Collection();
+ if (is_array($accounts)) {
+ $set = $this->repository->getAccountsById($accounts);
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
- if(count($set) > 0) {
+ if (count($set) > 0) {
$collector->setAccounts($set);
}
diff --git a/composer.lock b/composer.lock
index b6b4b6c1ce..eafa2a21be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -13087,8 +13087,5 @@
"ext-xmlwriter": "*"
},
"platform-dev": {},
- "platform-overrides": {
- "php": "8.4"
- },
"plugin-api-version": "2.9.0"
}
diff --git a/config/firefly.php b/config/firefly.php
index c8d6662cda..dfb9528c2e 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-01-02',
- 'build_time' => 1767337875,
+ 'version' => 'develop/2026-01-05',
+ 'build_time' => 1767598210,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.