Merge pull request #11723 from firefly-iii/release-1771134641

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2026-02-15
2026-02-17 09:00:47 +00:00 · 2026-02-15 06:50:49 +01:00 · 2026-02-15 06:50:41 +01:00 · 2026-02-15 06:18:52 +01:00 · 2026-02-14 20:40:32 +01:00 · 2026-02-14 20:40:27 +01:00
14 changed files with 94 additions and 35 deletions
--- a/app/Support/Export/ExportDataGenerator.php
+++ b/app/Support/Export/ExportDataGenerator.php
@@ -130,6 +130,12 @@ class ExportDataGenerator

    // @phpstan-ignore-line

+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
    public function __construct()
    {
        $this->accounts = new Collection();
--- a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php
@@ -61,6 +61,9 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private readonly bool $convertToPrimary; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
@@ -82,6 +85,9 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $currencies            = [];
    private array $currencyIds           = [];
    private array $ids                   = [];
--- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php
@@ -61,6 +61,9 @@ class BudgetLimitEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $currencies  = [];
    private array $currencyIds = [];
    private Carbon $end;
--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
@@ -63,6 +63,9 @@ class PiggyBankEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $accounts      = []; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
@@ -84,6 +87,9 @@ class PiggyBankEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $amounts       = [];
    private Collection $collection;
    private array $currencies    = [];
--- a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
@@ -58,6 +58,9 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $accountIds        = []; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
@@ -79,6 +82,9 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private Collection $collection;
    private array $currencies        = [];
    private array $groupIds          = [];
--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
@@ -67,6 +67,9 @@ class SubscriptionEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private readonly bool $convertToPrimary;
    private ?Carbon $end             = null;
    private array   $mappedObjects   = [];
--- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php
@@ -95,6 +95,12 @@ class TransactionGroupEnrichment implements EnrichmentInterface

    // @phpstan-ignore-line

+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
    public function __construct()
    {
        $this->dateFields      = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
--- a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/WebhookEnrichment.php
@@ -63,6 +63,9 @@ class WebhookEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $ids               = []; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
@@ -84,6 +87,9 @@ class WebhookEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $responses         = [];
    private array $triggers          = [];
    private array $webhookDeliveries = [];
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -93,7 +93,7 @@ $app = Application::configure(basePath: dirname(__DIR__))
                  ->withRouting(
                      web     : __DIR__ . '/../routes/web.php',
                      commands: __DIR__ . '/../routes/console.php',
-                      health  : '/up',
+                      health  : '/health',
                  )
                  ->withMiddleware(function (Middleware $middleware): void {
                      // overrule the standard middleware
@@ -123,7 +123,7 @@ $app = Application::configure(basePath: dirname(__DIR__))
                                         ]
                      );
                      // new group?
-                      $middleware->appendToGroup('binders-only',
+                      $middleware->group('binders-only',
                                                 [
                                                     Installer::class,
                                                     EncryptCookies::class,
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## v6.4.21
+
+### Added
+- The ability to undo the recording of a database migration, which may help with database issues. [See the docs](https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-get-errors-about-missing-tables-how-do-i-fix-this)
+- Added debug logs to file permission checks.
+
+### Fixed
+- View range issue for subscription overview
+- Amount log entries were recorded for the transaction group, not the journal
+- Subscriptions were not being renamed in rules when their names were changed
+- [Issue 11688](https://github.com/firefly-iii/firefly-iii/issues/11688) (Token endpoints returning 401 unauthorized) reported by @molnarti
+- [Issue 11694](https://github.com/firefly-iii/firefly-iii/issues/11694) (Foreign currency amount is always positive in transfers) reported by @SledgehammerPL
+- [Issue 11684](https://github.com/firefly-iii/firefly-iii/issues/11684) (Transaction summary duplicated after more than 10 rows) reported by @jkmf
+- [Issue 11700](https://github.com/firefly-iii/firefly-iii/issues/11700) (Duplicate entry for key 'tag_transaction_journal_tag_id_transaction_journal_id_unique') reported by @beatbesmer
+- [Issue 11702](https://github.com/firefly-iii/firefly-iii/issues/11702) (Can't enable displaying primary currency when using Postgres) reported by @absdjfh
+- [Issue 11710](https://github.com/firefly-iii/firefly-iii/issues/11710) (Firefly throws error on startup and when trying to use importer) reported by @avee87
+
 ## v6.4.20

 ### Added
--- a/composer.lock
+++ b/composer.lock
@@ -10532,16 +10532,16 @@
        },
        {
            "name": "fruitcake/laravel-debugbar",
-            "version": "v4.0.7",
+            "version": "v4.0.8",
            "source": {
                "type": "git",
                "url": "https://github.com/fruitcake/laravel-debugbar.git",
-                "reference": "a9cc62c81cd0bda4ca7410229487638d7df786be"
+                "reference": "ad7a5b11c11bf7773c9acd04d0fe0d79a229b1c7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/a9cc62c81cd0bda4ca7410229487638d7df786be",
-                "reference": "a9cc62c81cd0bda4ca7410229487638d7df786be",
+                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/ad7a5b11c11bf7773c9acd04d0fe0d79a229b1c7",
+                "reference": "ad7a5b11c11bf7773c9acd04d0fe0d79a229b1c7",
                "shasum": ""
            },
            "require": {
@@ -10618,7 +10618,7 @@
            ],
            "support": {
                "issues": "https://github.com/fruitcake/laravel-debugbar/issues",
-                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.0.7"
+                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.0.8"
            },
            "funding": [
                {
@@ -10630,7 +10630,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-02-06T20:53:50+00:00"
+            "time": "2026-02-14T13:26:03+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
@@ -11200,16 +11200,16 @@
        },
        {
            "name": "php-debugbar/php-debugbar",
-            "version": "v3.3.1",
+            "version": "v3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/php-debugbar/php-debugbar.git",
-                "reference": "afdaa2e56aca9d56b5bb2bad041bd2f6002017cf"
+                "reference": "e50d470344b62a033a76d3d10a803b04c8e3be69"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/afdaa2e56aca9d56b5bb2bad041bd2f6002017cf",
-                "reference": "afdaa2e56aca9d56b5bb2bad041bd2f6002017cf",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/e50d470344b62a033a76d3d10a803b04c8e3be69",
+                "reference": "e50d470344b62a033a76d3d10a803b04c8e3be69",
                "shasum": ""
            },
            "require": {
@@ -11286,7 +11286,7 @@
            ],
            "support": {
                "issues": "https://github.com/php-debugbar/php-debugbar/issues",
-                "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.3.1"
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.4.0"
            },
            "funding": [
                {
@@ -11298,7 +11298,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-02-06T21:09:38+00:00"
+            "time": "2026-02-14T14:10:26+00:00"
        },
        {
            "name": "php-debugbar/symfony-bridge",
--- 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-02-14',
-    'build_time'                           => 1771075358,
+    'version'                              => 'develop/2026-02-15',
+    'build_time'                           => 1771134510,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

--- a/package-lock.json
+++ b/package-lock.json
@@ -3814,9 +3814,9 @@
            }
        },
        "node_modules/ajv-formats/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4578,9 +4578,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001769",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001769.tgz",
-            "integrity": "sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==",
+            "version": "1.0.30001770",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001770.tgz",
+            "integrity": "sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==",
            "dev": true,
            "funding": [
                {
@@ -11033,9 +11033,9 @@
            }
        },
        "node_modules/terser-webpack-plugin/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -11922,9 +11922,9 @@
            }
        },
        "node_modules/webpack-dev-middleware/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -12039,9 +12039,9 @@
            }
        },
        "node_modules/webpack-dev-server/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -12159,9 +12159,9 @@
            }
        },
        "node_modules/webpack/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
--- a/routes/web.php
+++ b/routes/web.php
@@ -84,7 +84,7 @@ Route::group(
    ['middleware' => 'binders-only', 'namespace' => 'FireflyIII\Http\Controllers\System'],
    static function (): void {
        // Route::get('offline', static fn () => view('errors.offline'));
-        Route::get('health', ['uses' => 'HealthcheckController@check', 'as' => 'healthcheck']);
+        // Route::get('health', ['uses' => 'HealthcheckController@check', 'as' => 'healthcheck']);
    }
 );
Author	SHA1	Message	Date
github-actions[bot]	d273503a15	Merge pull request #11723 from firefly-iii/release-1771134641 🤖 Automatically merge the PR into the develop branch.	2026-02-15 06:50:49 +01:00
JC5	cc149adb5d	🤖 Auto commit for release 'develop' on 2026-02-15	2026-02-15 06:50:41 +01:00
James Cole	ac8bcb786b	Fix https://github.com/firefly-iii/firefly-iii/issues/11720	2026-02-15 06:18:52 +01:00
github-actions[bot]	642deefba5	Merge pull request #11718 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2026-02-14 20:40:32 +01:00
github-actions[bot]	5b13b64fd7	Merge pull request #11717 from firefly-iii/release-1771098019 🤖 Automatically merge the PR into the develop branch.	2026-02-14 20:40:27 +01:00
JC5	653a64d0a8	🤖 Auto commit for release 'v6.4.21' on 2026-02-14	2026-02-14 20:40:19 +01:00
github-actions[bot]	c9dcdc90ec	Merge pull request #11716 from firefly-iii/release-1771097648 🤖 Automatically merge the PR into the develop branch.	2026-02-14 20:34:19 +01:00
JC5	1f04888331	🤖 Auto commit for release 'develop' on 2026-02-14	2026-02-14 20:34:08 +01:00
James Cole	28c21ecb7e	Update changelog	2026-02-14 20:29:19 +01:00