Auto commit for release 'develop' on 2024-06-15

Mondays only [skip ci]
Auto commit for release 'v6.1.17' on 2024-06-15
2025-12-10 13:21:21 +00:00 · 2024-06-15 16:16:40 +02:00 · 2024-06-15 14:26:59 +02:00 · 2024-06-15 13:07:23 +02:00 · 2024-06-15 11:04:29 +00:00 · 2024-06-15 13:02:53 +02:00
25 changed files with 1143 additions and 971 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -398,16 +398,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.58.1",
+            "version": "v3.59.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff"
+                "reference": "756fa7852c2e961cba4ea39e3e510e1c020f2123"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04e9424025677a86914b9a4944dbbf4060bb0aff",
-                "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/756fa7852c2e961cba4ea39e3e510e1c020f2123",
+                "reference": "756fa7852c2e961cba4ea39e3e510e1c020f2123",
                "shasum": ""
            },
            "require": {
@@ -486,7 +486,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.58.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.1"
            },
            "funding": [
                {
@@ -494,7 +494,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-05-29T16:39:07+00:00"
+            "time": "2024-06-15T12:19:07+00:00"
        },
        {
            "name": "psr/container",
@@ -802,28 +802,28 @@
        },
        {
            "name": "react/dns",
-            "version": "v1.12.0",
+            "version": "v1.13.0",
            "source": {
                "type": "git",
                "url": "https://github.com/reactphp/dns.git",
-                "reference": "c134600642fa615b46b41237ef243daa65bb64ec"
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/dns/zipball/c134600642fa615b46b41237ef243daa65bb64ec",
-                "reference": "c134600642fa615b46b41237ef243daa65bb64ec",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.0",
                "react/cache": "^1.0 || ^0.6 || ^0.5",
                "react/event-loop": "^1.2",
-                "react/promise": "^3.0 || ^2.7 || ^1.2.1"
+                "react/promise": "^3.2 || ^2.7 || ^1.2.1"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
-                "react/async": "^4 || ^3 || ^2",
-                "react/promise-timer": "^1.9"
+                "react/async": "^4.3 || ^3 || ^2",
+                "react/promise-timer": "^1.11"
            },
            "type": "library",
            "autoload": {
@@ -866,7 +866,7 @@
            ],
            "support": {
                "issues": "https://github.com/reactphp/dns/issues",
-                "source": "https://github.com/reactphp/dns/tree/v1.12.0"
+                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
            },
            "funding": [
                {
@@ -874,7 +874,7 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2023-11-29T12:41:06+00:00"
+            "time": "2024-06-13T14:18:03+00:00"
        },
        {
            "name": "react/event-loop",
@@ -1103,16 +1103,16 @@
        },
        {
            "name": "react/stream",
-            "version": "v1.3.0",
+            "version": "v1.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/reactphp/stream.git",
-                "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66"
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/stream/zipball/6fbc9672905c7d5a885f2da2fc696f65840f4a66",
-                "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
                "shasum": ""
            },
            "require": {
@@ -1122,7 +1122,7 @@
            },
            "require-dev": {
                "clue/stream-filter": "~1.2",
-                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
            },
            "type": "library",
            "autoload": {
@@ -1169,7 +1169,7 @@
            ],
            "support": {
                "issues": "https://github.com/reactphp/stream/issues",
-                "source": "https://github.com/reactphp/stream/tree/v1.3.0"
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
            },
            "funding": [
                {
@@ -1177,7 +1177,7 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2023-06-16T10:52:11+00:00"
+            "time": "2024-06-11T12:45:25+00:00"
        },
        {
            "name": "sebastian/diff",
@@ -1248,16 +1248,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "5bcde9e0b2ea9bd9772bca17618365ea921c5707"
+                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5bcde9e0b2ea9bd9772bca17618365ea921c5707",
-                "reference": "5bcde9e0b2ea9bd9772bca17618365ea921c5707",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
+                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
                "shasum": ""
            },
            "require": {
@@ -1321,7 +1321,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.0"
+                "source": "https://github.com/symfony/console/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1337,7 +1337,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1408,16 +1408,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "522d2772d6c7bab843b0c52466dc7844622bacc2"
+                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/522d2772d6c7bab843b0c52466dc7844622bacc2",
-                "reference": "522d2772d6c7bab843b0c52466dc7844622bacc2",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
+                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
                "shasum": ""
            },
            "require": {
@@ -1468,7 +1468,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1484,7 +1484,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -1564,16 +1564,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "8ecdde25881598f86cdd7cfe8b25302b66a402e9"
+                "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/8ecdde25881598f86cdd7cfe8b25302b66a402e9",
-                "reference": "8ecdde25881598f86cdd7cfe8b25302b66a402e9",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2",
+                "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2",
                "shasum": ""
            },
            "require": {
@@ -1610,7 +1610,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.0"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1626,20 +1626,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/finder",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "fb6c2d65c3dbf7ad83201a4168d4510c8dddaac7"
+                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/fb6c2d65c3dbf7ad83201a4168d4510c8dddaac7",
-                "reference": "fb6c2d65c3dbf7ad83201a4168d4510c8dddaac7",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
+                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
                "shasum": ""
            },
            "require": {
@@ -1674,7 +1674,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.1.0"
+                "source": "https://github.com/symfony/finder/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1690,20 +1690,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-28T18:29:00+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/options-resolver",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "9564f64c16f99e29f252eafc642965e8fcb755ce"
+                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9564f64c16f99e29f252eafc642965e8fcb755ce",
-                "reference": "9564f64c16f99e29f252eafc642965e8fcb755ce",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55",
+                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55",
                "shasum": ""
            },
            "require": {
@@ -1741,7 +1741,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.1.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1757,7 +1757,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -2235,16 +2235,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "56c8a1ea51eb70003fee94a78c7d6d0f44832ce7"
+                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/56c8a1ea51eb70003fee94a78c7d6d0f44832ce7",
-                "reference": "56c8a1ea51eb70003fee94a78c7d6d0f44832ce7",
+                "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028",
+                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028",
                "shasum": ""
            },
            "require": {
@@ -2276,7 +2276,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.0"
+                "source": "https://github.com/symfony/process/tree/v7.1.1"
            },
            "funding": [
                {
@@ -2292,7 +2292,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -2379,16 +2379,16 @@
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "13c750a45ac43c45f45d944d22499768aa1b72d8"
+                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/13c750a45ac43c45f45d944d22499768aa1b72d8",
-                "reference": "13c750a45ac43c45f45d944d22499768aa1b72d8",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
+                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
                "shasum": ""
            },
            "require": {
@@ -2421,7 +2421,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.1.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.1.1"
            },
            "funding": [
                {
@@ -2437,20 +2437,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "6f41b185e742737917e6f2e3eca37767fba5f17a"
+                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/6f41b185e742737917e6f2e3eca37767fba5f17a",
-                "reference": "6f41b185e742737917e6f2e3eca37767fba5f17a",
+                "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2",
+                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2",
                "shasum": ""
            },
            "require": {
@@ -2508,7 +2508,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.0"
+                "source": "https://github.com/symfony/string/tree/v7.1.1"
            },
            "funding": [
                {
@@ -2524,7 +2524,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-06-04T06:40:14+00:00"
        }
    ],
    "packages-dev": [],
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
        required: true
        default: 'develop'
  schedule:
-    - cron: '0 3 * * MON,THU'
+    - cron: '0 3 * * MON'

 jobs:
  build:
@@ -39,7 +39,7 @@ jobs:
          php-version: '8.3'
          extensions: mbstring, intl, zip, bcmath
      - name: crowdin action
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
        with:
          upload_sources: true
          download_translations: true
@@ -125,9 +125,9 @@ jobs:
      - name: Build JS
        run: |
          npm install
-          npm update
          npm run prod  --workspace=v1
          npm run build --workspace=v2
+          npm update
      - name: Run CI
        run: |
          rm -rf vendor composer.lock
--- a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php
@@ -58,7 +58,7 @@ class StoreRequest extends FormRequest
        $models = config('firefly.valid_attachment_models');
        $models = array_map(
            static function (string $className) {
-                return str_replace('FireflyIII\\Models\\', '', $className);
+                return str_replace('FireflyIII\Models\\', '', $className);
            },
            $models
        );
--- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
@@ -60,7 +60,7 @@ class UpdateRequest extends FormRequest
        $models = config('firefly.valid_attachment_models');
        $models = array_map(
            static function (string $className) {
-                return str_replace('FireflyIII\\Models\\', '', $className);
+                return str_replace('FireflyIII\Models\\', '', $className);
            },
            $models
        );
--- a/app/Console/Commands/Integrity/UpdateGroupInformation.php
+++ b/app/Console/Commands/Integrity/UpdateGroupInformation.php
@@ -115,7 +115,7 @@ class UpdateGroupInformation extends Command
            return;
        }
        if (0 !== $result) {
-            $this->friendlyPositive(sprintf('User #%d: Moved %d %s objects to the correct group.', $user->id, $result, str_replace('FireflyIII\\Models\\', '', $className)));
+            $this->friendlyPositive(sprintf('User #%d: Moved %d %s objects to the correct group.', $user->id, $result, str_replace('FireflyIII\Models\\', '', $className)));
        }
    }
 }
--- a/app/Console/Commands/System/ForceDecimalSize.php
+++ b/app/Console/Commands/System/ForceDecimalSize.php
@@ -111,7 +111,7 @@ class ForceDecimalSize extends Command
    {
        // switch stuff based on database connection:
        $this->operator          = 'REGEXP';
-        $this->regularExpression = '\'\\\\.[\\\\d]{%d}[1-9]+\'';
+        $this->regularExpression = '\'\\\.[\\\d]{%d}[1-9]+\'';
        $this->cast              = 'CHAR';
        if ('pgsql' === config('database.default')) {
            $this->operator          = 'SIMILAR TO';
@@ -119,7 +119,7 @@ class ForceDecimalSize extends Command
            $this->cast              = 'TEXT';
        }
        if ('sqlite' === config('database.default')) {
-            $this->regularExpression = '"\\.[\d]{%d}[1-9]+"';
+            $this->regularExpression = '"\.[\d]{%d}[1-9]+"';
        }
    }

--- a/app/Factory/AttachmentFactory.php
+++ b/app/Factory/AttachmentFactory.php
@@ -43,7 +43,7 @@ class AttachmentFactory
    public function create(array $data): ?Attachment
    {
        // append if necessary.
-        $model      = !str_contains($data['attachable_type'], 'FireflyIII') ? sprintf('FireflyIII\\Models\\%s', $data['attachable_type'])
+        $model      = !str_contains($data['attachable_type'], 'FireflyIII') ? sprintf('FireflyIII\Models\%s', $data['attachable_type'])
            : $data['attachable_type'];

        // get journal instead of transaction.
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -121,7 +121,7 @@ class LoginController extends Controller

        // Copied directly from AuthenticatesUsers, but with logging added:
        // If the login attempt was unsuccessful we will increment the number of attempts
-        // to login and redirect the user back to the login form. Of course, when this
+        // to log in and redirect the user back to the login form. Of course, when this
        // user surpasses their maximum number of attempts they will get locked out.
        $this->incrementLoginAttempts($request);
        Log::channel('audit')->warning(sprintf('Login failed. Attempt for user "%s" failed.', $request->get($this->username())));
@@ -233,7 +233,7 @@ class LoginController extends Controller
        $storeInCookie     = config('google2fa.store_in_cookie', false);
        if (false !== $storeInCookie) {
            $cookieName = config('google2fa.cookie_name', 'google2fa_token');
-            request()->cookies->set($cookieName, 'invalid');
+            \Cookie::queue(\Cookie::make($cookieName, 'invalid-'.time()));
        }
        $usernameField     = $this->username();

--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Transaction;

-use Exception;
 use FireflyIII\Events\UpdatedTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -65,7 +64,7 @@ class ConvertController extends Controller
        $this->middleware(
            function ($request, $next) {
                $this->accountRepository = app(AccountRepositoryInterface::class);
-                app('view')->share('title', (string)trans('firefly.transactions'));
+                app('view')->share('title', (string) trans('firefly.transactions'));
                app('view')->share('mainTitleIcon', 'fa-exchange');

                return $next($request);
@@ -95,7 +94,7 @@ class ConvertController extends Controller

        $groupTitle           = $group->title ?? $first->description;
        $groupArray           = $transformer->transformObject($group);
-        $subTitle             = (string)trans('firefly.convert_to_'.$destinationType->type, ['description' => $groupTitle]);
+        $subTitle             = (string) trans('firefly.convert_to_'.$destinationType->type, ['description' => $groupTitle]);
        $subTitleIcon         = 'fa-exchange';

        // get a list of asset accounts and liabilities and stuff, in various combinations:
@@ -111,7 +110,7 @@ class ConvertController extends Controller

        if ($sourceType->type === $destinationType->type) { // cannot convert to its own type.
            app('log')->debug('This is already a transaction of the expected type..');
-            session()->flash('info', (string)trans('firefly.convert_is_already_type_'.$destinationType->type));
+            session()->flash('info', (string) trans('firefly.convert_is_already_type_'.$destinationType->type));

            return redirect(route('transactions.show', [$group->id]));
        }
@@ -147,7 +146,7 @@ class ConvertController extends Controller
        // group accounts:
        /** @var Account $account */
        foreach ($accountList as $account) {
-            $role                        = (string)$this->accountRepository->getMetaValue($account, 'account_role');
+            $role                        = (string) $this->accountRepository->getMetaValue($account, 'account_role');
            $name                        = $account->name;
            if ('' === $role) {
                $role = 'no_account_type';
@@ -165,7 +164,7 @@ class ConvertController extends Controller
                $role = 'revenue_account';
            }

-            $key                         = (string)trans('firefly.opt_group_'.$role);
+            $key                         = (string) trans('firefly.opt_group_'.$role);
            $grouped[$key][$account->id] = $name;
        }

@@ -184,7 +183,7 @@ class ConvertController extends Controller
        // group accounts:
        /** @var Account $account */
        foreach ($accountList as $account) {
-            $role                        = (string)$this->accountRepository->getMetaValue($account, 'account_role');
+            $role                        = (string) $this->accountRepository->getMetaValue($account, 'account_role');
            $name                        = $account->name;
            if ('' === $role) {
                $role = 'no_account_type';
@@ -202,7 +201,7 @@ class ConvertController extends Controller
                $role = 'expense_account';
            }

-            $key                         = (string)trans('firefly.opt_group_'.$role);
+            $key                         = (string) trans('firefly.opt_group_'.$role);
            $grouped[$key][$account->id] = $name;
        }

@@ -225,7 +224,7 @@ class ConvertController extends Controller
            $balance                     = app('steam')->balance($account, today());
            $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
            $role                        = 'l_'.$account->accountType->type;
-            $key                         = (string)trans('firefly.opt_group_'.$role);
+            $key                         = (string) trans('firefly.opt_group_'.$role);
            $grouped[$key][$account->id] = $account->name.' ('.app('amount')->formatAnything($currency, $balance, false).')';
        }

@@ -247,12 +246,12 @@ class ConvertController extends Controller
        foreach ($accountList as $account) {
            $balance                     = app('steam')->balance($account, today());
            $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
-            $role                        = (string)$this->accountRepository->getMetaValue($account, 'account_role');
+            $role                        = (string) $this->accountRepository->getMetaValue($account, 'account_role');
            if ('' === $role) {
                $role = 'no_account_type';
            }

-            $key                         = (string)trans('firefly.opt_group_'.$role);
+            $key                         = (string) trans('firefly.opt_group_'.$role);
            $grouped[$key][$account->id] = $account->name.' ('.app('amount')->formatAnything($currency, $balance, false).')';
        }

@@ -285,7 +284,7 @@ class ConvertController extends Controller
        // correct transfers:
        $group->refresh();

-        session()->flash('success', (string)trans('firefly.converted_to_'.$destinationType->type));
+        session()->flash('success', (string) trans('firefly.converted_to_'.$destinationType->type));
        event(new UpdatedTransactionGroup($group, true, true));

        return redirect(route('transactions.show', [$group->id]));
@@ -306,11 +305,11 @@ class ConvertController extends Controller
        $destinationId    = $data['destination_id'][$journal->id] ?? null;
        $destinationName  = $data['destination_name'][$journal->id] ?? null;

-        // double check its not an empty string.
-        $sourceId         = '' === $sourceId || null === $sourceId ? null : (int)$sourceId;
-        $sourceName       = '' === $sourceName ? null : (string)$sourceName;
-        $destinationId    = '' === $destinationId || null === $destinationId ? null : (int)$destinationId;
-        $destinationName  = '' === $destinationName ? null : (string)$destinationName;
+        // double check it's not an empty string.
+        $sourceId         = '' === $sourceId || null === $sourceId ? null : (int) $sourceId;
+        $sourceName       = '' === $sourceName ? null : (string) $sourceName;
+        $destinationId    = '' === $destinationId || null === $destinationId ? null : (int) $destinationId;
+        $destinationName  = '' === $destinationName ? null : (string) $destinationName;
        $validSource      = $validator->validateSource(['id' => $sourceId, 'name' => $sourceName]);
        $validDestination = $validator->validateDestination(['id' => $destinationId, 'name' => $destinationName]);

@@ -331,6 +330,19 @@ class ConvertController extends Controller
            'type'             => $transactionType->type,
        ];

+        // also set the currency to the currency of the source account, in case you're converting a deposit into a transfer.
+        if (TransactionType::TRANSFER === $transactionType->type && TransactionType::DEPOSIT === $journal->transactionType->type) {
+            $source         = $this->accountRepository->find((int) $sourceId);
+            $sourceCurrency = $this->accountRepository->getAccountCurrency($source);
+            $dest           = $this->accountRepository->find((int) $destinationId);
+            $destCurrency   = $this->accountRepository->getAccountCurrency($dest);
+            if (null !== $sourceCurrency && null !== $destCurrency && $sourceCurrency->code !== $destCurrency->code) {
+                $update['currency_id']         = $sourceCurrency->id;
+                $update['foreign_currency_id'] = $destCurrency->id;
+                $update['foreign_amount']      = '1'; // not the best solution but at this point the amount is hard to get.
+            }
+        }
+
        /** @var JournalUpdateService $service */
        $service          = app(JournalUpdateService::class);
        $service->setTransactionJournal($journal);
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -28,6 +28,7 @@ use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
+use Laravel\Passport\Passport;

 /**
 * Class AppServiceProvider
@@ -87,6 +88,7 @@ class AppServiceProvider extends ServiceProvider
     */
    public function register(): void
    {
+        Passport::ignoreRoutes();
        //        Passport::ignoreMigrations();
        //        Sanctum::ignoreMigrations();
    }
--- a/app/Repositories/Attachment/AttachmentRepository.php
+++ b/app/Repositories/Attachment/AttachmentRepository.php
@@ -146,7 +146,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface
        // should be validated already:
        if (array_key_exists('attachable_type', $data) && array_key_exists('attachable_id', $data)) {
            $attachment->attachable_id   = (int)$data['attachable_id'];
-            $attachment->attachable_type = sprintf('FireflyIII\\Models\\%s', $data['attachable_type']);
+            $attachment->attachable_type = sprintf('FireflyIII\Models\%s', $data['attachable_type']);
        }

        $attachment->save();
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -150,7 +150,6 @@ class RuleRepository implements RuleRepositoryInterface
                $params[] = sprintf('%s:true', OperatorQuerySearch::getRootOperator($trigger->trigger_type));
            }
            if (true === $needsContext) {
-                var_dump('x');
                $params[] = sprintf('%s:"%s"', OperatorQuerySearch::getRootOperator($trigger->trigger_type), $trigger->trigger_value);
            }
        }
--- a/app/Services/Internal/Support/CreditRecalculateService.php
+++ b/app/Services/Internal/Support/CreditRecalculateService.php
@@ -216,7 +216,6 @@ class CreditRecalculateService
            app('log')->debug(sprintf('Destination amount "%s" is now "%s"', $dest->amount, app('steam')->negative($dest->amount)));
            $source->amount = app('steam')->positive($source->amount);
            $dest->amount   = app('steam')->negative($source->amount);
-            var_dump($source->foreign_amount);
            if (null !== $source->foreign_amount && '' !== $source->foreign_amount) {
                $source->foreign_amount = app('steam')->positive($source->foreign_amount);
                app('log')->debug(sprintf('Source foreign amount "%s" is now "%s"', $source->foreign_amount, app('steam')->positive($source->foreign_amount)));
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -370,6 +370,7 @@ trait PeriodOverview
        $first       = $this->journalRepos->firstNull();
        $start       = null === $first ? new Carbon() : $first->date;
        $end         = clone $theDate;
+        $end         = app('navigation')->endOfPeriod($end, $range);

        app('log')->debug(sprintf('Start for getNoCategoryPeriodOverview() is %s', $start->format('Y-m-d')));
        app('log')->debug(sprintf('End for getNoCategoryPeriodOverview() is %s', $end->format('Y-m-d')));
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -186,7 +186,7 @@ class General extends AbstractExtension
                $converter = new GithubFlavoredMarkdownConverter(
                    [
                        'allow_unsafe_links' => false,
-                        'max_nesting_level'  => 3,
+                        'max_nesting_level'  => 5,
                        'html_input'         => 'escape',
                    ]
                );
--- a/app/Transformers/AttachmentTransformer.php
+++ b/app/Transformers/AttachmentTransformer.php
@@ -53,7 +53,7 @@ class AttachmentTransformer extends AbstractTransformer
            'created_at'      => $attachment->created_at->toAtomString(),
            'updated_at'      => $attachment->updated_at->toAtomString(),
            'attachable_id'   => (string)$attachment->attachable_id,
-            'attachable_type' => str_replace('FireflyIII\\Models\\', '', $attachment->attachable_type),
+            'attachable_type' => str_replace('FireflyIII\Models\\', '', $attachment->attachable_type),
            'md5'             => $attachment->md5,
            'filename'        => $attachment->filename,
            'download_url'    => route('api.v1.attachments.download', [$attachment->id]),
--- a/app/Validation/GroupValidation.php
+++ b/app/Validation/GroupValidation.php
@@ -106,7 +106,13 @@ trait GroupValidation
            'source_id', 'source_name', 'source_number', 'source_iban',
            'destination_id', 'destination_name', 'destination_number', 'destination_iban',
        ];
+
+        // stop protesting when reconciliation is set to FALSE.
+
        foreach ($data['transactions'] as $index => $row) {
+            if (false === ($row['reconciled'] ?? false)) {
+                continue;
+            }
            foreach ($forbidden as $key) {
                if (array_key_exists($key, $row)) {
                    $validator->errors()->add(
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.1.17 - 2024-06-16
+
+### Added
+
+- New routine that calculates account balances, first start could take a while.
+
+### Removed
+
+- Removed auto-generated language files.
+
+### Fixed
+
+- [Issue 8907](https://github.com/firefly-iii/firefly-iii/issues/8907) (Error when adding initial balance: bcadd(): Argument #2 ($num2) must be of type string, int given) reported by @wnklmnn
+- [Issue 8911](https://github.com/firefly-iii/firefly-iii/issues/8911) (Docker container startup very slow) reported by @daften
+- [PR 8929](https://github.com/firefly-iii/firefly-iii/pull/8929) (icon title chgd from Deposit to Transfer) reported by @stevewasiura
+- [PR 8930](https://github.com/firefly-iii/firefly-iii/pull/8930) (icon title chgd from Deposit to Transfer) reported by @stevewasiura
+- [PR 8951](https://github.com/firefly-iii/firefly-iii/pull/8951) (add icon for delete action) reported by @stevewasiura
+- [PR 8957](https://github.com/firefly-iii/firefly-iii/pull/8957) (Remove nesting level for markdown) reported by @JeroenED
+- [Issue 8958](https://github.com/firefly-iii/firefly-iii/issues/8958) (Weird line appears above the UI when clicking on matching transactions for a rule) reported by @avee87
+- [Issue 8893](https://github.com/firefly-iii/firefly-iii/issues/8893) (API: `reconciled: false` does not have precedence) reported by @dreautall
+- [Issue 8954](https://github.com/firefly-iii/firefly-iii/issues/8954) (Wrong calculation of transaction without category) reported by @anarion80
+- [Issue 8927](https://github.com/firefly-iii/firefly-iii/issues/8927) (Converting deposit to transfer can set incorrect transaction currency) reported by @avee87
+- Various issues in release train.
+- There is a confirmation again before you delete data using the page in your profile
+
+### Security
+
+- Two (undisclosed) MFA bypass errors, reported by @Skelmis. Disclosure will follow in a few weeks.
+
+### API
+
+- Expand v2 chart API
+
 ## 6.1.16 - 2024-05-20

 ### Added
--- a/composer.lock
+++ b/composer.lock
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -117,7 +117,7 @@ return [
        'expression_engine' => false,
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-06-03',
+    'version'                      => 'develop/2024-06-15',
    'api_version'                  => '2.1.0',
    'db_version'                   => 24,

--- a/database/seeders/TransactionCurrencySeeder.php
+++ b/database/seeders/TransactionCurrencySeeder.php
@@ -42,6 +42,7 @@ class TransactionCurrencySeeder extends Seeder
        $currencies[] = ['code' => 'PLN', 'name' => 'Polish złoty', 'symbol' => 'zł', 'decimal_places' => 2];
        $currencies[] = ['code' => 'TRY', 'name' => 'Turkish lira', 'symbol' => '₺', 'decimal_places' => 2];
        $currencies[] = ['code' => 'DKK', 'name' => 'Dansk krone', 'symbol' => 'kr.', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'RON', 'name' => 'Romanian leu', 'symbol' => 'lei', 'decimal_places' => 2];

        // american currencies
        $currencies[] = ['code' => 'USD', 'name' => 'US Dollar', 'symbol' => '$', 'decimal_places' => 2];
--- a/package-lock.json
+++ b/package-lock.json
--- a/resources/views/accounts/reconcile/transactions.twig
+++ b/resources/views/accounts/reconcile/transactions.twig
@@ -63,6 +63,8 @@
                <div class="btn-group btn-group-xs">
                    <a href="{{ route('transactions.edit', [journal.transaction_group_id]) }}" class="btn btn-xs btn-default"><span
                                class="fa fa-fw fa-pencil"></span></a>
+                    <a href="{{ route('transactions.delete', [journal.transaction_group_id]) }}" class="btn btn-danger"><span
+                                class="fa fa-trash"></span></a>
                </div>

            </td>
--- a/routes/api.php
+++ b/routes/api.php
@@ -615,7 +615,9 @@ Route::group(
        Route::delete('{recurrence}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);

        Route::get('{recurrence}/transactions', ['uses' => 'ListController@transactions', 'as' => 'transactions']);
-        Route::post('trigger', ['uses' => 'RecurrenceController@trigger', 'as' => 'trigger']);
+
+        // controller does not exist:
+        // Route::post('trigger', ['uses' => 'RecurrenceController@trigger', 'as' => 'trigger']);
    }
 );

--- a/routes/web.php
+++ b/routes/web.php
@@ -25,6 +25,38 @@ if (!defined('DATEFORMAT')) {
    define('DATEFORMAT', '(19|20)[0-9]{2}-?[0-9]{2}-?[0-9]{2}');
 }

+// laravel passport routes
+Route::group(
+    [
+        'as'        => 'passport.',
+        'prefix'    => config('passport.path', 'oauth'),
+        'namespace' => '\Laravel\Passport\Http\Controllers',
+    ],
+    function (): void {
+        // routes with no extra middleware
+        Route::post('/token', ['uses' => 'AccessTokenController@issueToken', 'as' => 'token', 'middleware' => 'throttle']);
+        Route::get('/authorize', ['uses' => 'AuthorizationController@authorize', 'as' => 'authorizations.authorize', 'middleware' => 'user-full-auth']);
+
+        // the rest
+        $guard = config('passport.guard', null);
+        Route::middleware(['web', $guard ? 'auth:'.$guard : 'auth'])->group(function (): void {
+            Route::post('/token/refresh', ['uses' => 'TransientTokenController@refresh', 'as' => 'token.refresh']);
+            Route::post('/authorize', ['uses' => 'ApproveAuthorizationController@approve', 'as' => 'authorizations.approve']);
+            Route::delete('/authorize', ['uses' => 'DenyAuthorizationController@deny', 'as' => 'authorizations.deny']);
+            Route::get('/tokens', ['uses' => 'AuthorizedAccessTokenController@forUser', 'as' => 'tokens.index']);
+            Route::delete('/tokens/{token_id}', ['uses' => 'AuthorizedAccessTokenController@destroy', 'as' => 'tokens.destroy']);
+            Route::get('/clients', ['uses' => 'ClientController@forUser', 'as' => 'clients.index']);
+            Route::post('/clients', ['uses' => 'ClientController@store', 'as' => 'clients.store']);
+            Route::put('/clients/{client_id}', ['uses' => 'ClientController@update', 'as' => 'clients.update']);
+            Route::delete('/clients/{client_id}', ['uses' => 'ClientController@destroy', 'as'   => 'clients.destroy']);
+            Route::get('/scopes', ['uses' => 'ScopeController@all', 'as'   => 'scopes.index']);
+            Route::get('/personal-access-tokens', ['uses' => 'PersonalAccessTokenController@forUser', 'as'   => 'personal.tokens.index']);
+            Route::post('/personal-access-tokens', ['uses' => 'PersonalAccessTokenController@store', 'as'   => 'personal.tokens.store']);
+            Route::delete('/personal-access-tokens/{token_id}', ['uses' => 'PersonalAccessTokenController@destroy', 'as'   => 'personal.tokens.destroy']);
+        });
+    }
+);
+
 Route::group(
    [
        'namespace' => 'FireflyIII\Http\Controllers\System',
@@ -726,7 +758,7 @@ Route::group(
        Route::get('frontpage/piggy-banks', ['uses' => 'Json\FrontpageController@piggyBanks', 'as' => 'fp.piggy-banks']);

        // currency conversion:
-        Route::get('rate/{fromCurrencyCode}/{toCurrencyCode}/{date}', ['uses' => 'Json\ExchangeController@getRate', 'as' => 'rate']);
+        // Route::get('rate/{fromCurrencyCode}/{toCurrencyCode}/{date}', ['uses' => 'Json\ExchangeController@getRate', 'as' => 'rate']);

        // intro things:
        Route::post('intro/finished/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postFinished', 'as' => 'intro.finished']);
@@ -1355,7 +1387,7 @@ Route::group(
        Route::get('', ['uses' => 'UserGroup\IndexController@index', 'as' => 'index']);
        Route::get('create', ['uses' => 'UserGroup\CreateController@create', 'as' => 'create']);
        Route::get('edit/{userGroup}', ['uses' => 'UserGroup\EditController@edit', 'as' => 'edit']);
-        Route::get('show/{userGroup}', ['uses' => 'UserGroup\ShowController@show', 'as' => 'show']);
+        // Route::get('show/{userGroup}', ['uses' => 'UserGroup\ShowController@show', 'as' => 'show']);

        //        Route::post('rescan/{bill}', ['uses' => 'Bill\ShowController@rescan', 'as' => 'rescan']);
        //        Route::get('delete/{bill}', ['uses' => 'Bill\DeleteController@delete', 'as' => 'delete']);
Author	SHA1	Message	Date
github-actions	a1a8968e98	Auto commit for release 'develop' on 2024-06-15	2024-06-15 16:16:40 +02:00
James Cole	6abb74a038	Mondays only [skip ci]	2024-06-15 14:26:59 +02:00
github-actions	2d7d05e985	Auto commit for release 'v6.1.17' on 2024-06-15	2024-06-15 13:07:23 +02:00
github-actions	d426e09474	Merge branch 'develop'	2024-06-15 11:04:29 +00:00
James Cole	72d55cb953	Revert workflow change.	2024-06-15 13:02:53 +02:00
James Cole	73ad865581	Add changelog.	2024-06-15 12:56:41 +02:00
James Cole	fefb52beb7	Weekly develop	2024-06-15 12:50:15 +02:00
James Cole	abd503543b	Fix regression error in cookie queue	2024-06-15 12:33:56 +02:00
James Cole	e3eb550581	Add currency because why not.	2024-06-15 09:42:09 +02:00
James Cole	46b780758e	Fix https://github.com/firefly-iii/firefly-iii/issues/8927	2024-06-15 09:38:19 +02:00
James Cole	b2c3ee9779	Fix https://github.com/firefly-iii/firefly-iii/issues/8954	2024-06-15 09:29:40 +02:00
James Cole	dca899bcee	Fix https://github.com/firefly-iii/firefly-iii/issues/8893	2024-06-15 09:25:41 +02:00
James Cole	9667b8a948	Fix https://github.com/firefly-iii/firefly-iii/issues/8958	2024-06-15 09:17:41 +02:00
James Cole	661f225fe7	Add custom routes for Laravel passport.	2024-06-15 09:15:48 +02:00
github-actions	4c6fe0c8de	Auto commit for release 'develop' on 2024-06-13	2024-06-13 05:08:55 +02:00
James Cole	78f457950e	Merge pull request #8957 from JeroenED/unlimited-nesting-level Remove nesting level for markdown	2024-06-11 15:17:43 +02:00
Jeroen De Meerleer	d831cc8df2	Update max nesting level for Markdown converter Increased the max nesting level to 5 for better parsing.	2024-06-11 15:04:15 +02:00
James Cole	7056406afc	Merge pull request #8951 from stevewasiura/patch-3 add icon for delete action	2024-06-11 15:03:09 +02:00
github-actions	c85cfcf3e6	Auto commit for release 'develop' on 2024-06-10	2024-06-10 05:09:13 +02:00
Jeroen De Meerleer	db06d06789	Remove unnecessary option from Markdown converter The 'max_nesting_level' option was removed from the Markdown converter configuration in order to simplify and optimize the code.	2024-06-07 09:05:38 +02:00
github-actions	a28b990cd1	Auto commit for release 'develop' on 2024-06-06	2024-06-06 05:09:02 +02:00
Steve Wasiura	dab4bfa7a6	add icon for delete action in workflow of reconciling account, sometimes a record needs to be deleted (i.e. in event of a duplicated transaction from an import or error) and this change adds an icon to the delete route Signed-off-by: Steve Wasiura <steve@waztech.com>	2024-06-03 22:09:22 -04:00
James Cole	6575236f2b	Merge pull request #8949 from firefly-iii/dependabot/github_actions/crowdin/github-action-2 Bump crowdin/github-action from 1 to 2	2024-06-03 07:34:04 +02:00
dependabot[bot]	ad582c8806	Bump crowdin/github-action from 1 to 2 Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1 to 2. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](https://github.com/crowdin/github-action/compare/v1...v2) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-03 03:59:42 +00:00
James Cole	99ed54fce8	Revert steps	2024-05-30 05:45:04 +02:00