Merge pull request #11137 from firefly-iii/release-1761889447

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-10-31
2026-01-27 16:05:10 +00:00 · 2025-10-31 06:44:16 +01:00 · 2025-10-31 06:44:07 +01:00 · 2025-10-31 06:39:28 +01:00 · 2025-10-31 06:31:02 +01:00 · 2025-10-31 06:30:56 +01:00
7 changed files with 93 additions and 48 deletions
--- a/app/Http/Controllers/Account/CreateController.php
+++ b/app/Http/Controllers/Account/CreateController.php
@@ -96,11 +96,10 @@ class CreateController extends Controller
        ];

        // interest calculation periods:
-        $interestPeriods     = [
-            'daily'   => (string) trans('firefly.interest_calc_daily'),
-            'monthly' => (string) trans('firefly.interest_calc_monthly'),
-            'yearly'  => (string) trans('firefly.interest_calc_yearly'),
-        ];
+        $interestPeriods     = [];
+        foreach (config('firefly.interest_periods') as $period) {
+            $interestPeriods[$period] = trans(sprintf('firefly.interest_calc_%s', $period));
+        }

        // pre fill some data
        $request->session()->flash(
--- a/app/Http/Controllers/Account/EditController.php
+++ b/app/Http/Controllers/Account/EditController.php
@@ -108,11 +108,10 @@ class EditController extends Controller
        ];

        // interest calculation periods:
-        $interestPeriods      = [
-            'daily'   => (string) trans('firefly.interest_calc_daily'),
-            'monthly' => (string) trans('firefly.interest_calc_monthly'),
-            'yearly'  => (string) trans('firefly.interest_calc_yearly'),
-        ];
+        $interestPeriods      = [];
+        foreach (config('firefly.interest_periods') as $period) {
+            $interestPeriods[$period] = trans(sprintf('firefly.interest_calc_%s', $period));
+        }

        // put previous url in session if not redirect from store (not "return_to_edit").
        if (true !== session('accounts.edit.fromUpdate')) {
--- a/app/Support/Search/QueryParser/QueryParser.php
+++ b/app/Support/Search/QueryParser/QueryParser.php
@@ -52,13 +52,23 @@ class QueryParser implements QueryParserInterface
        $inQuotes               = false;
        $fieldName              = '';
        $prohibited             = false;
-
-        while ($this->position < strlen($this->query)) {
-            $char = $this->query[$this->position];
+        $chrArray               = preg_split('//u', $this->query, -1, PREG_SPLIT_NO_EMPTY);
+        $count                  = count($chrArray);
+        while ($this->position < $count) {
+            $char     = $chrArray[$this->position];
+            $nextChar = $chrArray[$this->position + 1] ?? '';
            // Log::debug(sprintf('Char #%d: %s', $this->position, $char));

            // If we're in a quoted string, we treat all characters except another quote as ordinary characters
            if ($inQuotes) {
+                if ('\\' === $char && '"' === $nextChar) {
+                    // Log::debug('BACKSLASH!');
+                    // escaped quote, pretend it's a normal char and continue two places (skipping the actual character).
+                    $tokenUnderConstruction .= '\\'.$nextChar;
+                    $this->position         += 2;
+
+                    continue;
+                }
                if ('"' !== $char) {
                    $tokenUnderConstruction .= $char;
                    ++$this->position;
@@ -67,11 +77,9 @@ class QueryParser implements QueryParserInterface
                }
                // char is "
                ++$this->position;
+                Log::debug(sprintf('Constructed token: %s', $tokenUnderConstruction));

-                return new NodeResult(
-                    $this->createNode($tokenUnderConstruction, $fieldName, $prohibited),
-                    false
-                );
+                return new NodeResult($this->createNode($tokenUnderConstruction, $fieldName, $prohibited), false);
            }

            switch ($char) {
@@ -197,9 +205,13 @@ class QueryParser implements QueryParserInterface
    private function createNode(string $token, string $fieldName, bool $prohibited): Node
    {
        if ('' !== $fieldName) {
-            Log::debug(sprintf('Create FieldNode %s:%s (%s)', $fieldName, $token, var_export($prohibited, true)));
+            // OK dus hoe trim je \" correct?
            $token = ltrim($token, ':"');
-            $token = rtrim($token, '"');
+            if (!str_ends_with($token, '\"')) {
+                $token = rtrim($token, '"');
+            }
+            $token = str_replace('\"', '"', $token);
+            Log::debug(sprintf('Create FieldNode %s:%s (%s)', $fieldName, $token, var_export($prohibited, true)));

            return new FieldNode(trim($fieldName), trim($token), $prohibited);
        }
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.4.3 - 2025-11-01
+
+### Added
+
+- [PR 11019](https://github.com/firefly-iii/firefly-iii/pull/11019) (fix #11015 set end date time to end of day) reported by @ctrl-f5
+- [PR 11024](https://github.com/firefly-iii/firefly-iii/pull/11024) (improved balance range date handling) reported by @ctrl-f5
+- [PR 11028](https://github.com/firefly-iii/firefly-iii/pull/11028) (Adding Latin American Currency Support) reported by @codearena-bot
+- [PR 11039](https://github.com/firefly-iii/firefly-iii/pull/11039) (proposal for improved request handling) reported by @ctrl-f5
+- [PR 11041](https://github.com/firefly-iii/firefly-iii/pull/11041) (Add XML mimetypes to the allowedMimes list) reported by @jreyesr
+- [PR 10993](https://github.com/firefly-iii/firefly-iii/pull/10993) (use correct translation key for category report income table) reported by @ctrl-f5
+- [PR 11056](https://github.com/firefly-iii/firefly-iii/pull/11056) (account/attachments endpoint use request object for pagination, add test) reported by @ctrl-f5
+- [PR 11052](https://github.com/firefly-iii/firefly-iii/pull/11052) (correct validator function to check for errors + `Account\ShowControllerTest`) reported by @ctrl-f5
+- [Issue 11102](https://github.com/firefly-iii/firefly-iii/issues/11102) (Allow to redact account totals in web ui) reported by @edvgui
+- [Issue 11109](https://github.com/firefly-iii/firefly-iii/issues/11109) (Could not find a transaction currency with code "Korean Won"/"Russian ruble") reported by @mattephi
+- [Issue 11132](https://github.com/firefly-iii/firefly-iii/issues/11132) (Add a 6 month interest period) reported by @CiramorDev
+
+### Fixed
+
+- [Issue 11031](https://github.com/firefly-iii/firefly-iii/issues/11031) (Rule with trigger "When a transaction is created" being triggered on transaction updates) reported by @pvieira84
+- [Issue 11038](https://github.com/firefly-iii/firefly-iii/issues/11038) (Missing date formats when using "MTD" on the frontpage) reported by @cristiangrossano
+- [Issue 11042](https://github.com/firefly-iii/firefly-iii/issues/11042) (Option to apply rules on a specific date range has disappeared from the UI) reported by @angelbarrera92
+- [Issue 11050](https://github.com/firefly-iii/firefly-iii/issues/11050) (Dev Version: `/api/v1/accounts/get/$id` requires (optional) `start` parameter, throws error otherwise) reported by @dreautall
+- [Issue 11054](https://github.com/firefly-iii/firefly-iii/issues/11054) (Autocreation of revenue account when depositing to liability) reported by @Mr-Kanister
+- [Issue 11096](https://github.com/firefly-iii/firefly-iii/issues/11096) (Budget Limit API ignores transactions on the last day of the month) reported by @edbingo
+- [Issue 11063](https://github.com/firefly-iii/firefly-iii/issues/11063) ("bcadd: argument must be of type string, int given" when viewing categories or tags) reported by @df911
+- [Discussion 11104](https://github.com/orgs/firefly-iii/discussions/11104) (Personal Access Token failing on 6.4.2 for data-importer) started by @marcoblancas
+- [Discussion 11122](https://github.com/orgs/firefly-iii/discussions/11122) (Convenient Rules Creation) started by @viewmatic2025
+- [Issue 11134](https://github.com/firefly-iii/firefly-iii/issues/11134) (Rules are not applied if description in quotes) reported by @beatbesmer
+
+### Security
+
+- Debug route is now behind 2FA

 ## 6.4.2 - 2055-10-07

--- a/composer.lock
+++ b/composer.lock
@@ -3819,25 +3819,25 @@
        },
        {
            "name": "nette/schema",
-            "version": "v1.3.2",
+            "version": "v1.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/schema.git",
-                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
+                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
-                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
+                "url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004",
+                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004",
                "shasum": ""
            },
            "require": {
                "nette/utils": "^4.0",
-                "php": "8.1 - 8.4"
+                "php": "8.1 - 8.5"
            },
            "require-dev": {
                "nette/tester": "^2.5.2",
-                "phpstan/phpstan-nette": "^1.0",
+                "phpstan/phpstan-nette": "^2.0@stable",
                "tracy/tracy": "^2.8"
            },
            "type": "library",
@@ -3847,6 +3847,9 @@
                }
            },
            "autoload": {
+                "psr-4": {
+                    "Nette\\": "src"
+                },
                "classmap": [
                    "src/"
                ]
@@ -3875,9 +3878,9 @@
            ],
            "support": {
                "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.2"
+                "source": "https://github.com/nette/schema/tree/v1.3.3"
            },
-            "time": "2024-10-06T23:10:23+00:00"
+            "time": "2025-10-30T22:57:59+00:00"
        },
        {
            "name": "nette/utils",
@@ -9815,16 +9818,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.21.1",
+            "version": "v3.22.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d"
+                "reference": "4509984193026de413baf4ba80f68590a7f2c51d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/285123877d4dd97dd7c11842ac5fb7e86e60d81d",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/4509984193026de413baf4ba80f68590a7f2c51d",
+                "reference": "4509984193026de413baf4ba80f68590a7f2c51d",
                "shasum": ""
            },
            "require": {
@@ -9878,7 +9881,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.21.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.22.0"
            },
            "funding": [
                {
@@ -9890,7 +9893,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-03T07:21:55+00:00"
+            "time": "2025-10-29T15:56:47+00:00"
        },
        {
            "name": "vlucas/phpdotenv",
@@ -11815,16 +11818,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.4.1",
+            "version": "12.4.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fc5413a2e6d240d2f6d9317bdf7f0a24e73de194"
+                "reference": "a94ea4d26d865875803b23aaf78c3c2c670ea2ea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc5413a2e6d240d2f6d9317bdf7f0a24e73de194",
-                "reference": "fc5413a2e6d240d2f6d9317bdf7f0a24e73de194",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a94ea4d26d865875803b23aaf78c3c2c670ea2ea",
+                "reference": "a94ea4d26d865875803b23aaf78c3c2c670ea2ea",
                "shasum": ""
            },
            "require": {
@@ -11892,7 +11895,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.4.1"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.4.2"
            },
            "funding": [
                {
@@ -11916,7 +11919,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-09T14:08:29+00:00"
+            "time": "2025-10-30T08:41:39+00:00"
        },
        {
            "name": "rector/rector",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-10-29',
-    'build_time'                   => 1761763884,
+    'version'                      => 'develop/2025-10-31',
+    'build_time'                   => 1761889339,
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 28, // field is no longer used.

@@ -309,7 +309,7 @@ return [

    // "period must be in this list" values
    'bill_periods'                 => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
-    'interest_periods'             => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
+    'interest_periods'             => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],

    // settings to translate X to Y
    'range_to_repeat_freq'         => [
--- a/package-lock.json
+++ b/package-lock.json
@@ -4521,9 +4521,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001751",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz",
-            "integrity": "sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==",
+            "version": "1.0.30001752",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001752.tgz",
+            "integrity": "sha512-vKUk7beoukxE47P5gcVNKkDRzXdVofotshHwfR9vmpeFKxmI5PBpgOMC18LUJUA/DvJ70Y7RveasIBraqsyO/g==",
            "dev": true,
            "funding": [
                {
@@ -5736,9 +5736,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.243",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.243.tgz",
-            "integrity": "sha512-ZCphxFW3Q1TVhcgS9blfut1PX8lusVi2SvXQgmEEnK4TCmE1JhH2JkjJN+DNt0pJJwfBri5AROBnz2b/C+YU9g==",
+            "version": "1.5.244",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.244.tgz",
+            "integrity": "sha512-OszpBN7xZX4vWMPJwB9illkN/znA8M36GQqQxi6MNy9axWxhOfJyZZJtSLQCpEFLHP2xK33BiWx9aIuIEXVCcw==",
            "dev": true,
            "license": "ISC"
        },
Author	SHA1	Message	Date
github-actions[bot]	08c9703900	Merge pull request #11137 from firefly-iii/release-1761889447 🤖 Automatically merge the PR into the develop branch.	2025-10-31 06:44:16 +01:00
JC5	101f56d1b1	🤖 Auto commit for release 'develop' on 2025-10-31	2025-10-31 06:44:07 +01:00
James Cole	83bdaff033	Update changelog.	2025-10-31 06:39:28 +01:00
James Cole	e25fbcfb19	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-10-31 06:31:02 +01:00
James Cole	40c4c9f109	Fix #11132	2025-10-31 06:30:56 +01:00
github-actions[bot]	d178956541	Merge pull request #11135 from firefly-iii/release-1761853876 🤖 Automatically merge the PR into the develop branch.	2025-10-30 20:51:23 +01:00
JC5	c29f997733	🤖 Auto commit for release 'develop' on 2025-10-30	2025-10-30 20:51:16 +01:00
James Cole	2aabb56d2d	Fix https://github.com/firefly-iii/firefly-iii/issues/11134	2025-10-30 20:46:43 +01:00