Merge pull request #10868 from firefly-iii/release-1757235851

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/composer.lock

@@ -151,16 +151,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.4.3",
+            "version": "3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
-                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
                 "shasum": ""
             },
             "require": {
@@ -212,7 +212,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.3"
+                "source": "https://github.com/composer/semver/tree/3.4.4"
             },
             "funding": [
                 {
@@ -222,13 +222,9 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-09-19T14:15:21+00:00"
+            "time": "2025-08-20T19:15:30+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -406,16 +402,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.86.0",
+            "version": "v3.87.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "4a952bd19dc97879b0620f495552ef09b55f7d36"
+                "reference": "2f5170365e2a422d0c5421f9c8818b2c078105f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/4a952bd19dc97879b0620f495552ef09b55f7d36",
-                "reference": "4a952bd19dc97879b0620f495552ef09b55f7d36",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2f5170365e2a422d0c5421f9c8818b2c078105f6",
+                "reference": "2f5170365e2a422d0c5421f9c8818b2c078105f6",
                 "shasum": ""
             },
             "require": {
@@ -426,39 +422,38 @@
                 "ext-hash": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "fidry/cpu-core-counter": "^1.2",
+                "fidry/cpu-core-counter": "^1.3",
                 "php": "^7.4 || ^8.0",
                 "react/child-process": "^0.6.6",
                 "react/event-loop": "^1.5",
-                "react/promise": "^3.2",
+                "react/promise": "^3.3",
                 "react/socket": "^1.16",
                 "react/stream": "^1.4",
                 "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
-                "symfony/console": "^5.4.47 || ^6.4.13 || ^7.0",
-                "symfony/event-dispatcher": "^5.4.45 || ^6.4.13 || ^7.0",
-                "symfony/filesystem": "^5.4.45 || ^6.4.13 || ^7.0",
-                "symfony/finder": "^5.4.45 || ^6.4.17 || ^7.0",
-                "symfony/options-resolver": "^5.4.45 || ^6.4.16 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.32",
-                "symfony/polyfill-php80": "^1.32",
-                "symfony/polyfill-php81": "^1.32",
-                "symfony/process": "^5.4.47 || ^6.4.20 || ^7.2",
-                "symfony/stopwatch": "^5.4.45 || ^6.4.19 || ^7.0"
+                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.33",
+                "symfony/polyfill-php80": "^1.33",
+                "symfony/polyfill-php81": "^1.33",
+                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2",
+                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.6",
+                "facile-it/paraunit": "^1.3.1 || ^2.7",
                 "infection/infection": "^0.29.14",
-                "justinrainbow/json-schema": "^5.3 || ^6.4",
+                "justinrainbow/json-schema": "^6.5",
                 "keradus/cli-executor": "^2.2",
                 "mikey179/vfsstream": "^1.6.12",
                 "php-coveralls/php-coveralls": "^2.8",
-                "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.23 || ^10.5.47 || ^11.5.25",
-                "symfony/polyfill-php84": "^1.32",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.23 || ^7.3.1",
-                "symfony/yaml": "^5.4.45 || ^6.4.23 || ^7.3.1"
+                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+                "symfony/polyfill-php84": "^1.33",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2",
+                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -499,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.86.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.87.1"
             },
             "funding": [
                 {
@@ -507,7 +502,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-13T22:36:21+00:00"
+            "time": "2025-09-02T15:27:36+00:00"
         },
         {
             "name": "psr/container",
@@ -959,23 +954,23 @@
         },
         {
             "name": "react/promise",
-            "version": "v3.2.0",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "8a164643313c71354582dc850b42b33fa12a4b63"
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
-                "reference": "8a164643313c71354582dc850b42b33fa12a4b63",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.10.39 || 1.4.10",
+                "phpstan/phpstan": "1.12.28 || 1.4.10",
                 "phpunit/phpunit": "^9.6 || ^7.5"
             },
             "type": "library",
@@ -1020,7 +1015,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v3.2.0"
+                "source": "https://github.com/reactphp/promise/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -1028,7 +1023,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-05-24T10:39:05+00:00"
+            "time": "2025-08-19T18:57:03+00:00"
         },
         {
             "name": "react/socket",
@@ -1257,16 +1252,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1"
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
                 "shasum": ""
             },
             "require": {
@@ -1331,7 +1326,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.2"
+                "source": "https://github.com/symfony/console/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -1351,7 +1346,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-30T17:13:41+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1422,16 +1417,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d"
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
                 "shasum": ""
             },
             "require": {
@@ -1482,7 +1477,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.3.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -1493,12 +1488,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-22T09:11:45+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1716,16 +1715,16 @@
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37"
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/119bcf13e67dbd188e5dbc74228b1686f66acd37",
-                "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
                 "shasum": ""
             },
             "require": {
@@ -1763,7 +1762,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.3.2"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -1783,11 +1782,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T11:36:08+00:00"
+            "time": "2025-08-05T10:16:07+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1846,7 +1845,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -1857,6 +1856,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -1866,16 +1869,16 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
                 "shasum": ""
             },
             "require": {
@@ -1924,7 +1927,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -1935,16 +1938,20 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-06-27T09:58:17+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -2005,7 +2012,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -2016,6 +2023,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -2025,7 +2036,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -2086,7 +2097,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -2097,6 +2108,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -2106,7 +2121,7 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -2166,7 +2181,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -2177,6 +2192,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -2186,7 +2205,7 @@
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -2242,7 +2261,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -2253,6 +2272,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -2262,16 +2285,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af"
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
+                "url": "https://api.github.com/repos/symfony/process/zipball/32241012d521e2e8a9d713adb0812bb773b907f1",
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1",
                 "shasum": ""
             },
             "require": {
@@ -2303,7 +2326,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.3.0"
+                "source": "https://github.com/symfony/process/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -2314,12 +2337,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-17T09:11:12+00:00"
+            "time": "2025-08-18T09:42:54+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -2468,16 +2495,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
+                "url": "https://api.github.com/repos/symfony/string/zipball/17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
                 "shasum": ""
             },
             "require": {
@@ -2535,7 +2562,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.2"
+                "source": "https://github.com/symfony/string/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -2555,7 +2582,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
         }
     ],
     "packages-dev": [],

.ci/phpstan.neon

@@ -1,6 +1,4 @@
 parameters:
-  scanFiles:
-    - ../_ide_helper
   paths:
     - ../app
     - ../database
@@ -13,8 +11,6 @@ parameters:
   reportUnmatchedIgnoredErrors: true
   ignoreErrors:
   # TODO: slowly remove these exceptions and fix the issues found.
-    - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
-    - identifier: varTag.nativeType
     - identifier: varTag.type
     -
         identifier: larastan.noEnvCallsOutsideOfConfig
@@ -26,11 +22,11 @@ parameters:
     - '#expects view-string\|null, string given#'
 
     # phpstan can't handle this so we ignore them.
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::before#'
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::after#'
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#'
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::accountTypeIn#'
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\BelongsTo::withTrashed#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::before#' # is custom scope
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::after#' # is custom scope
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#' # is to allow soft delete
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::accountTypeIn#' # is a custom scope
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\BelongsTo::withTrashed#' # is to allow soft delete
 
   # The level 8 is the highest level. original was 5
   # 7 is more than enough, higher just leaves NULL things.

.github/label-actions.yml

@@ -25,7 +25,7 @@ feature:
 
       This issue has been marked as a feature request.
 
-      If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
+      If you come across this issue, please be aware there is NO need to reply with "+1" or "I need this too" or "any updates?" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
 
       Thank you for your contributions.
 
@@ -39,7 +39,7 @@ epic:
 
       This issue has been marked as an epic. In epics, large amounts of works are collected that will be part of a major new feature. If you have more ideas that could be a part of this epic, feel free to reply.
 
-      *However*, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted.
+      *However*, please be aware there is NO need to reply with "+1" or "I need this too" or "any updates?" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted.
 
       If you are merely interested in this epic's progress, you can subscribe to this issue to get updates.
 
@@ -56,7 +56,7 @@ enhancement:
 
       This issue has been marked as an enhancement.
 
-      If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
+      If you come across this issue, please be aware there is NO need to reply with "+1" or "I need this too" or "any updates?" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
 
       Thank you for your contributions.
 

.github/release-notes/alpha.md

@@ -1,6 +1,7 @@
 Welcome to release %version of Firefly III. This **alpha** release contains the latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `alpha` tag.
 
-:warning: Please be careful with this alpha release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this alpha release, as it may not work as expected.
 
 Alpha releases are created to test new features and fixes before they are included in a stable release. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 
@@ -15,6 +16,10 @@ Alpha releases are created to test new features and fixes before they are includ
 
 The release files are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
 
+## Develop with Firefly III
+
+Are you interested in (future) API changes to Firefly III, or other interesting dev-related updates? Sign up to the [Firefly III developer newsletter](https://firefly-iii.kit.com/dev) to receive low-frequency updates about the development of Firefly III.
+
 ## Support Firefly III
 
 Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/beta.md

@@ -1,6 +1,7 @@
 Welcome to release %version of Firefly III. This **beta** release contains the latest fixes, translations and features. It may be buggy, nor work as expected. You can download the release below, and adventurous Docker users can find this release under the `beta` tag.
 
-:warning: Please be careful with this beta release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this beta release, as it may not work as expected.
 
 Alpha releases are created to test new features and fixes before they are included in a stable release. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 
@@ -15,6 +16,10 @@ Alpha releases are created to test new features and fixes before they are includ
 
 The release files are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
 
+## Develop with Firefly III
+
+Are you interested in (future) API changes to Firefly III, or other interesting dev-related updates? Sign up to the [Firefly III developer newsletter](https://firefly-iii.kit.com/dev) to receive low-frequency updates about the development of Firefly III.
+
 ## Support Firefly III
 
 Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/branch.md

@@ -1,6 +1,7 @@
 Welcome to release %version of Firefly III. This branch-related release contains the latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `branch-*` tag.
 
-:warning: Please be careful with this branch release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this branch release, as it may not work as expected.
 
 Branch releases are created to test large new features that are developed alongside the normal release flow. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 
@@ -15,6 +16,10 @@ There is no changelog for this release, as it is not final. However, [changelog.
 
 The release files are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
 
+## Develop with Firefly III
+
+Are you interested in (future) API changes to Firefly III, or other interesting dev-related updates? Sign up to the [Firefly III developer newsletter](https://firefly-iii.kit.com/dev) to receive low-frequency updates about the development of Firefly III.
+
 ## Support Firefly III
 
 Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/develop.md

@@ -1,6 +1,7 @@
 Welcome to the latest development release of Firefly III. This test release contains the absolute latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `develop` tag.
 
-:warning: Please be careful with this pre-release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this pre-release, as it may not work as expected.
 
 This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 
@@ -15,6 +16,10 @@ The changelog for this release may not be up-to-date, so it is not included. How
 
 The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
 
+## Develop with Firefly III
+
+Are you interested in (future) API changes to Firefly III, or other interesting dev-related updates? Sign up to the [Firefly III developer newsletter](https://firefly-iii.kit.com/dev) to receive low-frequency updates about the development of Firefly III.
+
 ## Support Firefly III
 
 Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/release.md

@@ -11,6 +11,10 @@ Welcome to release %version of Firefly III. It contains the latest fixes, transl
 
 The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
 
+## Develop with Firefly III
+
+Are you interested in (future) API changes to Firefly III, or other interesting dev-related updates? Sign up to the [Firefly III developer newsletter](https://firefly-iii.kit.com/dev) to receive low-frequency updates about the development of Firefly III.
+
 ## Support Firefly III
 
 Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/workflows/depsreview.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: 'Dependency review'

.github/workflows/lock.yml

@@ -21,7 +21,7 @@ jobs:
       discussions: write
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: JC5/lock-threads@v6.0.6
         with:
           issue-inactive-days: 21
           pr-inactive-days: 21

.github/workflows/release.yml

@@ -50,7 +50,7 @@ jobs:
           git pull
           echo "Current branch is $(git branch --show-current)"
         env:
-          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+          version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Configure Git
         run: |
           # do some configuration
@@ -118,7 +118,7 @@ jobs:
         env:
           FIREFLY_III_ROOT: /github/workspace
           GH_TOKEN: ""
-          FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+          FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Generate JSON v1
         id: json-v1
         uses: JC5/firefly-iii-dev@main
@@ -221,7 +221,7 @@ jobs:
           echo "tarName=$tarName" >> "$GITHUB_ENV"
           echo "BRANCH_NAME=$BRANCH_NAME" >> "$GITHUB_ENV"
         env:
-          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+          version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Commit all changes
         run: |
           # add all content, except output.txt (this contains the changelog and/or the download instructions)
@@ -232,12 +232,12 @@ jobs:
           git commit -m "🤖 Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
           git push
         env:
-          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+          version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Generate release description
         id: release-description
         uses: JC5/firefly-iii-dev@main
         with:
-          action: "ff3:generate-release-notes firefly-iii ${{ github.event.inputs.version }}"
+          action: "ff3:generate-release-notes firefly-iii ${{ inputs.version || 'develop' }}"
           output: 'output'
         env:
           FIREFLY_III_ROOT: /github/workspace
@@ -291,7 +291,7 @@ jobs:
           echo "DONE!"
         env:
           GH_TOKEN: ${{ github.token }}
-          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+          version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Create archives
         run: |
           echo "Create zip file $zipName"
@@ -375,7 +375,7 @@ jobs:
           fi
         env:
           GH_TOKEN: ${{ github.token }}
-          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+          version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Upload artifacts
         run: |
           # add zip file to release.
@@ -411,4 +411,4 @@ jobs:
           rm -f $tarName.sha256
         env:
           GH_TOKEN: ${{ github.token }}
-          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+          version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -34,7 +35,6 @@ use FireflyIII\Support\Debug\Timer;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 
@@ -46,7 +46,8 @@ class AccountController extends Controller
     use AccountFilter;
 
     // this array only exists to test if the constructor will use it properly.
-    protected array $accepts = ['application/json', 'application/vnd.api+json'];
+    protected array $accepts       = ['application/json', 'application/vnd.api+json'];
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /** @var array<int, string> */
     private array                      $balanceTypes;
@@ -60,10 +61,10 @@ class AccountController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
@@ -113,6 +114,7 @@ class AccountController extends Controller
                 'id'                              => (string) $account->id,
                 'name'                            => $account->name,
                 'name_with_balance'               => $nameWithBalance,
+                'active'                          => $account->active,
                 'type'                            => $account->accountType->type,
                 'currency_id'                     => (string) $useCurrency->id,
                 'currency_name'                   => $useCurrency->name,

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class BillController extends Controller
 {
     private BillRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_SUBSCRIPTIONS];
 
     /**
      * BillController constructor.
@@ -46,10 +47,10 @@ class BillController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class BudgetController extends Controller
 {
     private BudgetRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_BUDGETS];
 
     /**
      * BudgetController constructor.
@@ -46,10 +47,10 @@ class BudgetController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(BudgetRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
@@ -66,8 +67,9 @@ class BudgetController extends Controller
         $result   = $this->repository->searchBudget($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
             static fn (Budget $item) => [
-                'id'   => (string) $item->id,
-                'name' => $item->name,
+                'id'     => (string) $item->id,
+                'name'   => $item->name,
+                'active' => $item->active,
             ]
         );
 

app/Api/V1/Controllers/Autocomplete/CategoryController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class CategoryController extends Controller
 {
     private CategoryRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * CategoryController constructor.
@@ -46,10 +47,10 @@ class CategoryController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/CurrencyController.php

@@ -27,9 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 use Deprecated;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -38,6 +38,7 @@ use Illuminate\Http\JsonResponse;
 class CurrencyController extends Controller
 {
     private CurrencyRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * CurrencyController constructor.
@@ -47,10 +48,10 @@ class CurrencyController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class ObjectGroupController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * CurrencyController constructor.
@@ -46,10 +47,10 @@ class ObjectGroupController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(ObjectGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/PiggyBankController.php

@@ -26,10 +26,10 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -39,6 +39,7 @@ class PiggyBankController extends Controller
 {
     private AccountRepositoryInterface   $accountRepository;
     private PiggyBankRepositoryInterface $piggyRepository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_PIGGY_BANKS];
 
     /**
      * PiggyBankController constructor.
@@ -48,22 +49,19 @@ class PiggyBankController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user                    = auth()->user();
+                $this->validateUserGroup($request);
                 $this->piggyRepository   = app(PiggyBankRepositoryInterface::class);
                 $this->accountRepository = app(AccountRepositoryInterface::class);
-                $this->piggyRepository->setUser($user);
-                $this->accountRepository->setUser($user);
+                $this->piggyRepository->setUser($this->user);
+                $this->piggyRepository->setUserGroup($this->userGroup);
+                $this->accountRepository->setUser($this->user);
+                $this->accountRepository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesAC
-     */
     public function piggyBanks(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
@@ -90,10 +88,6 @@ class PiggyBankController extends Controller
         return response()->api($response);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesBalanceAC
-     */
     public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();

app/Api/V1/Controllers/Autocomplete/RecurrenceController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class RecurrenceController extends Controller
 {
     private RecurringRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_RECURRING];
 
     /**
      * RecurrenceController constructor.
@@ -45,19 +47,16 @@ class RecurrenceController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(RecurringRepositoryInterface::class);
-
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRecurringAC
-     */
     public function recurring(AutocompleteRequest $request): JsonResponse
     {
         $data        = $request->getData();
@@ -70,6 +69,7 @@ class RecurrenceController extends Controller
                 'id'          => (string) $recurrence->id,
                 'name'        => $recurrence->title,
                 'description' => $recurrence->description,
+                'active'      => $recurrence->active,
             ];
         }
 

app/Api/V1/Controllers/Autocomplete/RuleController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Rule;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class RuleController extends Controller
 {
     private RuleRepositoryInterface $repository;
+    protected array                 $acceptedRoles = [UserRoleEnum::READ_RULES];
 
     /**
      * RuleController constructor.
@@ -45,18 +47,16 @@ class RuleController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(RuleRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRulesAC
-     */
     public function rules(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
@@ -66,9 +66,10 @@ class RuleController extends Controller
         /** @var Rule $rule */
         foreach ($rules as $rule) {
             $response[] = [
-                'id'          => (string) $rule->id,
+                'id'          => (string)$rule->id,
                 'name'        => $rule->title,
                 'description' => $rule->description,
+                'active'      => $rule->active,
             ];
         }
 

app/Api/V1/Controllers/Autocomplete/RuleGroupController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class RuleGroupController extends Controller
 {
     private RuleGroupRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_RULES];
 
     /**
      * RuleGroupController constructor.
@@ -45,18 +47,16 @@ class RuleGroupController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(RuleGroupRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRuleGroupsAC
-     */
     public function ruleGroups(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
@@ -69,6 +69,7 @@ class RuleGroupController extends Controller
                 'id'          => (string) $group->id,
                 'name'        => $group->title,
                 'description' => $group->description,
+                'active'      => $group->active,
             ];
         }
 

app/Api/V1/Controllers/Autocomplete/TagController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * TagController constructor.
@@ -46,20 +47,16 @@ class TagController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(TagRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTagAC
-     */
     public function tags(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();

app/Api/V1/Controllers/Autocomplete/TransactionController.php

@@ -31,7 +31,6 @@ use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 
@@ -52,24 +51,19 @@ class TransactionController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user                  = auth()->user();
-                $userGroup             = $this->validateUserGroup($request);
+                $this->validateUserGroup($request);
                 $this->repository      = app(JournalRepositoryInterface::class);
                 $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
-                $this->groupRepository->setUser($user);
-                $this->groupRepository->setUserGroup($userGroup);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
+                $this->groupRepository->setUser($this->user);
+                $this->groupRepository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsAC
-     */
     public function transactions(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
@@ -92,10 +86,6 @@ class TransactionController extends Controller
         return response()->api($array);
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsIDAC
-     */
     public function transactionsWithID(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();

app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class TransactionTypeController extends Controller
 {
     private TransactionTypeRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * TransactionTypeController constructor.
@@ -45,6 +47,7 @@ class TransactionTypeController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(TransactionTypeRepositoryInterface::class);
 
                 return $next($request);
@@ -52,10 +55,6 @@ class TransactionTypeController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionTypesAC
-     */
     public function transactionTypes(AutocompleteRequest $request): JsonResponse
     {
         $data  = $request->getData();

app/Api/V1/Controllers/Chart/AccountController.php

@@ -26,17 +26,14 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
-use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Chart\ChartData;
-use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ApiSupport;
+use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
@@ -47,11 +44,12 @@ use Illuminate\Support\Facades\Log;
 class AccountController extends Controller
 {
     use ApiSupport;
+    use CleansChartData;
     use CollectsAccountsFromFilter;
 
-    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles            = [UserRoleEnum::READ_ONLY];
 
-    private ChartData                  $chartData;
+    private array                  $chartData = [];
     private AccountRepositoryInterface $repository;
 
     /**
@@ -62,11 +60,10 @@ class AccountController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $this->chartData  = new ChartData();
                 $this->repository = app(AccountRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
+                $this->validateUserGroup($request);
+                $this->repository->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
 
                 return $next($request);
             }
@@ -84,7 +81,7 @@ class AccountController extends Controller
         // move date to end of day
         $queryParameters['start']->startOfDay();
         $queryParameters['end']->endOfDay();
-        Log::debug(sprintf('dashboard(), convert to primary: %s', var_export($this->convertToPrimary, true)));
+        // Log::debug(sprintf('dashboard(), convert to primary: %s', var_export($this->convertToPrimary, true)));
 
         // loop each account, and collect info:
         /** @var Account $account */
@@ -93,7 +90,7 @@ class AccountController extends Controller
             $this->renderAccountData($queryParameters, $account);
         }
 
-        return response()->json($this->chartData->render());
+        return response()->json($this->clean($this->chartData));
     }
 
     /**
@@ -102,17 +99,17 @@ class AccountController extends Controller
     private function renderAccountData(array $params, Account $account): void
     {
         Log::debug(sprintf('Now in %s(array, #%d)', __METHOD__, $account->id));
-        $currency     = $this->repository->getAccountCurrency($account);
-        $currentStart = clone $params['start'];
-        $range        = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);
+        $currency          = $this->repository->getAccountCurrency($account);
+        $currentStart      = clone $params['start'];
+        $range             = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);
 
 
-        $previous     = array_values($range)[0]['balance'];
-        $pcPrevious   = null;
+        $previous          = array_values($range)[0]['balance'];
+        $pcPrevious        = null;
         if (!$currency instanceof TransactionCurrency) {
-            $currency = $this->default;
+            $currency = $this->primaryCurrency;
         }
-        $currentSet   = [
+        $currentSet        = [
             'label'                   => $account->name,
 
             // the currency that belongs to the account.
@@ -133,6 +130,7 @@ class AccountController extends Controller
             'yAxisID'                 => 0,
             'period'                  => '1D',
             'entries'                 => [],
+            'pc_entries'              => [],
         ];
         if ($this->convertToPrimary) {
             $currentSet['pc_entries']                      = [];
@@ -162,21 +160,6 @@ class AccountController extends Controller
 
             $currentStart->addDay();
         }
-        $this->chartData->add($currentSet);
-    }
-
-    private function getFrontPageAccountIds(): array
-    {
-        $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
-
-        /** @var Preference $frontpage */
-        $frontpage  = Preferences::get('frontpageAccounts', $defaultSet);
-
-        if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) {
-            $frontpage->data = $defaultSet;
-            $frontpage->save();
-        }
-
-        return $frontpage->data ?? $defaultSet;
+        $this->chartData[] = $currentSet;
     }
 }

app/Api/V1/Controllers/Chart/BalanceController.php

@@ -1,5 +1,26 @@
 <?php
 
+
+/*
+ * BalanceController.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Chart;
@@ -25,9 +46,9 @@ class BalanceController extends Controller
 {
     use CleansChartData;
     use CollectsAccountsFromFilter;
-    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles            = [UserRoleEnum::READ_ONLY];
 
-    private array                  $chartData;
+    private array                  $chartData = [];
     private GroupCollectorInterface    $collector;
     private AccountRepositoryInterface $repository;
 
@@ -38,13 +59,13 @@ class BalanceController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->collector  = app(GroupCollectorInterface::class);
-                $userGroup        = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
-                $this->collector->setUserGroup($userGroup);
-                $this->chartData  = [];
-                // $this->default    = app('amount')->getPrimaryCurrency();
+                $this->repository->setUserGroup($this->userGroup);
+                $this->collector->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
+                $this->collector->setUser($this->user);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
@@ -55,7 +55,6 @@ class BudgetController extends Controller
     protected OperationsRepositoryInterface $opsRepository;
     private BudgetLimitRepositoryInterface  $blRepository;
     private array                           $currencies = [];
-    private TransactionCurrency             $currency;
     private BudgetRepositoryInterface       $repository;
 
     public function __construct()
@@ -63,13 +62,16 @@ class BudgetController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository    = app(BudgetRepositoryInterface::class);
                 $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $userGroup           = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
-                $this->opsRepository->setUserGroup($userGroup);
-                $this->blRepository->setUserGroup($userGroup);
+                $this->repository->setUserGroup($this->userGroup);
+                $this->opsRepository->setUserGroup($this->userGroup);
+                $this->blRepository->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
+                $this->opsRepository->setUser($this->user);
+                $this->blRepository->setUser($this->user);
 
                 return $next($request);
             }
@@ -81,7 +83,7 @@ class BudgetController extends Controller
      *
      * @throws FireflyException
      */
-    public function overview(DateRequest $request): JsonResponse
+    public function overview(SameDateRequest $request): JsonResponse
     {
         $params  = $request->getAll();
 
@@ -157,12 +159,6 @@ class BudgetController extends Controller
         }
 
 
-        // if no limits
-        //        if (0 === $limits->count()) {
-        //             return as a single item in an array
-        //            $rows = $this->noBudgetLimits($budget, $start, $end);
-        //        }
-
         // is always an array
         $return     = [];
         foreach ($rows as $row) {
@@ -193,9 +189,9 @@ class BudgetController extends Controller
                 ],
                 'pc_entries'                      => [
                     'budgeted'  => $row['pc_budgeted'],
-                    'spent'     => '0',
-                    'left'      => '0',
-                    'overspent' => '0',
+                    'spent'     => $row['pc_spent'],
+                    'left'      => $row['pc_left'],
+                    'overspent' => $row['pc_overspent'],
                 ],
             ];
             $return[] = $current;
@@ -204,18 +200,18 @@ class BudgetController extends Controller
         return $return;
     }
 
-    /**
-     * When no budget limits are present, the expenses of the whole period are collected and grouped.
-     * This is grouped per currency. Because there is no limit set, "left to spend" and "overspent" are empty.
-     *
-     * @throws FireflyException
-     */
-    private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
-    {
-        $spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
-
-        return $this->processExpenses($budget->id, $spent, $start, $end);
-    }
+    //    /**
+    //     * When no budget limits are present, the expenses of the whole period are collected and grouped.
+    //     * This is grouped per currency. Because there is no limit set, "left to spend" and "overspent" are empty.
+    //     *
+    //     * @throws FireflyException
+    //     */
+    //    private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
+    //    {
+    //        $spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
+    //
+    //        return $this->processExpenses($budget->id, $spent, $start, $end);
+    //    }
 
     /**
      * Shared between the "noBudgetLimits" function and "processLimit". Will take a single set of expenses and return
@@ -261,59 +257,59 @@ class BudgetController extends Controller
         return $return;
     }
 
-    /**
-     * Function that processes each budget limit (per budget).
-     *
-     * If you have a budget limit in EUR, only transactions in EUR will be considered.
-     * If you have a budget limit in GBP, only transactions in GBP will be considered.
-     *
-     * If you have a budget limit in EUR, and a transaction in GBP, it will not be considered for the EUR budget limit.
-     *
-     * @throws FireflyException
-     */
-    private function budgetLimits(Budget $budget, Collection $limits): array
-    {
-        Log::debug(sprintf('Now in budgetLimits(#%d)', $budget->id));
-        $data = [];
+    //    /**
+    //     * Function that processes each budget limit (per budget).
+    //     *
+    //     * If you have a budget limit in EUR, only transactions in EUR will be considered.
+    //     * If you have a budget limit in GBP, only transactions in GBP will be considered.
+    //     *
+    //     * If you have a budget limit in EUR, and a transaction in GBP, it will not be considered for the EUR budget limit.
+    //     *
+    //     * @throws FireflyException
+    //     */
+    //    private function budgetLimits(Budget $budget, Collection $limits): array
+    //    {
+    //        Log::debug(sprintf('Now in budgetLimits(#%d)', $budget->id));
+    //        $data = [];
+    //
+    //        /** @var BudgetLimit $limit */
+    //        foreach ($limits as $limit) {
+    //            $data = array_merge($data, $this->processLimit($budget, $limit));
+    //        }
+    //
+    //        return $data;
+    //    }
 
-        /** @var BudgetLimit $limit */
-        foreach ($limits as $limit) {
-            $data = array_merge($data, $this->processLimit($budget, $limit));
-        }
-
-        return $data;
-    }
-
-    /**
-     * @throws FireflyException
-     */
-    private function processLimit(Budget $budget, BudgetLimit $limit): array
-    {
-        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
-        $end             = clone $limit->end_date;
-        $end->endOfDay();
-        $spent           = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
-        $limitCurrencyId = $limit->transaction_currency_id;
-
-        /** @var array $entry */
-        // only spent the entry where the entry's currency matches the budget limit's currency
-        // so $filtered will only have 1 or 0 entries
-        $filtered        = array_filter($spent, fn ($entry) => $entry['currency_id'] === $limitCurrencyId);
-        $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
-        if (1 === count($result)) {
-            $compare                              = bccomp($limit->amount, (string)app('steam')->positive($result[$limitCurrencyId]['spent']));
-            $result[$limitCurrencyId]['budgeted'] = $limit->amount;
-            if (1 === $compare) {
-                // convert this amount into the primary currency:
-                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']);
-            }
-            if ($compare <= 0) {
-                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']));
-            }
-        }
-
-        return $result;
-    }
+    //    /**
+    //     * @throws FireflyException
+    //     */
+    //    private function processLimit(Budget $budget, BudgetLimit $limit): array
+    //    {
+    //        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
+    //        $end             = clone $limit->end_date;
+    //        $end->endOfDay();
+    //        $spent           = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
+    //        $limitCurrencyId = $limit->transaction_currency_id;
+    //
+    //        /** @var array $entry */
+    //        // only spent the entry where the entry's currency matches the budget limit's currency
+    //        // so $filtered will only have 1 or 0 entries
+    //        $filtered        = array_filter($spent, fn ($entry) => $entry['currency_id'] === $limitCurrencyId);
+    //        $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
+    //        if (1 === count($result)) {
+    //            $compare                              = bccomp($limit->amount, (string)app('steam')->positive($result[$limitCurrencyId]['spent']));
+    //            $result[$limitCurrencyId]['budgeted'] = $limit->amount;
+    //            if (1 === $compare) {
+    //                // convert this amount into the primary currency:
+    //                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']);
+    //            }
+    //            if ($compare <= 0) {
+    //                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']));
+    //            }
+    //        }
+    //
+    //        return $result;
+    //    }
 
     private function filterLimit(int $currencyId, Collection $limits): ?BudgetLimit
     {

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Enums\UserRoleEnum;
@@ -59,11 +59,13 @@ class CategoryController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->accountRepos  = app(AccountRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
-                $userGroup           = $this->validateUserGroup($request);
-                $this->accountRepos->setUserGroup($userGroup);
-                $this->currencyRepos->setUserGroup($userGroup);
+                $this->accountRepos->setUserGroup($this->userGroup);
+                $this->currencyRepos->setUserGroup($this->userGroup);
+                $this->accountRepos->setUser($this->user);
+                $this->currencyRepos->setUser($this->user);
 
                 return $next($request);
             }
@@ -78,7 +80,7 @@ class CategoryController extends Controller
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
-    public function overview(DateRequest $request): JsonResponse
+    public function overview(SameDateRequest $request): JsonResponse
     {
         /** @var Carbon $start */
         $start      = $this->parameters->get('start');
@@ -95,22 +97,23 @@ class CategoryController extends Controller
         $collector  = app(GroupCollectorInterface::class);
         $collector->setRange($start, $end)->withAccountInformation();
         $collector->setXorAccounts($accounts)->withCategoryInformation();
-        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::RECONCILIATION->value]);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value]);
         $journals   = $collector->getExtractedJournals();
 
         /** @var array $journal */
         foreach ($journals as $journal) {
             // find journal:
-            $journalCurrencyId                = (int)$journal['currency_id'];
-            $currency                         = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
-            $currencies[$journalCurrencyId]   = $currency;
-            $currencyId                       = (int)$currency->id;
-            $currencyName                     = (string)$currency->name;
-            $currencyCode                     = (string)$currency->code;
-            $currencySymbol                   = (string)$currency->symbol;
-            $currencyDecimalPlaces            = (int)$currency->decimal_places;
-            $amount                           = Steam::positive($journal['amount']);
-            $pcAmount                         = null;
+            $journalCurrencyId              = (int)$journal['currency_id'];
+            $type                           = $journal['transaction_type_type'];
+            $currency                       = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
+            $currencies[$journalCurrencyId] = $currency;
+            $currencyId                     = (int)$currency->id;
+            $currencyName                   = (string)$currency->name;
+            $currencyCode                   = (string)$currency->code;
+            $currencySymbol                 = (string)$currency->symbol;
+            $currencyDecimalPlaces          = (int)$currency->decimal_places;
+            $amount                         = Steam::positive((string)$journal['amount']);
+            $pcAmount                       = null;
 
             // overrule if necessary:
             if ($this->convertToPrimary && $journalCurrencyId === $this->primaryCurrency->id) {
@@ -127,8 +130,8 @@ class CategoryController extends Controller
             }
 
 
-            $categoryName                     = $journal['category_name'] ?? (string)trans('firefly.no_category');
-            $key                              = sprintf('%s-%s', $categoryName, $currencyCode);
+            $categoryName                   = $journal['category_name'] ?? (string)trans('firefly.no_category');
+            $key                            = sprintf('%s-%s', $categoryName, $currencyCode);
             // create arrays
             $return[$key] ??= [
                 'label'                           => $categoryName,
@@ -148,23 +151,37 @@ class CategoryController extends Controller
                 'yAxisID'                         => 0,
                 'type'                            => 'bar',
                 'entries'                         => [
-                    'spent' => '0',
+                    'spent'  => '0',
+                    'earned' => '0',
                 ],
                 'pc_entries'                      => [
-                    'spent' => '0',
+                    'spent'  => '0',
+                    'earned' => '0',
                 ],
             ];
 
             // add monies
-            $return[$key]['entries']['spent'] = bcadd($return[$key]['entries']['spent'], (string)$amount);
-            if (null !== $pcAmount) {
-                $return[$key]['pc_entries']['spent'] = bcadd($return[$key]['pc_entries']['spent'], (string)$pcAmount);
+            // expenses to spent
+            if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
+                $return[$key]['entries']['spent'] = bcadd($return[$key]['entries']['spent'], $amount);
+                if (null !== $pcAmount) {
+                    $return[$key]['pc_entries']['spent'] = bcadd($return[$key]['pc_entries']['spent'], $pcAmount);
+                }
+
+                continue;
+            }
+            // positive amount = earned
+            if (TransactionTypeEnum::DEPOSIT->value === $type) {
+                $return[$key]['entries']['earned'] = bcadd($return[$key]['entries']['earned'], $amount);
+                if (null !== $pcAmount) {
+                    $return[$key]['pc_entries']['earned'] = bcadd($return[$key]['pc_entries']['earned'], $pcAmount);
+                }
             }
         }
         $return     = array_values($return);
 
         // order by amount
-        usort($return, static fn (array $a, array $b) => (float)$a['entries']['spent'] < (float)$b['entries']['spent'] ? 1 : -1);
+        usort($return, static fn (array $a, array $b) => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1);
 
         return response()->json($this->clean($return));
     }

app/Api/V1/Controllers/Controller.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Exceptions\BadHttpHeaderException;
-use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
@@ -64,10 +63,8 @@ abstract class Controller extends BaseController
 
     protected const string CONTENT_TYPE             = 'application/vnd.api+json';
     protected const string JSON_CONTENT_TYPE        = 'application/json';
-    protected array               $accepts          = ['application/json', 'application/vnd.api+json'];
+    protected array $accepts                        = ['application/json', 'application/vnd.api+json'];
 
-    /** @var array<int, string> */
-    protected array               $allowedSort;
     protected bool                $convertToPrimary = false;
     protected TransactionCurrency $primaryCurrency;
     protected ParameterBag        $parameters;
@@ -78,7 +75,6 @@ abstract class Controller extends BaseController
     public function __construct()
     {
         // get global parameters
-        $this->allowedSort = config('firefly.allowed_sort_parameters');
         $this->middleware(
             function ($request, $next) {
                 $this->parameters = $this->getParameters();
@@ -107,13 +103,8 @@ abstract class Controller extends BaseController
     private function getParameters(): ParameterBag
     {
         $bag      = new ParameterBag();
-        $page     = (int) request()->get('page');
-        if ($page < 1) {
-            $page = 1;
-        }
-        if ($page > 2 ** 16) {
-            $page = 2 ** 16;
-        }
+        $page     = (int)request()->get('page');
+        $page     = min(max(1, $page), 2 ** 16);
         $bag->set('page', $page);
 
         // some date fields:
@@ -131,19 +122,15 @@ abstract class Controller extends BaseController
             $obj  = null;
             if (null !== $date) {
                 try {
-                    $obj = Carbon::parse((string) $date);
+                    $obj = Carbon::parse((string)$date, config('app.timezone'));
                 } catch (InvalidFormatException $e) {
                     // don't care
-                    Log::warning(
-                        sprintf(
-                            'Ignored invalid date "%s" in API controller parameter check: %s',
-                            substr((string) $date, 0, 20),
-                            $e->getMessage()
-                        )
-                    );
+                    Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', substr((string)$date, 0, 20), $e->getMessage()));
                 }
             }
-            $bag->set($field, $obj);
+            if ($obj instanceof Carbon) {
+                $bag->set($field, $obj);
+            }
         }
 
         // integer fields:
@@ -158,14 +145,8 @@ abstract class Controller extends BaseController
                 $value = null;
             }
             if (null !== $value) {
-                $value = (int) $value;
-                if ($value < 1) {
-                    $value = 1;
-                }
-                if ($value > 2 ** 16) {
-                    $value = 2 ** 16;
-                }
-
+                $value = (int)$value;
+                $value = min(max(1, $value), 2 ** 16);
                 $bag->set($integer, $value);
             }
             if (null === $value
@@ -175,46 +156,14 @@ abstract class Controller extends BaseController
                 /** @var User $user */
                 $user     = auth()->user();
 
-                /** @var Preference $pageSize */
-                $pageSize = (int) app('preferences')->getForUser($user, 'listPageSize', 50)->data;
+                $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data;
                 $bag->set($integer, $pageSize);
             }
         }
 
         // sort fields:
-        return $this->getSortParameters($bag);
-    }
-
-    private function getSortParameters(ParameterBag $bag): ParameterBag
-    {
-        $sortParameters = [];
-
-        try {
-            $param = (string) request()->query->get('sort');
-        } catch (BadRequestException $e) {
-            Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
-            Log::error($e->getMessage());
-            Log::error($e->getTraceAsString());
-            $param = '';
-        }
-        if ('' === $param) {
-            return $bag;
-        }
-        $parts          = explode(',', $param);
-        foreach ($parts as $part) {
-            $part      = trim($part);
-            $direction = 'asc';
-            if ('-' === $part[0]) {
-                $part      = substr($part, 1);
-                $direction = 'desc';
-            }
-            if (in_array($part, $this->allowedSort, true)) {
-                $sortParameters[] = [$part, $direction];
-            }
-        }
-        $bag->set('sort', $sortParameters);
-
         return $bag;
+        // return $this->getSortParameters($bag);
     }
 
     /**

app/Api/V1/Controllers/Data/Bulk/TransactionController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Bulk\TransactionRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use Illuminate\Http\JsonResponse;
@@ -44,23 +45,23 @@ class TransactionController extends Controller
 {
     private AccountRepositoryInterface $repository;
 
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
+
     public function __construct()
     {
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/bulkUpdateTransactions
-     */
     public function update(TransactionRequest $request): JsonResponse
     {
         $query  = $request->getAll();

app/Api/V1/Controllers/Data/DestroyController.php

@@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -55,12 +56,20 @@ class DestroyController extends Controller
 {
     private bool $unused;
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/destroyData
-     *
-     * @throws FireflyException
-     */
+    protected array $acceptedRoles = [UserRoleEnum::FULL];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->validateUserGroup($request);
+
+                return $next($request);
+            }
+        );
+    }
+
     public function destroy(DestroyRequest $request): JsonResponse
     {
         $objects         = $request->getObjects();

app/Api/V1/Controllers/Data/Export/ExportController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Data\Export;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
@@ -39,6 +40,7 @@ use function Safe\date;
 class ExportController extends Controller
 {
     private ExportDataGenerator $exporter;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * ExportController constructor.
@@ -48,8 +50,10 @@ class ExportController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->exporter = app(ExportDataGenerator::class);
-                $this->exporter->setUser(auth()->user());
+                $this->exporter->setUserGroup($this->userGroup);
+                $this->exporter->setUser($this->user);
 
                 return $next($request);
             }
@@ -57,9 +61,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportAccounts
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -99,9 +100,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -114,9 +112,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBudgets
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -129,9 +124,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportCategories
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -144,9 +136,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportPiggies
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -159,9 +148,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRecurring
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -174,9 +160,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRules
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -189,9 +172,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTags
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -204,9 +184,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTransactions
-     *
      * @throws FireflyException
      */
     public function transactions(ExportRequest $request): LaravelResponse

app/Api/V1/Controllers/Data/PurgeController.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Data;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
@@ -44,10 +45,22 @@ use Illuminate\Http\JsonResponse;
  */
 class PurgeController extends Controller
 {
+    protected array $acceptedRoles = [UserRoleEnum::FULL];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->validateUserGroup($request);
+
+                return $next($request);
+            }
+        );
+    }
+
     /**
      * TODO cleanup and use repositories.
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/purgeData
      */
     public function purge(): JsonResponse
     {
@@ -66,14 +79,6 @@ class PurgeController extends Controller
         $repository = app(PiggyBankRepositoryInterface::class);
         $repository->setUser($user);
         $repository->purgeAll();
-        //        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
-        //            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
-        //        ;
-        //
-        //        /** @var PiggyBank $piggy */
-        //        foreach ($set as $piggy) {
-        //            $piggy->forceDelete();
-        //        }
 
         // rule group
         RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();

app/Api/V1/Controllers/Insight/Expense/AccountController.php

@@ -64,10 +64,6 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseAsset
-     */
     public function asset(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -91,10 +87,6 @@ class AccountController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseExpense
-     */
     public function expense(GenericRequest $request): JsonResponse
     {
         $start           = $request->getStart();

app/Api/V1/Controllers/Insight/Expense/BillController.php

@@ -58,9 +58,6 @@ class BillController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBill
-     *
      * Expenses per bill, possibly filtered by bill and account.
      */
     public function bill(GenericRequest $request): JsonResponse
@@ -122,9 +119,6 @@ class BillController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBill
-     *
      * Expenses for no bill filtered by account.
      */
     public function noBill(GenericRequest $request): JsonResponse

app/Api/V1/Controllers/Insight/Expense/BudgetController.php

@@ -63,10 +63,6 @@ class BudgetController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBudget
-     */
     public function budget(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class BudgetController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBudget
-     */
     public function noBudget(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Expense/CategoryController.php

@@ -63,10 +63,6 @@ class CategoryController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
-     */
     public function category(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class CategoryController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
-     */
     public function noCategory(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Expense/PeriodController.php

@@ -37,10 +37,6 @@ use Illuminate\Support\Facades\Log;
  */
 class PeriodController extends Controller
 {
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTotal
-     */
     public function total(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();

app/Api/V1/Controllers/Insight/Expense/TagController.php

@@ -57,9 +57,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoTag
-     *
      * Expenses for no tag filtered by account.
      */
     public function noTag(GenericRequest $request): JsonResponse
@@ -115,9 +112,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTag
-     *
      * Expenses per tag, possibly filtered by tag and account.
      */
     public function tag(GenericRequest $request): JsonResponse

app/Api/V1/Controllers/Insight/Income/AccountController.php

@@ -64,10 +64,6 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeAsset
-     */
     public function asset(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -92,10 +88,6 @@ class AccountController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeRevenue
-     */
     public function revenue(GenericRequest $request): JsonResponse
     {
         $start           = $request->getStart();

app/Api/V1/Controllers/Insight/Income/CategoryController.php

@@ -63,10 +63,6 @@ class CategoryController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeCategory
-     */
     public function category(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class CategoryController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoCategory
-     */
     public function noCategory(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Income/PeriodController.php

@@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -36,10 +37,6 @@ use Illuminate\Http\JsonResponse;
  */
 class PeriodController extends Controller
 {
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTotal
-     */
     public function total(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();
@@ -75,7 +72,7 @@ class PeriodController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], Steam::positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
         }
 

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -30,6 +30,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -57,9 +58,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTag
-     *
      * Expenses for no tag filtered by account.
      */
     public function noTag(GenericRequest $request): JsonResponse
@@ -100,7 +98,7 @@ class TagController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], Steam::positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }
@@ -109,9 +107,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoTag
-     *
      * Expenses per tag, possibly filtered by tag and account.
      */
     public function tag(GenericRequest $request): JsonResponse
@@ -154,7 +149,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) app('steam')->positive($journal['amount']));
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], Steam::positive($journal['amount']));
                     $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
@@ -166,10 +161,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
-                    $response[$foreignKey]['difference']       = bcadd(
-                        (string) $response[$foreignKey]['difference'],
-                        (string) app('steam')->positive($journal['foreign_amount'])
-                    );
+                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                 }
             }

app/Api/V1/Controllers/Insight/Transfer/AccountController.php

@@ -56,10 +56,6 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransfers
-     */
     public function asset(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Transfer/CategoryController.php

@@ -63,10 +63,6 @@ class CategoryController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
-     */
     public function category(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class CategoryController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
-     */
     public function noCategory(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -36,10 +37,6 @@ use Illuminate\Http\JsonResponse;
  */
 class PeriodController extends Controller
 {
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTotal
-     */
     public function total(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();
@@ -75,7 +72,7 @@ class PeriodController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], Steam::positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -30,6 +30,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -56,10 +57,6 @@ class TagController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoTag
-     */
     public function noTag(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();
@@ -99,7 +96,7 @@ class TagController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], Steam::positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }
@@ -108,9 +105,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTag
-     *
      * Transfers per tag, possibly filtered by tag and account.
      */
     public function tag(GenericRequest $request): JsonResponse
@@ -153,7 +147,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) app('steam')->positive($journal['amount']));
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], Steam::positive($journal['amount']));
                     $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
@@ -167,7 +161,7 @@ class TagController extends Controller
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
                         (string) $response[$foreignKey]['difference'],
-                        (string) app('steam')->positive($journal['foreign_amount'])
+                        Steam::positive($journal['foreign_amount'])
                     );
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                 }

app/Api/V1/Controllers/Models/Account/DestroyController.php

@@ -55,9 +55,6 @@ class DestroyController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/deleteAccount
-     *
      * Remove the specified resource from storage.
      */
     public function destroy(Account $account): JsonResponse

app/Api/V1/Controllers/Models/Account/ListController.php

@@ -71,9 +71,6 @@ class ListController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAttachmentByAccount
-     *
      * @throws FireflyException
      */
     public function attachments(Account $account): JsonResponse
@@ -100,9 +97,6 @@ class ListController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listPiggyBankByAccount
-     *
      * @throws FireflyException
      */
     public function piggyBanks(Account $account): JsonResponse
@@ -140,9 +134,6 @@ class ListController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listTransactionByAccount
-     *
      * Show all transaction groups related to the account.
      *
      * @throws FireflyException

app/Api/V1/Controllers/Models/Account/ShowController.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\Account;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Account\ShowRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -33,7 +34,6 @@ use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -67,41 +67,42 @@ class ShowController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAccount
-     *
      * Display a listing of the resource.
      *
      * @throws FireflyException
      */
-    public function index(Request $request): JsonResponse
+    public function index(ShowRequest $request): JsonResponse
     {
         $manager     = $this->getManager();
-        $type        = $request->get('type') ?? 'all';
-        $this->parameters->set('type', $type);
+        $params      = $request->getParameters();
+        $this->parameters->set('type', $params['type']);
 
         // types to get, page size:
-        $types       = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize    = $this->parameters->get('limit');
+        $types       = $this->mapAccountTypes($params['type']);
 
         // get list of accounts. Count it and split it.
         $this->repository->resetAccountOrder();
-        $collection  = $this->repository->getAccountsByType($types, $this->parameters->get('sort') ?? []);
+        $collection  = $this->repository->getAccountsByType($types, $params['sort']);
         $count       = $collection->count();
 
         // continue sort:
-        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        // TODO if the user sorts on DB dependent field there must be no slice before enrichment, only after.
+        // TODO still need to figure out how to do this easily.
+        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']);
 
         // enrich
         /** @var User $admin */
         $admin       = auth()->user();
         $enrichment  = new AccountEnrichment();
+        $enrichment->setSort($params['sort']);
         $enrichment->setDate($this->parameters->get('date'));
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
         $enrichment->setUser($admin);
         $accounts    = $enrichment->enrich($accounts);
 
         // make paginator:
-        $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $paginator   = new LengthAwarePaginator($accounts, $count, $params['limit'], $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.accounts.index').$this->buildParams());
 
         /** @var AccountTransformer $transformer */
@@ -120,7 +121,7 @@ class ShowController extends Controller
      *
      * Show single instance.
      */
-    public function show(Account $account): JsonResponse
+    public function show(ShowRequest $request, Account $account): JsonResponse
     {
         // get list of accounts. Count it and split it.
         $this->repository->resetAccountOrder();
@@ -132,6 +133,8 @@ class ShowController extends Controller
         $admin       = auth()->user();
         $enrichment  = new AccountEnrichment();
         $enrichment->setDate($this->parameters->get('date'));
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
         $enrichment->setUser($admin);
         $account     = $enrichment->enrichSingle($account);
 

app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php

@@ -114,8 +114,8 @@ class ShowController extends Controller
     public function show(AvailableBudget $availableBudget): JsonResponse
     {
         $manager         = $this->getManager();
-        $start           = $this->parameters->get('start');
-        $end             = $this->parameters->get('end');
+        //        $start           = $this->parameters->get('start');
+        //        $end             = $this->parameters->get('end');
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer     = app(AvailableBudgetTransformer::class);
@@ -126,8 +126,8 @@ class ShowController extends Controller
         $admin           = auth()->user();
         $enrichment      = new AvailableBudgetEnrichment();
         $enrichment->setUser($admin);
-        $enrichment->setStart($start);
-        $enrichment->setEnd($end);
+        //        $enrichment->setStart($start);
+        //        $enrichment->setEnd($end);
         $availableBudget = $enrichment->enrichSingle($availableBudget);
 
 

app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\User;
@@ -76,6 +77,18 @@ class ShowController extends Controller
      */
     public function index(Budget $budget): JsonResponse
     {
+        /** @var User $admin */
+        $admin        = auth()->user();
+        // enrich budget:
+        $enrichment   = new BudgetEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
+
+        /** @var Budget $budget */
+        $budget       = $enrichment->enrichSingle($budget);
+
+
         $manager      = $this->getManager();
         $manager->parseIncludes('budget');
         $pageSize     = $this->parameters->get('limit');
@@ -85,10 +98,7 @@ class ShowController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]).$this->buildParams());
 
-
         // enrich
-        /** @var User $admin */
-        $admin        = auth()->user();
         $enrichment   = new BudgetLimitEnrichment();
         $enrichment->setUser($admin);
         $budgetLimits = $enrichment->enrich($budgetLimits);

app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php

@@ -86,7 +86,7 @@ class UpdateController extends Controller
         $admin             = auth()->user();
         $enrichment        = new BudgetLimitEnrichment();
         $enrichment->setUser($admin);
-        $budgetLimit       = $enrichment->enrich($budgetLimit);
+        $budgetLimit       = $enrichment->enrichSingle($budgetLimit);
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer       = app(BudgetLimitTransformer::class);

app/Api/V1/Controllers/Models/Recurrence/TriggerController.php

@@ -0,0 +1,126 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * TriggerController.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Generic\SingleDateRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Jobs\CreateRecurringTransactions;
+use FireflyIII\Models\Recurrence;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
+use FireflyIII\Transformers\TransactionGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+
+class TriggerController extends Controller
+{
+    private RecurringRepositoryInterface $repository;
+
+    /**
+     * RecurrenceController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(RecurringRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function trigger(SingleDateRequest $request, Recurrence $recurrence): JsonResponse
+    {
+        // find recurrence occurrence for this date and trigger it.
+        // grab the date from the last time the recurrence fired:
+        $backupDate                 = $recurrence->latest_date;
+        $date                       = $request->getDate();
+
+        // fire the recurring cron job on the given date, then post-date the created transaction.
+        Log::info(sprintf('Trigger: will now fire recurring cron job task for date "%s".', $date->format('Y-m-d H:i:s')));
+
+        /** @var CreateRecurringTransactions $job */
+        $job                        = app(CreateRecurringTransactions::class);
+        $job->setRecurrences(new Collection()->push($recurrence));
+        $job->setDate($date);
+        $job->setForce(false);
+        $job->handle();
+        Log::debug('Done with recurrence.');
+
+        $groups                     = $job->getGroups();
+        $this->repository->markGroupsAsNow($groups);
+        $recurrence->latest_date    = $backupDate;
+        $recurrence->latest_date_tz = $backupDate?->format('e');
+        $recurrence->save();
+        Preferences::mark();
+
+        // enrich groups and return them:
+
+        if (0 === $groups->count()) {
+            $paginator = new LengthAwarePaginator(new Collection(), 0, 1);
+        }
+        if ($groups->count() > 0) {
+            /** @var User $admin */
+            $admin     = auth()->user();
+
+            // use new group collector:
+            /** @var GroupCollectorInterface $collector */
+            $collector = app(GroupCollectorInterface::class);
+            $collector
+                ->setUser($admin)
+                ->setIds($groups->pluck('id')->toArray())
+                ->withAPIInformation()
+            ;
+            $paginator = $collector->getPaginatedGroups();
+        }
+
+        $manager                    = $this->getManager();
+        $paginator->setPath(route('api.v1.recurrences.trigger', [$recurrence->id]).$this->buildParams());
+
+        // enrich
+        $admin                      = auth()->user();
+        $enrichment                 = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions               = $enrichment->enrich($paginator->getCollection());
+
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer                = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource                   = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php

@@ -30,9 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Recurrence;
-use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\Rule;
-use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -192,7 +190,7 @@ class ListController extends Controller
         $enrichment->setUser($admin);
         $enrichment->setStart($this->parameters->get('start'));
         $enrichment->setEnd($this->parameters->get('end'));
-        $bills       = $enrichment->enrichSingle($bills);
+        $bills       = $enrichment->enrich($bills);
 
         // make paginator:
         $paginator   = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
@@ -268,7 +266,6 @@ class ListController extends Controller
         // filter selection
         $collection     = $unfiltered->filter(
             static function (Recurrence $recurrence) use ($currency) {  // @phpstan-ignore-line
-                /** @var RecurrenceTransaction $transaction */
                 if (array_any($recurrence->recurrenceTransactions, fn ($transaction) => $transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id)) {
                     return $recurrence;
                 }
@@ -320,7 +317,6 @@ class ListController extends Controller
 
         $collection  = $unfiltered->filter(
             static function (Rule $rule) use ($currency) { // @phpstan-ignore-line
-                /** @var RuleTrigger $trigger */
                 if (array_any($rule->ruleTriggers, fn ($trigger) => 'currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value)) {
                     return $rule;
                 }

app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php

@@ -126,7 +126,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      */
-    public function showDefault(): JsonResponse
+    public function showPrimary(): JsonResponse
     {
         /** @var User $user */
         $user        = auth()->user();

app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php

@@ -73,7 +73,7 @@ class StoreController extends Controller
     {
         $currency    = $this->repository->store($request->getAll());
         if (true === $request->boolean('default')) {
-            $this->repository->makeDefault($currency);
+            $this->repository->makePrimary($currency);
             app('preferences')->mark();
         }
         $manager     = $this->getManager();

app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php

@@ -101,12 +101,12 @@ class UpdateController extends Controller
     /**
      * @throws FireflyException
      */
-    public function makeDefault(TransactionCurrency $currency): JsonResponse
+    public function makePrimary(TransactionCurrency $currency): JsonResponse
     {
         /** @var User $user */
         $user        = auth()->user();
         $this->repository->enable($currency);
-        $this->repository->makeDefault($currency);
+        $this->repository->makePrimary($currency);
 
         app('preferences')->mark();
 

app/Api/V1/Controllers/Summary/BasicController.php

@@ -481,7 +481,7 @@ class BasicController extends Controller
         $currencies = [];
 
         // first, create an entry for each entry in the "available" array.
-        /** @var array $availableBudget */
+        /** @var string $availableBudget */
         foreach ($available as $currencyId => $availableBudget) {
             $currencies[$currencyId] ??= $this->currencyRepos->find($currencyId);
             $return[$currencyId] = [

app/Api/V1/Controllers/System/ConfigurationController.php

@@ -24,15 +24,18 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\System;
 
-use FireflyIII\Support\Facades\FireflyConfig;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\System\UpdateRequest;
+use FireflyIII\Enums\WebhookDelivery;
+use FireflyIII\Enums\WebhookResponse;
+use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Binder\EitherConfigKey;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 
 /**
@@ -107,8 +110,8 @@ class ConfigurationController extends Controller
 
         return [
             'is_demo_site'            => $isDemoSite?->data,
-            'permission_update_check' => null === $updateCheck ? null : (int) $updateCheck->data,
-            'last_update_check'       => null === $lastCheck ? null : (int) $lastCheck->data,
+            'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
+            'last_update_check'       => null === $lastCheck ? null : (int)$lastCheck->data,
             'single_user_mode'        => $singleUser?->data,
         ];
     }
@@ -139,15 +142,26 @@ class ConfigurationController extends Controller
                 'value'    => $dynamic[$shortKey],
                 'editable' => true,
             ];
+
+            return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
         }
-        if (!str_starts_with($configKey, 'configuration.')) {
+        if (str_starts_with($configKey, 'webhook.')) {
             $data = [
                 'title'    => $configKey,
-                'value'    => config($configKey),
+                'value'    => $this->getWebhookConfiguration($configKey),
                 'editable' => false,
             ];
+
+            return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
         }
 
+        // fallback
+        $data     = [
+            'title'    => $configKey,
+            'value'    => config($shortKey),
+            'editable' => false,
+        ];
+
         return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
     }
 
@@ -182,4 +196,39 @@ class ConfigurationController extends Controller
 
         return response()->api(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
+
+    private function getWebhookConfiguration(string $configKey): array
+    {
+        switch ($configKey) {
+            case 'webhook.triggers':
+                $cases = WebhookTrigger::cases();
+                $data  = [];
+                foreach ($cases as $c) {
+                    $data[$c->name] = $c->value;
+                }
+
+                return $data;
+
+            case 'webhook.responses':
+                $cases = WebhookResponse::cases();
+                $data  = [];
+                foreach ($cases as $c) {
+                    $data[$c->name] = $c->value;
+                }
+
+                return $data;
+
+            case 'webhook.deliveries':
+                $cases = WebhookDelivery::cases();
+                $data  = [];
+                foreach ($cases as $c) {
+                    $data[$c->name] = $c->value;
+                }
+
+                return $data;
+
+            default:
+                throw new FireflyException(sprintf('Unknown webhook configuration key "%s".', $configKey));
+        }
+    }
 }

app/Api/V1/Controllers/Webhook/ShowController.php

@@ -25,13 +25,16 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Webhook;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Events\RequestedSendWebhookMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
 use FireflyIII\Transformers\WebhookTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -89,6 +92,13 @@ class ShowController extends Controller
         $paginator   = new LengthAwarePaginator($webhooks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.webhooks.index').$this->buildParams());
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new WebhookEnrichment();
+        $enrichment->setUser($admin);
+        $webhooks    = $enrichment->enrich($webhooks);
+
         /** @var WebhookTransformer $transformer */
         $transformer = app(WebhookTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -116,6 +126,13 @@ class ShowController extends Controller
         Log::channel('audit')->info(sprintf('User views webhook #%d.', $webhook->id));
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new WebhookEnrichment();
+        $enrichment->setUser($admin);
+        $webhook     = $enrichment->enrichSingle($webhook);
+
         /** @var WebhookTransformer $transformer */
         $transformer = app(WebhookTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -146,7 +163,7 @@ class ShowController extends Controller
         $engine->setUser(auth()->user());
 
         // tell the generator which trigger it should look for
-        $engine->setTrigger($webhook->trigger);
+        $engine->setTrigger(WebhookTrigger::tryFrom($webhook->trigger));
         // tell the generator which objects to process
         $engine->setObjects(new Collection([$group]));
         // set the webhook to trigger
@@ -155,7 +172,7 @@ class ShowController extends Controller
         $engine->generateMessages();
 
         // trigger event to send them:
-        Log::debug('send event RequestedSendWebhookMessages');
+        Log::debug('send event RequestedSendWebhookMessages from ShowController::triggerTransaction()');
         event(new RequestedSendWebhookMessages());
 
         return response()->json([], 204);

app/Api/V1/Controllers/Webhook/StoreController.php

@@ -27,7 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Webhook;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Webhook\CreateRequest;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
 use FireflyIII\Transformers\WebhookTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
@@ -68,6 +70,15 @@ class StoreController extends Controller
         }
 
         $webhook     = $this->repository->store($data);
+
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new WebhookEnrichment();
+        $enrichment->setUser($admin);
+        $webhook     = $enrichment->enrichSingle($webhook);
+
+
         $manager     = $this->getManager();
 
         Log::channel('audit')->info('User stores new webhook', $data);

app/Api/V1/Controllers/Webhook/UpdateController.php

@@ -28,7 +28,9 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Webhook\UpdateRequest;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
 use FireflyIII\Transformers\WebhookTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
@@ -70,6 +72,15 @@ class UpdateController extends Controller
         $webhook     = $this->repository->update($webhook, $data);
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new WebhookEnrichment();
+        $enrichment->setUser($admin);
+
+        /** @var Webhook $webhook */
+        $webhook     = $enrichment->enrichSingle($webhook);
+
         Log::channel('audit')->info(sprintf('User updates webhook #%d', $webhook->id), $data);
 
         /** @var WebhookTransformer $transformer */

app/Api/V1/Requests/Chart/ChartRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Chart;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -64,6 +64,7 @@ class ChartRequest extends FormRequest
             'end'         => 'required|date|after:1970-01-02|before:2038-01-17|after_or_equal:start',
             'preselected' => sprintf('nullable|in:%s', implode(',', config('firefly.preselected_accounts'))),
             'period'      => sprintf('nullable|in:%s', implode(',', config('firefly.valid_view_ranges'))),
+            'accounts'    => 'nullable|array',
             'accounts.*'  => 'exists:accounts,id',
         ];
 

app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data\Bulk;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;

app/Api/V1/Requests/Data/Bulk/TransactionRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data\Bulk;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use JsonException;
 use FireflyIII\Enums\ClauseType;
 use FireflyIII\Rules\IsValidBulkClause;

app/Api/V1/Requests/Models/Account/ShowRequest.php

@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * ShowRequest.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Requests\Models\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use FireflyIII\Rules\IsValidSortInstruction;
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\User;
+use Illuminate\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowRequest extends FormRequest
+{
+    use AccountFilter;
+    use ConvertsDataTypes;
+
+    public function getParameters(): array
+    {
+        $limit = $this->convertInteger('limit');
+        if (0 === $limit) {
+            // get default for user:
+            /** @var User $user */
+            $user  = auth()->user();
+            $limit = (int)Preferences::getForUser($user, 'listPageSize', 50)->data;
+        }
+
+        $page  = $this->convertInteger('page');
+        $page  = min(max(1, $page), 2 ** 16);
+
+        return [
+            'type'  => $this->convertString('type', 'all'),
+            'limit' => $limit,
+            'sort'  => $this->convertSortParameters('sort', Account::class),
+            'page'  => $page,
+        ];
+    }
+
+    public function rules(): array
+    {
+        $keys = implode(',', array_keys($this->types));
+
+        return [
+            'date'  => 'date',
+            'start' => 'date|present_with:end|before_or_equal:end|before:2038-01-17|after:1970-01-02',
+            'end'   => 'date|present_with:start|after_or_equal:start|before:2038-01-17|after:1970-01-02',
+            'sort'  => ['nullable', new IsValidSortInstruction(Account::class)],
+            'type'  => sprintf('in:%s', $keys),
+            'limit' => 'numeric|min:1|max:131337',
+            'page'  => 'numeric|min:1|max:131337',
+        ];
+    }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator): void {
+                if (count($validator->failed()) > 0) {
+                    return;
+                }
+                $data = $validator->getData();
+
+
+                if (array_key_exists('date', $data) && array_key_exists('start', $data) && array_key_exists('end', $data)) {
+                    // assume valid dates, before we got here.
+                    $start = Carbon::parse($data['start'], config('app.timezone'))->startOfDay();
+                    $end   = Carbon::parse($data['end'], config('app.timezone'))->endOfDay();
+                    $date  = Carbon::parse($data['date'], config('app.timezone'));
+                    if (!$date->between($start, $end)) {
+                        $validator->errors()->add('date', (string)trans('validation.between_date'));
+                    }
+                }
+            }
+        );
+    }
+}

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Account;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Location;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\AvailableBudget;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use Carbon\Carbon;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Bill;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use ValueError;
 use TypeError;
 use FireflyIII\Rules\IsBoolean;

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Bill;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\Bill;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;

app/Api/V1/Requests/Models/Budget/StoreRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Budget;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;

app/Api/V1/Requests/Models/Budget/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Budget;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\Budget;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use Carbon\Carbon;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php

@@ -28,7 +28,7 @@ use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreByCurrenciesRequest extends FormRequest
@@ -55,7 +55,7 @@ class StoreByCurrenciesRequest extends FormRequest
     {
         $validator->after(
             static function (Validator $validator): void {
-                $data = $validator->getData() ?? [];
+                $data = $validator->getData();
                 foreach ($data as $date => $rate) {
                     try {
                         $date = Carbon::createFromFormat('Y-m-d', $date);

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreByDateRequest extends FormRequest

app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Rules\IsValidZeroOrMoreAmount;
@@ -78,7 +78,7 @@ class StoreRequest extends FormRequest
             'object_group_id'           => 'numeric|belongsToUser:object_groups,id',
             'object_group_title'        => ['min:1', 'max:255'],
             'target_amount'             => ['required', new IsValidZeroOrMoreAmount()],
-            'start_date'                => 'date|nullable',
+            'start_date'                => 'required|date|after:1970-01-01|before:2038-01-17',
             'transaction_currency_id'   => 'exists:transaction_currencies,id|required_without:transaction_currency_code',
             'transaction_currency_code' => 'exists:transaction_currencies,code|required_without:transaction_currency_id',
             'target_date'               => 'date|nullable|after:start_date',

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Recurrence;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Recurrence;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\Rule;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidActionExpression;

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Transaction;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Transaction;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Rules\BelongsUser;

app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;

app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -24,10 +24,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Webhook;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\ValidatesWebhooks;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
@@ -37,27 +39,28 @@ class CreateRequest extends FormRequest
 {
     use ChecksLogin;
     use ConvertsDataTypes;
+    use ValidatesWebhooks;
 
     public function getData(): array
     {
-        $triggers           = Webhook::getTriggersForValidation();
-        $responses          = Webhook::getResponsesForValidation();
-        $deliveries         = Webhook::getDeliveriesForValidation();
-
-        $fields             = [
-            'title'    => ['title', 'convertString'],
-            'active'   => ['active', 'boolean'],
-            'trigger'  => ['trigger', 'convertString'],
-            'response' => ['response', 'convertString'],
-            'delivery' => ['delivery', 'convertString'],
-            'url'      => ['url', 'convertString'],
+        $fields               = [
+            'title'  => ['title', 'convertString'],
+            'active' => ['active', 'boolean'],
+            'url'    => ['url', 'convertString'],
         ];
+        $triggers             = $this->get('triggers', []);
+        $responses            = $this->get('responses', []);
+        $deliveries           = $this->get('deliveries', []);
 
-        // this is the way.
-        $return             = $this->getAllData($fields);
-        $return['trigger']  = $triggers[$return['trigger']] ?? (int) $return['trigger'];
-        $return['response'] = $responses[$return['response']] ?? (int) $return['response'];
-        $return['delivery'] = $deliveries[$return['delivery']] ?? (int) $return['delivery'];
+        if (0 === count($triggers) || 0 === count($responses) || 0 === count($deliveries)) {
+            throw new FireflyException('Unexpectedly got no responses, triggers or deliveries.');
+        }
+
+
+        $return               = $this->getAllData($fields);
+        $return['triggers']   = $triggers;
+        $return['responses']  = $responses;
+        $return['deliveries'] = $deliveries;
 
         return $return;
     }
@@ -67,18 +70,24 @@ class CreateRequest extends FormRequest
      */
     public function rules(): array
     {
-        $triggers       = implode(',', array_keys(Webhook::getTriggersForValidation()));
-        $responses      = implode(',', array_keys(Webhook::getResponsesForValidation()));
-        $deliveries     = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
+        $triggers       = implode(',', array_values(Webhook::getTriggers()));
+        $responses      = implode(',', array_values(Webhook::getResponses()));
+        $deliveries     = implode(',', array_values(Webhook::getDeliveries()));
         $validProtocols = config('firefly.valid_url_protocols');
 
         return [
-            'title'    => 'required|min:1|max:255|uniqueObjectForUser:webhooks,title',
-            'active'   => [new IsBoolean()],
-            'trigger'  => sprintf('required|in:%s', $triggers),
-            'response' => sprintf('required|in:%s', $responses),
-            'delivery' => sprintf('required|in:%s', $deliveries),
-            'url'      => ['required', sprintf('url:%s', $validProtocols), 'uniqueWebhook'],
+            'title'        => 'required|min:1|max:255|uniqueObjectForUser:webhooks,title',
+            'active'       => [new IsBoolean()],
+            'trigger'      => 'prohibited',
+            'triggers'     => 'required|array|min:1|max:10',
+            'triggers.*'   => sprintf('required|in:%s', $triggers),
+            'response'     => 'prohibited',
+            'responses'    => 'required|array|min:1|max:1',
+            'responses.*'  => sprintf('required|in:%s', $responses),
+            'delivery'     => 'prohibited',
+            'deliveries'   => 'required|array|min:1|max:1',
+            'deliveries.*' => sprintf('required|in:%s', $deliveries),
+            'url'          => ['required', sprintf('url:%s', $validProtocols)],
         ];
     }
 }

app/Api/V1/Requests/Models/Webhook/UpdateRequest.php

@@ -24,10 +24,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Webhook;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\ValidatesWebhooks;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
@@ -37,38 +39,29 @@ class UpdateRequest extends FormRequest
 {
     use ChecksLogin;
     use ConvertsDataTypes;
+    use ValidatesWebhooks;
 
     public function getData(): array
     {
-        $triggers         = Webhook::getTriggersForValidation();
-        $responses        = Webhook::getResponsesForValidation();
-        $deliveries       = Webhook::getDeliveriesForValidation();
-
-        $fields           = [
+        $fields               = [
             'title'    => ['title', 'convertString'],
             'active'   => ['active', 'boolean'],
-            'trigger'  => ['trigger', 'convertString'],
-            'response' => ['response', 'convertString'],
-            'delivery' => ['delivery', 'convertString'],
             'url'      => ['url', 'convertString'],
         ];
 
-        // this is the way.
-        $return           = $this->getAllData($fields);
-        if (array_key_exists('trigger', $return)) {
-            $return['trigger'] = $triggers[$return['trigger']] ?? 0;
-        }
-        if (array_key_exists('response', $return)) {
-            $return['response'] = $responses[$return['response']] ?? 0;
-        }
-        if (array_key_exists('delivery', $return)) {
-            $return['delivery'] = $deliveries[$return['delivery']] ?? 0;
-        }
-        $return['secret'] = null !== $this->get('secret');
-        if (null !== $this->get('title')) {
-            $return['title'] = $this->convertString('title');
+        $triggers             = $this->get('triggers', []);
+        $responses            = $this->get('responses', []);
+        $deliveries           = $this->get('deliveries', []);
+
+        if (0 === count($triggers) || 0 === count($responses) || 0 === count($deliveries)) {
+            throw new FireflyException('Unexpectedly got no responses, triggers or deliveries.');
         }
 
+        $return               = $this->getAllData($fields);
+        $return['triggers']   = $triggers;
+        $return['responses']  = $responses;
+        $return['deliveries'] = $deliveries;
+
         return $return;
     }
 
@@ -77,21 +70,29 @@ class UpdateRequest extends FormRequest
      */
     public function rules(): array
     {
-        $triggers       = implode(',', array_keys(Webhook::getTriggersForValidation()));
-        $responses      = implode(',', array_keys(Webhook::getResponsesForValidation()));
-        $deliveries     = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
+        $triggers       = implode(',', array_values(Webhook::getTriggers()));
+        $responses      = implode(',', array_values(Webhook::getResponses()));
+        $deliveries     = implode(',', array_values(Webhook::getDeliveries()));
         $validProtocols = config('firefly.valid_url_protocols');
 
         /** @var Webhook $webhook */
         $webhook        = $this->route()->parameter('webhook');
 
         return [
-            'title'    => sprintf('min:1|max:255|uniqueObjectForUser:webhooks,title,%d', $webhook->id),
-            'active'   => [new IsBoolean()],
-            'trigger'  => sprintf('in:%s', $triggers),
-            'response' => sprintf('in:%s', $responses),
-            'delivery' => sprintf('in:%s', $deliveries),
-            'url'      => [sprintf('url:%s', $validProtocols), sprintf('uniqueExistingWebhook:%d', $webhook->id)],
+            'title'        => sprintf('min:1|max:255|uniqueObjectForUser:webhooks,title,%d', $webhook->id),
+            'active'       => [new IsBoolean()],
+
+            'trigger'      => 'prohibited',
+            'triggers'     => 'required|array|min:1|max:10',
+            'triggers.*'   => sprintf('required|in:%s', $triggers),
+            'response'     => 'prohibited',
+            'responses'    => 'required|array|min:1|max:1',
+            'responses.*'  => sprintf('required|in:%s', $responses),
+            'delivery'     => 'prohibited',
+            'deliveries'   => 'required|array|min:1|max:1',
+            'deliveries.*' => sprintf('required|in:%s', $deliveries),
+
+            'url'          => [sprintf('url:%s', $validProtocols), sprintf('uniqueExistingWebhook:%d', $webhook->id)],
         ];
     }
 }

app/Api/V1/Requests/System/UserUpdateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\System;
 
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;

app/Casts/SeparateTimezoneCaster.php

@@ -28,6 +28,7 @@ namespace FireflyIII\Casts;
 use Carbon\Carbon;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class SeparateTimezoneCaster
@@ -51,6 +52,7 @@ class SeparateTimezoneCaster implements CastsAttributes
         $timeZone = $attributes[sprintf('%s_tz', $key)] ?? config('app.timezone');
 
         return Carbon::parse($value, $timeZone)->setTimezone(config('app.timezone'));
+        // Log::debug(sprintf('SeparateTimezoneCaster: %s.%s = %s', str_replace('FireflyIII\\Models\\','',get_class($model)), $key, $result->toAtomString()));
     }
 
     /**

app/Console/Commands/Correction/CorrectsGroupAccounts.php

@@ -45,9 +45,7 @@ class CorrectsGroupAccounts extends Command
     public function handle(): int
     {
         $groups  = [];
-        $res     = TransactionJournal::groupBy('transaction_group_id')
-            ->get(['transaction_group_id', DB::raw('COUNT(transaction_group_id) as the_count')])// @phpstan-ignore-line
-        ;
+        $res     = TransactionJournal::groupBy('transaction_group_id')->get(['transaction_group_id', DB::raw('COUNT(transaction_group_id) as the_count')]);
 
         /** @var TransactionJournal $journal */
         foreach ($res as $journal) {

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -263,9 +263,9 @@ class CorrectsUnevenAmount extends Command
         //        Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true)));
         //        Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int)  $source->foreign_currency_id, true)));
 
-        if (0 === bccomp((string) app('steam')->positive($source->amount), (string) app('steam')->positive($destination->foreign_amount))
+        if (0 === bccomp(Steam::positive($source->amount), Steam::positive($destination->foreign_amount))
             && $source->transaction_currency_id === $destination->foreign_currency_id
-            && 0 === bccomp((string) app('steam')->positive($destination->amount), (string) app('steam')->positive($source->foreign_amount))
+            && 0 === bccomp(Steam::positive($destination->amount), Steam::positive($source->foreign_amount))
             && (int) $destination->transaction_currency_id === (int) $source->foreign_currency_id
         ) {
             return true;
@@ -302,10 +302,10 @@ class CorrectsUnevenAmount extends Command
 
     private function isBetweenAssetAndLiability(TransactionJournal $journal): bool
     {
-        /** @var Transaction $sourceTransaction */
+        /** @var null|Transaction $sourceTransaction */
         $sourceTransaction      = $journal->transactions()->where('amount', '<', 0)->first();
 
-        /** @var Transaction $destinationTransaction */
+        /** @var null|Transaction $destinationTransaction */
         $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
         if (null === $sourceTransaction || null === $destinationTransaction) {
             Log::warning('Either transaction is false, stop.');

app/Console/Commands/Correction/RemovesEmptyJournals.php

@@ -55,10 +55,7 @@ class RemovesEmptyJournals extends Command
      */
     private function deleteUnevenJournals(): void
     {
-        $set   = Transaction::whereNull('deleted_at')
-            ->groupBy('transactions.transaction_journal_id')
-            ->get([DB::raw('COUNT(transactions.transaction_journal_id) as the_count'), 'transaction_journal_id']) // @phpstan-ignore-line
-        ;
+        $set   = Transaction::whereNull('deleted_at')->groupBy('transactions.transaction_journal_id')->get([DB::raw('COUNT(transactions.transaction_journal_id) as the_count'), 'transaction_journal_id']);
         $total = 0;
 
         /** @var Transaction $row */

app/Console/Commands/Integrity/ValidatesEnvironmentVariables.php

@@ -1,9 +1,9 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * ValidatesEnvironmentVariables.php
- * Copyright (c) 2025 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -18,9 +18,11 @@ declare(strict_types=1);
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see https://www.gnu.org/licenses/.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Integrity;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -30,18 +32,7 @@ class ValidatesEnvironmentVariables extends Command
 {
     use ShowsFriendlyMessages;
 
-    /**
-     * The console command description.
-     *
-     * @var null|string
-     */
     protected $description = 'Makes sure you use the correct variables.';
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'integrity:validates-environment-variables';
 
     /**
@@ -49,14 +40,23 @@ class ValidatesEnvironmentVariables extends Command
      */
     public function handle(): int
     {
-        $this->validateLanguage();
-        $this->validateGuard();
-        $this->validateStaticToken();
+        $result = $this->validateLanguage();
+        if (false === $result) {
+            return Command::FAILURE;
+        }
+        $result = $this->validateGuard();
+        if (false === $result) {
+            return Command::FAILURE;
+        }
+        $result = $this->validateStaticToken();
+        if (false === $result) {
+            return Command::FAILURE;
+        }
 
         return Command::SUCCESS;
     }
 
-    private function validateLanguage(): void
+    private function validateLanguage(): bool
     {
         $language  = config('firefly.default_language');
         $locale    = config('firefly.default_locale');
@@ -67,7 +67,7 @@ class ValidatesEnvironmentVariables extends Command
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
             $this->friendlyError(sprintf('Valid languages are: %s', implode(', ', $options)));
 
-            exit(1);
+            return false;
         }
         $options[] = 'equal';
         if (!in_array($locale, $options, true)) {
@@ -75,11 +75,13 @@ class ValidatesEnvironmentVariables extends Command
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
             $this->friendlyError(sprintf('Valid locales are: %s', implode(', ', $options)));
 
-            exit(1);
+            return false;
         }
+
+        return true;
     }
 
-    private function validateGuard(): void
+    private function validateGuard(): bool
     {
         $guard = config('auth.defaults.guard');
         if ('web' !== $guard && 'remote_user_guard' !== $guard) {
@@ -87,18 +89,22 @@ class ValidatesEnvironmentVariables extends Command
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
             $this->friendlyError('Valid guards are: web, remote_user_guard');
 
-            exit(1);
+            return false;
         }
+
+        return true;
     }
 
-    private function validateStaticToken(): void
+    private function validateStaticToken(): bool
     {
-        $token = (string) config('firefly.static_cron_token');
+        $token = (string)config('firefly.static_cron_token');
         if ('' !== $token && 32 !== strlen($token)) {
             $this->friendlyError('STATIC_CRON_TOKEN must be empty or a 32-character string.');
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
 
-            exit(1);
+            return false;
         }
+
+        return true;
     }
 }

app/Console/Commands/System/OutputsInstructions.php

@@ -133,6 +133,9 @@ class OutputsInstructions extends Command
         if ('03-31' === $today) {
             $colors = ['bright-blue', 'bright-red', 'white', 'white', 'bright-red', 'bright-blue', 'default', 'default'];
         }
+        if ('ru_RU' === config('firefly.default_language')) {
+            $colors = ['blue', 'blue', 'blue', 'yellow', 'yellow', 'yellow', 'default', 'default'];
+        }
 
         $this->line(sprintf('<fg=%s>              ______ _           __ _            _____ _____ _____  </>', $colors[0]));
         $this->line(sprintf('<fg=%s>             |  ____(_)         / _| |          |_   _|_   _|_   _| </>', $colors[1]));
@@ -238,14 +241,38 @@ class OutputsInstructions extends Command
 
     private function someQuote(): void
     {
-        $lines  = [
+        $lines     = [
             'Forgive yourself for not being at peace.',
             'Doesn\'t look like anything to me.',
             'Be proud of what you make.',
             'Be there or forever wonder.',
             'A year from now you will wish you had started today.',
         ];
-        $random = random_int(0, count($lines) - 1);
-        $this->line(sprintf('       "%s"', $lines[$random]));
+        $addQuotes = true;
+
+        // fuck the Russian aggression in Ukraine.
+
+        // There is no point even trying to be neutral, because you can’t. When I say you can’t be neutral on
+        // a moving train, it means the world is already moving in certain directions. Children are going
+        // hungry, wars are taking place. In a situation like that, to be neutral or to try to be neutral,
+        // to stand aside, not to take a stand, not to participate, is to collaborate with whatever is
+        // going on, to allow that to happen.
+
+        if ('ru_RU' === config('firefly.default_language')) {
+            $addQuotes = false;
+            $lines     = [
+                '🇺🇦 Слава Україні!',
+                '🇺🇦 Slava Ukraini!',
+            ];
+        }
+
+        $random    = random_int(0, count($lines) - 1);
+        if ($addQuotes) {
+            $this->line(sprintf('       "%s"', $lines[$random]));
+
+            return;
+        }
+        $this->line(sprintf('       %s', $lines[$random]));
+
     }
 }

app/Console/Commands/System/RecalculatesRunningBalance.php

@@ -1,9 +1,9 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * RecalculatesRunningBalance.php
- * Copyright (c) 2025 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -18,9 +18,11 @@ declare(strict_types=1);
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see https://www.gnu.org/licenses/.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\System;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -48,7 +50,7 @@ class RecalculatesRunningBalance extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): int
     {
         if (true === config('firefly.feature_flags.running_balance_column')) {
             $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
@@ -58,6 +60,8 @@ class RecalculatesRunningBalance extends Command
             return 0;
         }
         $this->friendlyWarning('This command has been disabled.');
+
+        return 0;
     }
 
     private function correctBalanceAmounts(bool $forced): void

app/Console/Commands/System/ResetsErrorMailLimit.php

@@ -0,0 +1,84 @@
+<?php
+
+
+/*
+ * ResetsErrorMailLimit.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Command\Command as CommandAlias;
+
+use function Safe\file_put_contents;
+use function Safe\json_encode;
+
+class ResetsErrorMailLimit extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:reset-error-mail-limit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Resets the number of error mails sent.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $file      = storage_path('framework/cache/error-count.json');
+        $directory = storage_path('framework/cache');
+        $limits    = [];
+
+        if (!is_writable($directory)) {
+            $this->friendlyError(sprintf('Cannot write to directory "%s", cannot rate limit errors.', $directory));
+
+            return CommandAlias::FAILURE;
+        }
+        if (!file_exists($file)) {
+            $this->friendlyInfo(sprintf('Created new limits file at "%s"', $file));
+            file_put_contents($file, json_encode($limits, JSON_PRETTY_PRINT));
+
+            return CommandAlias::SUCCESS;
+        }
+        if (!is_writable($file)) {
+            $this->friendlyError(sprintf('Cannot write to "%s", cannot rate limit errors.', $file));
+
+            return CommandAlias::FAILURE;
+        }
+
+        $this->friendlyInfo(sprintf('Successfully reset the error rate-limits file located at "%s"', $file));
+        file_put_contents($file, json_encode($limits, JSON_PRETTY_PRINT));
+
+        return CommandAlias::SUCCESS;
+    }
+}

app/Console/Commands/System/ScansAttachments.php

@@ -29,12 +29,16 @@ use FireflyIII\Models\Attachment;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
+use Safe\Exceptions\FileinfoException;
+use Safe\Exceptions\FilesystemException;
+use Safe\Exceptions\StringsException;
 
-use function Safe\tempnam;
 use function Safe\file_put_contents;
 use function Safe\md5_file;
 use function Safe\mime_content_type;
+use function Safe\tempnam;
 
 class ScansAttachments extends Command
 {
@@ -46,6 +50,10 @@ class ScansAttachments extends Command
 
     /**
      * Execute the console command.
+     *
+     * @throws FilesystemException
+     * @throws StringsException
+     * @throws FileinfoException
      */
     public function handle(): int
     {
@@ -57,7 +65,7 @@ class ScansAttachments extends Command
             $fileName         = $attachment->fileName();
             $encryptedContent = $disk->get($fileName);
             if (null === $encryptedContent) {
-                app('log')->error(sprintf('No content for attachment #%d under filename "%s"', $attachment->id, $fileName));
+                Log::error(sprintf('No content for attachment #%d under filename "%s"', $attachment->id, $fileName));
 
                 continue;
             }
@@ -65,18 +73,13 @@ class ScansAttachments extends Command
             try {
                 $decryptedContent = Crypt::decrypt($encryptedContent); // verified
             } catch (DecryptException $e) {
-                app('log')->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
+                Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
                 $decryptedContent = $encryptedContent;
             }
             $tempFileName     = tempnam(sys_get_temp_dir(), 'FireflyIII');
-            if (false === $tempFileName) {
-                app('log')->error(sprintf('Could not create temporary file for attachment #%d', $attachment->id));
-
-                exit(1);
-            }
             file_put_contents($tempFileName, $decryptedContent);
-            $attachment->md5  = (string) md5_file($tempFileName);
-            $attachment->mime = (string) mime_content_type($tempFileName);
+            $attachment->md5  = md5_file($tempFileName);
+            $attachment->mime = mime_content_type($tempFileName);
             $attachment->save();
             $this->friendlyInfo(sprintf('Fixed attachment #%d', $attachment->id));
         }

app/Console/Commands/Tools/Cron.php

@@ -50,7 +50,7 @@ class Cron extends Command
         {--download-cer : Download exchange rates. Other tasks will be skipped unless also requested.}
         {--create-recurring : Create recurring transactions. Other tasks will be skipped unless also requested.}
         {--create-auto-budgets : Create auto budgets. Other tasks will be skipped unless also requested.}
-        {--send-bill-warnings : Send bill warnings. Other tasks will be skipped unless also requested.}
+        {--send-subscription-warnings : Send subscription warnings. Other tasks will be skipped unless also requested.}
         {--send-webhook-messages : Sends any stray webhook messages (with a maximum of 5).}
         ';
 
@@ -59,7 +59,7 @@ class Cron extends Command
         $doAll = !$this->option('download-cer')
                  && !$this->option('create-recurring')
                  && !$this->option('create-auto-budgets')
-                 && !$this->option('send-bill-warnings')
+                 && !$this->option('send-subscription-warnings')
                  && !$this->option('check-version')
                  && !$this->option('send-webhook-messages');
         $date  = null;
@@ -116,9 +116,9 @@ class Cron extends Command
         }
 
         // Fire bill warning cron job
-        if ($doAll || $this->option('send-bill-warnings')) {
+        if ($doAll || $this->option('send-subscription-warnings')) {
             try {
-                $this->billWarningCronJob($force, $date);
+                $this->subscriptionWarningCronJob($force, $date);
             } catch (FireflyException $e) {
                 app('log')->error($e->getMessage());
                 app('log')->error($e->getTraceAsString());
@@ -231,25 +231,25 @@ class Cron extends Command
     /**
      * @throws FireflyException
      */
-    private function billWarningCronJob(bool $force, ?Carbon $date): void
+    private function subscriptionWarningCronJob(bool $force, ?Carbon $date): void
     {
-        $autoBudget = new BillWarningCronjob();
-        $autoBudget->setForce($force);
+        $subscriptionWarningJob = new BillWarningCronjob();
+        $subscriptionWarningJob->setForce($force);
         // set date in cron job:
         if ($date instanceof Carbon) {
-            $autoBudget->setDate($date);
+            $subscriptionWarningJob->setDate($date);
         }
 
-        $autoBudget->fire();
+        $subscriptionWarningJob->fire();
 
-        if ($autoBudget->jobErrored) {
-            $this->friendlyError(sprintf('Error in "bill warnings" cron: %s', $autoBudget->message));
+        if ($subscriptionWarningJob->jobErrored) {
+            $this->friendlyError(sprintf('Error in "subscription warnings" cron: %s', $subscriptionWarningJob->message));
         }
-        if ($autoBudget->jobFired) {
-            $this->friendlyInfo(sprintf('"Send bill warnings" cron fired: %s', $autoBudget->message));
+        if ($subscriptionWarningJob->jobFired) {
+            $this->friendlyInfo(sprintf('"Send subscription warnings" cron fired: %s', $subscriptionWarningJob->message));
         }
-        if ($autoBudget->jobSucceeded) {
-            $this->friendlyPositive(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
+        if ($subscriptionWarningJob->jobSucceeded) {
+            $this->friendlyPositive(sprintf('"Send subscription warnings" cron ran with success: %s', $subscriptionWarningJob->message));
         }
     }
 

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -66,7 +66,7 @@ class RemovesDatabaseDecryption extends Command
          * @var string $table
          * @var array  $fields
          */
-        foreach ($tables as $table => $fields) {
+        foreach ($tables as $table => $fields) { // @phpstan-ignore-line
             $this->decryptTable($table, $fields);
         }
 

app/Console/Commands/Upgrade/UpgradesDatabase.php

@@ -75,6 +75,7 @@ class UpgradesDatabase extends Command
             'upgrade:610-currency-preferences',
             'upgrade:620-piggy-banks',
             'upgrade:620-pc-amounts',
+            'upgrade:640-upgrade-webhooks',
             'firefly-iii:correct-database',
         ];
         $args     = [];