Auto commit for release 'develop' on 2024-04-01

Fix `Division error by zero` in budget views

.ci/all.sh

@@ -22,6 +22,9 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
+echo "Running PHP CS Fixer"
 $SCRIPT_DIR/phpcs.sh
+echo "Running PHPStan"
 $SCRIPT_DIR/phpstan.sh
+echo "Running PHPMD"
 $SCRIPT_DIR/phpmd.sh

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

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "composer/pcre",
-            "version": "3.1.1",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
                 "shasum": ""
             },
             "require": {
@@ -59,7 +59,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.1"
+                "source": "https://github.com/composer/pcre/tree/3.1.3"
             },
             "funding": [
                 {
@@ -75,7 +75,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-11T07:11:09+00:00"
+            "time": "2024-03-19T10:26:25+00:00"
         },
         {
             "name": "composer/semver",
@@ -160,16 +160,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
+                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
                 "shasum": ""
             },
             "require": {
@@ -180,7 +180,7 @@
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
             },
             "type": "library",
             "autoload": {
@@ -204,9 +204,9 @@
                 "performance"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.4"
             },
             "funding": [
                 {
@@ -222,20 +222,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T21:32:43+00:00"
+            "time": "2024-03-26T18:29:49+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.49.0",
+            "version": "v3.52.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2"
+                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8742f7aa6f72a399688b65e4f58992c2d4681fc2",
-                "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6e77207f0d851862ceeb6da63e6e22c01b1587bc",
+                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc",
                 "shasum": ""
             },
             "require": {
@@ -245,7 +245,7 @@
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "php": "^7.4 || ^8.0",
-                "sebastian/diff": "^4.0 || ^5.0",
+                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
                 "symfony/console": "^5.4 || ^6.0 || ^7.0",
                 "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
                 "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
@@ -266,7 +266,8 @@
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
-                "phpunit/phpunit": "^9.6 || ^10.5.5",
+                "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2",
+                "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
                 "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
             },
             "suggest": {
@@ -305,7 +306,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.49.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.1"
             },
             "funding": [
                 {
@@ -313,7 +314,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-02T00:41:40+00:00"
+            "time": "2024-03-19T21:02:43+00:00"
         },
         {
             "name": "psr/container",
@@ -470,29 +471,29 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "5.1.0",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f"
+                "reference": "ab83243ecc233de5655b76f577711de9f842e712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f",
-                "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ab83243ecc233de5655b76f577711de9f842e712",
+                "reference": "ab83243ecc233de5655b76f577711de9f842e712",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0",
+                "phpunit/phpunit": "^11.0",
                 "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -525,7 +526,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0"
+                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.1"
             },
             "funding": [
                 {
@@ -533,20 +534,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-22T10:55:06+00:00"
+            "time": "2024-03-02T07:30:33+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v7.0.3",
+            "version": "v7.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456"
+                "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c5010d50f1ee4b25cfa0201d9915cf1b14071456",
-                "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456",
+                "url": "https://api.github.com/repos/symfony/console/zipball/6b099f3306f7c9c2d2786ed736d0026b2903205f",
+                "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f",
                 "shasum": ""
             },
             "require": {
@@ -610,7 +611,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.0.3"
+                "source": "https://github.com/symfony/console/tree/v7.0.4"
             },
             "funding": [
                 {
@@ -626,7 +627,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T15:02:46+00:00"
+            "time": "2024-02-22T20:27:20+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1521,16 +1522,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.0.3",
+            "version": "v7.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "937a195147e0c27b2759ade834169ed006d0bc74"
+                "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/937a195147e0c27b2759ade834169ed006d0bc74",
-                "reference": "937a195147e0c27b2759ade834169ed006d0bc74",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0e7727191c3b71ebec6d529fa0e50a01ca5679e9",
+                "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9",
                 "shasum": ""
             },
             "require": {
@@ -1562,7 +1563,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.0.3"
+                "source": "https://github.com/symfony/process/tree/v7.0.4"
             },
             "funding": [
                 {
@@ -1578,7 +1579,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T15:02:46+00:00"
+            "time": "2024-02-22T20:27:20+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -1726,16 +1727,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.0.3",
+            "version": "v7.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "524aac4a280b90a4420d8d6a040718d0586505ac"
+                "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/524aac4a280b90a4420d8d6a040718d0586505ac",
-                "reference": "524aac4a280b90a4420d8d6a040718d0586505ac",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b",
+                "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b",
                 "shasum": ""
             },
             "require": {
@@ -1792,7 +1793,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.0.3"
+                "source": "https://github.com/symfony/string/tree/v7.0.4"
             },
             "funding": [
                 {
@@ -1808,7 +1809,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T15:41:16+00:00"
+            "time": "2024-02-01T13:17:36+00:00"
         }
     ],
     "packages-dev": [],

.ci/phpmd/composer.lock

@@ -9,16 +9,16 @@
     "packages-dev": [
         {
             "name": "composer/pcre",
-            "version": "3.1.1",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
+                "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace",
+                "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace",
                 "shasum": ""
             },
             "require": {
@@ -60,7 +60,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.1"
+                "source": "https://github.com/composer/pcre/tree/3.1.2"
             },
             "funding": [
                 {
@@ -76,7 +76,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-11T07:11:09+00:00"
+            "time": "2024-03-07T15:38:35+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -395,16 +395,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v7.0.3",
+            "version": "v7.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16"
+                "reference": "44deeba7233f08f383185ffa37dace3b3bc87364"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16",
-                "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16",
+                "url": "https://api.github.com/repos/symfony/config/zipball/44deeba7233f08f383185ffa37dace3b3bc87364",
+                "reference": "44deeba7233f08f383185ffa37dace3b3bc87364",
                 "shasum": ""
             },
             "require": {
@@ -450,7 +450,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v7.0.3"
+                "source": "https://github.com/symfony/config/tree/v7.0.4"
             },
             "funding": [
                 {
@@ -466,20 +466,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:34:29+00:00"
+            "time": "2024-02-26T07:52:39+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v7.0.3",
+            "version": "v7.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "e915c6684b8e3ae90a4441f6823ebbb40edf0b92"
+                "reference": "47f37af245df8457ea63409fc242b3cc825ce5eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e915c6684b8e3ae90a4441f6823ebbb40edf0b92",
-                "reference": "e915c6684b8e3ae90a4441f6823ebbb40edf0b92",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/47f37af245df8457ea63409fc242b3cc825ce5eb",
+                "reference": "47f37af245df8457ea63409fc242b3cc825ce5eb",
                 "shasum": ""
             },
             "require": {
@@ -530,7 +530,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.3"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.4"
             },
             "funding": [
                 {
@@ -546,7 +546,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:34:29+00:00"
+            "time": "2024-02-22T20:27:20+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -921,16 +921,16 @@
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v7.0.3",
+            "version": "v7.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8"
+                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1fb79308cb5fc2b44bff6e8af10a5af6812e05b8",
-                "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
+                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
                 "shasum": ""
             },
             "require": {
@@ -975,7 +975,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.0.3"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.0.4"
             },
             "funding": [
                 {
@@ -991,7 +991,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T15:02:46+00:00"
+            "time": "2024-02-26T10:35:24+00:00"
         }
     ],
     "aliases": [],

.env.example

@@ -111,7 +111,10 @@ PGSQL_SSL_CERT=null
 PGSQL_SSL_KEY=null
 PGSQL_SSL_CRL_FILE=null
 
-# more PostgreSQL settings
+# For postgresql 15 and up, setting this to public will no longer work as expected, becasuse the
+# 'public' schema is without grants. This can be worked around by having a super user grant those
+# necessary privileges, but in security conscious setups that's not viable.
+# You will need to set this to the schema you want to use.
 PGSQL_SCHEMA=public
 
 # If you're looking for performance improvements, you could install memcached or redis
@@ -184,6 +187,11 @@ SEND_REPORT_JOURNALS=true
 # Since this involves an external service, it's optional and disabled by default.
 ENABLE_EXTERNAL_MAP=false
 
+#
+# Enable or disable exchange rate conversion. This function isn't used yet by Firefly III
+#
+ENABLE_EXCHANGE_RATES=false
+
 # Set this value to true if you want Firefly III to download currency exchange rates
 # from the internet. These rates are hosted by the creator of Firefly III inside
 # an Azure Storage Container.

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# code owners for this Firefly III related repository
+* @JC5 @SDx3

.github/funding.yml

@@ -1,4 +1,6 @@
-# These are supported funding model platforms
+# Firefly III sponsor options
 
 github: jc5
 patreon: JC5
+ko_fi: jamesc5
+liberapay: JC5

.github/workflows/cleanup.yml

@@ -7,7 +7,7 @@ permissions:
 
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 1 * * *'
   workflow_dispatch:
 jobs:
   prune:

.github/workflows/lock.yml

@@ -3,17 +3,27 @@ name: 'Issues - Lock old issues'
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 2 * * *'
+
+concurrency:
+  group: lock-threads
+
+permissions:
+  issues: write
+  pull-requests: write
+  discussions: write
 
 jobs:
   lock:
     permissions:
       issues: write
       pull-requests: write
+      discussions: write
     runs-on: ubuntu-latest
     steps:
-      - uses: JC5/lock-threads@main
+      - uses: dessant/lock-threads@v5
         with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: 7
-          pr-inactive-days: 7
+          issue-inactive-days: 21
+          pr-inactive-days: 21
+          discussion-inactive-days: 21
+          log-output: true

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
         required: true
         default: 'develop'
   schedule:
-    - cron:  '15 0 * * MON,THU'
+    - cron:  '0 3 * * MON,THU'
 
 jobs:
   build:
@@ -51,7 +51,7 @@ jobs:
           CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
       - name: Cleanup translations
         id: cleanup-transactions
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:crowdin-warning'
           output: ''
@@ -60,7 +60,7 @@ jobs:
           GH_TOKEN: ''
       - name: Cleanup changelog
         id: cleanup-changelog
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:changelog'
           output: ''
@@ -69,7 +69,7 @@ jobs:
           GH_TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
       - name: Extract changelog
         id: extract-changelog
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:extract-changelog'
           output: 'output'
@@ -78,7 +78,7 @@ jobs:
           GH_TOKEN: ""
       - name: Replace version
         id: replace-version
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:version'
           output: ''
@@ -88,7 +88,7 @@ jobs:
           FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
       - name: Generate JSON v1
         id: json-v1
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:json-translations v1'
           output: ''
@@ -97,7 +97,7 @@ jobs:
           GH_TOKEN: ''
       - name: Generate JSON v2
         id: json-v2
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:json-translations v2'
           output: ''
@@ -106,7 +106,7 @@ jobs:
           GH_TOKEN: ''
       - name: Code cleanup
         id: code-cleanup
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:code'
           output: ''
@@ -115,11 +115,12 @@ jobs:
           GH_TOKEN: ''
       - name: Build new JS
         run: |
-          npm upgrade
+          npm install
+          npm update
           npm run build
       - name: Build old JS
         id: old-js
-        uses: JC5/firefly-iii-dev@v32
+        uses: JC5/firefly-iii-dev@v36
         with:
           action: 'ff3:old-js'
           output: ''
@@ -140,10 +141,39 @@ jobs:
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
           git config advice.addIgnoredFile false
 
+          # update composer (again)
+          composer validate --strict
+          composer update --no-dev --no-scripts --no-plugins
+          composer dump-autoload
+
+          releaseName=$version
+          originalName=$version
+          tarName=FireflyIII-$version.tar.gz
+
           if [[ "develop" == "$version" ]]; then
             [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            releaseName=$version-$(date +'%Y%m%d')
+            originalName=$releaseName
+            zipName=FireflyIII-develop.zip
+            tarName=FireflyIII-develop.tar.gz
           fi
 
+          # in both cases, if the release or tag already exists, add ".1" until it no longer exists.
+          tagFound=true
+          tagCount=1
+          while [ "$tagFound" = true ]
+          do
+            if [ $(git tag -l "$releaseName") ]; then
+              echo "Tag $releaseName exists already."
+              releaseName="$originalName"."$tagCount"
+              echo "Tag for release is now $releaseName"
+            else
+             echo "Tag $releaseName does not exist, can continue"
+             tagFound=false
+            fi
+          done
+          echo "Will use tag and release name $releaseName."
+
           git add -A
           if test -f "output.txt"; then
             git reset output.txt
@@ -151,19 +181,64 @@ jobs:
           git commit -m "Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
           git push
 
+          # zip and tar everything
+          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*"
+          touch $tarName
+          tar --exclude=$tarName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' -czf $tarName .
+
+          # add sha256 sum
+          sha256sum -b $zipName > $zipName.sha256
+          sha256sum -b $tarName > $tarName.sha256
+
           if [[ "develop" == "$version" ]]; then
-            echo "Create nightly release."
-            git tag -a $version-$(date +'%Y%m%d') -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
-            git push origin $version-$(date +'%Y%m%d')
-            gh release create $version-$(date +'%Y%m%d') -p --verify-tag \
-              -t "Development release for $(date +'%Y-%m-%d')" \
-              -n "Bi-weekly development release of Firefly III with the latest fixes, translations and features. This release was created on **$(date +'%Y-%m-%d')** and may contain bugs. Use at your own risk. Docker users can find this release under the \`develop\` tag."
-          else
-            echo "Create default release."
-            git tag -a $version -m "Here be changelog"
-            git push origin $version
-            gh release create $version -F output.txt -t "$version" --verify-tag
+            # add text to output.txt (instructions)
             rm output.txt
+            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this pre-release, as is may not work as expected." >> output.txt
+
+            # create the release:
+            echo "Create nightly release."
+            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
+              -t "Development release for $(date +'%Y-%m-%d')" \
+              -F output.txt
+
+            # add zip file to release.
+            gh release upload $releaseName $zipName
+            gh release upload $releaseName $tarName
+
+            # add sha256 sum to release
+            gh release upload $releaseName $zipName.sha256
+            gh release upload $releaseName $tarName.sha256
+
+            # rm output.txt again
+            rm output.txt
+          else
+            # add text to output.txt (more instructions)
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+
+            echo "Create default release."
+            git tag -a $releaseName -m "Here be changelog"
+            git push origin $releaseName
+            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+            # add zip file to release.
+            gh release upload $releaseName $zipName
+            # add sha256 sum to release
+            gh release upload $releaseName $zipName.sha256
+            rm output.txt
+            rm $zipName
+            rm $zipName.sha256
             git checkout develop
             git merge main
             git push

.github/workflows/sonarcloud.yml

@@ -45,15 +45,6 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
 
-      - name: PHPStan
-        run: .ci/phpstan.sh
-
-      - name: PHPMD
-        run: .ci/phpmd.sh
-
-      - name: PHP CS Fixer
-        run: .ci/phpcs.sh
-
       - name: "Create database file"
         run: touch storage/database/database.sqlite
 

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
 name: "Issues - Mark and close stale issues"
 on:
   schedule:
-    - cron: "30 1 * * *"
+    - cron: "0 4 * * *"
   workflow_dispatch:
 
 permissions:

.gitignore

@@ -7,3 +7,6 @@ yarn-error.log
 .env
 /.ci/php-cs-fixer/vendor
 coverage.xml
+
+# ignore generated files.
+public/build

app/Api/V1/Controllers/Controller.php

@@ -76,38 +76,6 @@ abstract class Controller extends BaseController
         );
     }
 
-    /**
-     * Method to help build URL's.
-     */
-    final protected function buildParams(): string
-    {
-        $return = '?';
-        $params = [];
-        foreach ($this->parameters as $key => $value) {
-            if ('page' === $key) {
-                continue;
-            }
-            if ($value instanceof Carbon) {
-                $params[$key] = $value->format('Y-m-d');
-
-                continue;
-            }
-            $params[$key] = $value;
-        }
-
-        return $return.http_build_query($params);
-    }
-
-    final protected function getManager(): Manager
-    {
-        // create some objects:
-        $manager = new Manager();
-        $baseUrl = request()->getSchemeAndHttpHost().'/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        return $manager;
-    }
-
     /**
      * Method to grab all parameters from the URL.
      */
@@ -216,4 +184,36 @@ abstract class Controller extends BaseController
 
         return $bag;
     }
+
+    /**
+     * Method to help build URL's.
+     */
+    final protected function buildParams(): string
+    {
+        $return = '?';
+        $params = [];
+        foreach ($this->parameters as $key => $value) {
+            if ('page' === $key) {
+                continue;
+            }
+            if ($value instanceof Carbon) {
+                $params[$key] = $value->format('Y-m-d');
+
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        return $return.http_build_query($params);
+    }
+
+    final protected function getManager(): Manager
+    {
+        // create some objects:
+        $manager = new Manager();
+        $baseUrl = request()->getSchemeAndHttpHost().'/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        return $manager;
+    }
 }

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

@@ -68,6 +68,32 @@ class ExportController extends Controller
         return $this->returnExport('accounts');
     }
 
+    /**
+     * @throws FireflyException
+     */
+    private function returnExport(string $key): LaravelResponse
+    {
+        $date     = date('Y-m-d-H-i-s');
+        $fileName = sprintf('%s-export-%s.csv', $date, $key);
+        $data     = $this->exporter->export();
+
+        /** @var LaravelResponse $response */
+        $response = response($data[$key]);
+        $response
+            ->header('Content-Description', 'File Transfer')
+            ->header('Content-Type', 'application/octet-stream')
+            ->header('Content-Disposition', 'attachment; filename='.$fileName)
+            ->header('Content-Transfer-Encoding', 'binary')
+            ->header('Connection', 'Keep-Alive')
+            ->header('Expires', '0')
+            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+            ->header('Pragma', 'public')
+            ->header('Content-Length', (string)strlen($data[$key]))
+        ;
+
+        return $response;
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills
@@ -189,30 +215,4 @@ class ExportController extends Controller
 
         return $this->returnExport('transactions');
     }
-
-    /**
-     * @throws FireflyException
-     */
-    private function returnExport(string $key): LaravelResponse
-    {
-        $date     = date('Y-m-d-H-i-s');
-        $fileName = sprintf('%s-export-%s.csv', $date, $key);
-        $data     = $this->exporter->export();
-
-        /** @var LaravelResponse $response */
-        $response = response($data[$key]);
-        $response
-            ->header('Content-Description', 'File Transfer')
-            ->header('Content-Type', 'application/octet-stream')
-            ->header('Content-Disposition', 'attachment; filename='.$fileName)
-            ->header('Content-Transfer-Encoding', 'binary')
-            ->header('Connection', 'Keep-Alive')
-            ->header('Expires', '0')
-            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
-            ->header('Pragma', 'public')
-            ->header('Content-Length', (string) strlen($data[$key]))
-        ;
-
-        return $response;
-    }
 }

app/Api/V1/Controllers/Models/Rule/ExpressionController.php

@@ -0,0 +1,47 @@
+<?php
+/*
+ * ExpressionController.php
+ * Copyright (c) 2024 Michael Thomas
+ *
+ * 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\Models\Rule;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Rule\ValidateExpressionRequest;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class ExpressionController
+ */
+class ExpressionController extends Controller
+{
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/validateExpression
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function validateExpression(ValidateExpressionRequest $request): JsonResponse
+    {
+        return response()->json([
+            'valid' => true,
+        ]);
+    }
+}

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

@@ -118,23 +118,6 @@ class BasicController extends Controller
         return response()->json($return);
     }
 
-    /**
-     * Check if date is outside session range.
-     */
-    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
-    {
-        $result = false;
-        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
-        }
-        // start and end in the past? use $end
-        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
-        }
-
-        return $result;
-    }
-
     private function getBalanceInformation(Carbon $start, Carbon $end): array
     {
         // prep some arrays:
@@ -298,7 +281,7 @@ class BasicController extends Controller
             $spentInCurrency = $row['sum'];
             $leftToSpend     = bcadd($amount, $spentInCurrency);
 
-            $days            = $today->diffInDays($end) + 1;
+            $days            = (int)$today->diffInDays($end, true) + 1;
             $perDay          = '0';
             if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
                 $perDay = bcdiv($leftToSpend, (string)$days);
@@ -380,4 +363,21 @@ class BasicController extends Controller
 
         return $return;
     }
+
+    /**
+     * Check if date is outside session range.
+     */
+    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
+    {
+        $result = false;
+        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
+            $result = true;
+        }
+        // start and end in the past? use $end
+        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
+            $result = true;
+        }
+
+        return $result;
+    }
 }

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

@@ -88,6 +88,35 @@ class ConfigurationController extends Controller
         return response()->json($return);
     }
 
+    /**
+     * Get all config values.
+     */
+    private function getDynamicConfiguration(): array
+    {
+        $isDemoSite  = app('fireflyconfig')->get('is_demo_site');
+        $updateCheck = app('fireflyconfig')->get('permission_update_check');
+        $lastCheck   = app('fireflyconfig')->get('last_update_check');
+        $singleUser  = app('fireflyconfig')->get('single_user_mode');
+
+        return [
+            'is_demo_site'            => $isDemoSite?->data,
+            'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
+            'last_update_check'       => null === $lastCheck ? null : (int)$lastCheck->data,
+            'single_user_mode'        => $singleUser?->data,
+        ];
+    }
+
+    private function getStaticConfiguration(): array
+    {
+        $list   = EitherConfigKey::$static;
+        $return = [];
+        foreach ($list as $key) {
+            $return[$key] = config($key);
+        }
+
+        return $return;
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getSingleConfiguration
@@ -145,33 +174,4 @@ class ConfigurationController extends Controller
 
         return response()->json(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
-
-    /**
-     * Get all config values.
-     */
-    private function getDynamicConfiguration(): array
-    {
-        $isDemoSite  = app('fireflyconfig')->get('is_demo_site');
-        $updateCheck = app('fireflyconfig')->get('permission_update_check');
-        $lastCheck   = app('fireflyconfig')->get('last_update_check');
-        $singleUser  = app('fireflyconfig')->get('single_user_mode');
-
-        return [
-            'is_demo_site'            => $isDemoSite?->data,
-            'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
-            'last_update_check'       => null === $lastCheck ? null : (int)$lastCheck->data,
-            'single_user_mode'        => $singleUser?->data,
-        ];
-    }
-
-    private function getStaticConfiguration(): array
-    {
-        $list   = EitherConfigKey::$static;
-        $return = [];
-        foreach ($list as $key) {
-            $return[$key] = config($key);
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/Data/DateRequest.php

@@ -46,7 +46,7 @@ class DateRequest extends FormRequest
     {
         $start = $this->getCarbonDate('start');
         $end   = $this->getCarbonDate('end');
-        if ($start->diffInYears($end) > 5) {
+        if ($start->diffInYears($end, true) > 5) {
             throw new FireflyException('Date range out of range.');
         }
 

app/Api/V1/Requests/Insight/GenericRequest.php

@@ -78,6 +78,25 @@ class GenericRequest extends FormRequest
         return $return;
     }
 
+    private function parseAccounts(): void
+    {
+        if (0 !== $this->accounts->count()) {
+            return;
+        }
+        $repository = app(AccountRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array      = $this->get('accounts');
+        if (is_array($array)) {
+            foreach ($array as $accountId) {
+                $accountId = (int)$accountId;
+                $account   = $repository->find($accountId);
+                if (null !== $account) {
+                    $this->accounts->push($account);
+                }
+            }
+        }
+    }
+
     public function getBills(): Collection
     {
         $this->parseBills();
@@ -85,6 +104,25 @@ class GenericRequest extends FormRequest
         return $this->bills;
     }
 
+    private function parseBills(): void
+    {
+        if (0 !== $this->bills->count()) {
+            return;
+        }
+        $repository = app(BillRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array      = $this->get('bills');
+        if (is_array($array)) {
+            foreach ($array as $billId) {
+                $billId = (int)$billId;
+                $bill   = $repository->find($billId);
+                if (null !== $bill) {
+                    $this->bills->push($bill);
+                }
+            }
+        }
+    }
+
     public function getBudgets(): Collection
     {
         $this->parseBudgets();
@@ -92,6 +130,25 @@ class GenericRequest extends FormRequest
         return $this->budgets;
     }
 
+    private function parseBudgets(): void
+    {
+        if (0 !== $this->budgets->count()) {
+            return;
+        }
+        $repository = app(BudgetRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array      = $this->get('budgets');
+        if (is_array($array)) {
+            foreach ($array as $budgetId) {
+                $budgetId = (int)$budgetId;
+                $budget   = $repository->find($budgetId);
+                if (null !== $budget) {
+                    $this->budgets->push($budget);
+                }
+            }
+        }
+    }
+
     public function getCategories(): Collection
     {
         $this->parseCategories();
@@ -99,6 +156,25 @@ class GenericRequest extends FormRequest
         return $this->categories;
     }
 
+    private function parseCategories(): void
+    {
+        if (0 !== $this->categories->count()) {
+            return;
+        }
+        $repository = app(CategoryRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array      = $this->get('categories');
+        if (is_array($array)) {
+            foreach ($array as $categoryId) {
+                $categoryId = (int)$categoryId;
+                $category   = $repository->find($categoryId);
+                if (null !== $category) {
+                    $this->categories->push($category);
+                }
+            }
+        }
+    }
+
     public function getEnd(): Carbon
     {
         $date = $this->getCarbonDate('end');
@@ -154,100 +230,6 @@ class GenericRequest extends FormRequest
         return $this->tags;
     }
 
-    /**
-     * The rules that the incoming request must be matched against.
-     */
-    public function rules(): array
-    {
-        // this is cheating, but it works to initialize the collections.
-        $this->accounts   = new Collection();
-        $this->budgets    = new Collection();
-        $this->categories = new Collection();
-        $this->bills      = new Collection();
-        $this->tags       = new Collection();
-
-        return [
-            'start' => 'required|date',
-            'end'   => 'required|date|after_or_equal:start',
-        ];
-    }
-
-    private function parseAccounts(): void
-    {
-        if (0 !== $this->accounts->count()) {
-            return;
-        }
-        $repository = app(AccountRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array      = $this->get('accounts');
-        if (is_array($array)) {
-            foreach ($array as $accountId) {
-                $accountId = (int)$accountId;
-                $account   = $repository->find($accountId);
-                if (null !== $account) {
-                    $this->accounts->push($account);
-                }
-            }
-        }
-    }
-
-    private function parseBills(): void
-    {
-        if (0 !== $this->bills->count()) {
-            return;
-        }
-        $repository = app(BillRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array      = $this->get('bills');
-        if (is_array($array)) {
-            foreach ($array as $billId) {
-                $billId = (int)$billId;
-                $bill   = $repository->find($billId);
-                if (null !== $bill) {
-                    $this->bills->push($bill);
-                }
-            }
-        }
-    }
-
-    private function parseBudgets(): void
-    {
-        if (0 !== $this->budgets->count()) {
-            return;
-        }
-        $repository = app(BudgetRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array      = $this->get('budgets');
-        if (is_array($array)) {
-            foreach ($array as $budgetId) {
-                $budgetId = (int)$budgetId;
-                $budget   = $repository->find($budgetId);
-                if (null !== $budget) {
-                    $this->budgets->push($budget);
-                }
-            }
-        }
-    }
-
-    private function parseCategories(): void
-    {
-        if (0 !== $this->categories->count()) {
-            return;
-        }
-        $repository = app(CategoryRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array      = $this->get('categories');
-        if (is_array($array)) {
-            foreach ($array as $categoryId) {
-                $categoryId = (int)$categoryId;
-                $category   = $repository->find($categoryId);
-                if (null !== $category) {
-                    $this->categories->push($category);
-                }
-            }
-        }
-    }
-
     private function parseTags(): void
     {
         if (0 !== $this->tags->count()) {
@@ -266,4 +248,22 @@ class GenericRequest extends FormRequest
             }
         }
     }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        // this is cheating, but it works to initialize the collections.
+        $this->accounts   = new Collection();
+        $this->budgets    = new Collection();
+        $this->categories = new Collection();
+        $this->bills      = new Collection();
+        $this->tags       = new Collection();
+
+        return [
+            'start' => 'required|date',
+            'end'   => 'required|date|after_or_equal:start',
+        ];
+    }
 }

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

@@ -73,6 +73,65 @@ class StoreRequest extends FormRequest
         ];
     }
 
+    /**
+     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
+     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
+     */
+    private function getTransactionData(): array
+    {
+        $return       = [];
+
+        // transaction data:
+        /** @var null|array $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return [];
+        }
+
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = $this->getSingleTransactionData($transaction);
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     */
+    private function getRepetitionData(): array
+    {
+        $return      = [];
+
+        // repetition data:
+        /** @var null|array $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return [];
+        }
+
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $current  = [];
+            if (array_key_exists('type', $repetition)) {
+                $current['type'] = $repetition['type'];
+            }
+            if (array_key_exists('moment', $repetition)) {
+                $current['moment'] = $repetition['moment'];
+            }
+            if (array_key_exists('skip', $repetition)) {
+                $current['skip'] = (int)$repetition['skip'];
+            }
+            if (array_key_exists('weekend', $repetition)) {
+                $current['weekend'] = (int)$repetition['weekend'];
+            }
+
+            $return[] = $current;
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      */
@@ -136,63 +195,4 @@ class StoreRequest extends FormRequest
             Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
         }
     }
-
-    /**
-     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
-     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
-     */
-    private function getTransactionData(): array
-    {
-        $return       = [];
-
-        // transaction data:
-        /** @var null|array $transactions */
-        $transactions = $this->get('transactions');
-        if (null === $transactions) {
-            return [];
-        }
-
-        /** @var array $transaction */
-        foreach ($transactions as $transaction) {
-            $return[] = $this->getSingleTransactionData($transaction);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Returns the repetition data as it is found in the submitted data.
-     */
-    private function getRepetitionData(): array
-    {
-        $return      = [];
-
-        // repetition data:
-        /** @var null|array $repetitions */
-        $repetitions = $this->get('repetitions');
-        if (null === $repetitions) {
-            return [];
-        }
-
-        /** @var array $repetition */
-        foreach ($repetitions as $repetition) {
-            $current  = [];
-            if (array_key_exists('type', $repetition)) {
-                $current['type'] = $repetition['type'];
-            }
-            if (array_key_exists('moment', $repetition)) {
-                $current['moment'] = $repetition['moment'];
-            }
-            if (array_key_exists('skip', $repetition)) {
-                $current['skip'] = (int)$repetition['skip'];
-            }
-            if (array_key_exists('weekend', $repetition)) {
-                $current['weekend'] = (int)$repetition['weekend'];
-            }
-
-            $return[] = $current;
-        }
-
-        return $return;
-    }
 }

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

@@ -78,6 +78,70 @@ class UpdateRequest extends FormRequest
         return $return;
     }
 
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     */
+    private function getRepetitionData(): ?array
+    {
+        $return      = [];
+
+        // repetition data:
+        /** @var null|array $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return null;
+        }
+
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $current  = [];
+            if (array_key_exists('type', $repetition)) {
+                $current['type'] = $repetition['type'];
+            }
+
+            if (array_key_exists('moment', $repetition)) {
+                $current['moment'] = (string)$repetition['moment'];
+            }
+
+            if (array_key_exists('skip', $repetition)) {
+                $current['skip'] = (int)$repetition['skip'];
+            }
+
+            if (array_key_exists('weekend', $repetition)) {
+                $current['weekend'] = (int)$repetition['weekend'];
+            }
+            $return[] = $current;
+        }
+        if (0 === count($return)) {
+            return null;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
+     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
+     */
+    private function getTransactionData(): array
+    {
+        $return       = [];
+
+        // transaction data:
+        /** @var null|array $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return [];
+        }
+
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = $this->getSingleTransactionData($transaction);
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      */
@@ -146,68 +210,4 @@ class UpdateRequest extends FormRequest
             Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
         }
     }
-
-    /**
-     * Returns the repetition data as it is found in the submitted data.
-     */
-    private function getRepetitionData(): ?array
-    {
-        $return      = [];
-
-        // repetition data:
-        /** @var null|array $repetitions */
-        $repetitions = $this->get('repetitions');
-        if (null === $repetitions) {
-            return null;
-        }
-
-        /** @var array $repetition */
-        foreach ($repetitions as $repetition) {
-            $current  = [];
-            if (array_key_exists('type', $repetition)) {
-                $current['type'] = $repetition['type'];
-            }
-
-            if (array_key_exists('moment', $repetition)) {
-                $current['moment'] = (string) $repetition['moment'];
-            }
-
-            if (array_key_exists('skip', $repetition)) {
-                $current['skip'] = (int) $repetition['skip'];
-            }
-
-            if (array_key_exists('weekend', $repetition)) {
-                $current['weekend'] = (int) $repetition['weekend'];
-            }
-            $return[] = $current;
-        }
-        if (0 === count($return)) {
-            return null;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
-     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
-     */
-    private function getTransactionData(): array
-    {
-        $return       = [];
-
-        // transaction data:
-        /** @var null|array $transactions */
-        $transactions = $this->get('transactions');
-        if (null === $transactions) {
-            return [];
-        }
-
-        /** @var array $transaction */
-        foreach ($transactions as $transaction) {
-            $return[] = $this->getSingleTransactionData($transaction);
-        }
-
-        return $return;
-    }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
@@ -57,13 +58,48 @@ class StoreRequest extends FormRequest
             'active'           => ['active', 'boolean'],
         ];
         $data             = $this->getAllData($fields);
-
         $data['triggers'] = $this->getRuleTriggers();
         $data['actions']  = $this->getRuleActions();
 
         return $data;
     }
 
+    private function getRuleTriggers(): array
+    {
+        $triggers = $this->get('triggers');
+        $return   = [];
+        if (is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'true')),
+                    'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    private function getRuleActions(): array
+    {
+        $actions = $this->get('actions');
+        $return  = [];
+        if (is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'type'            => $action['type'],
+                    'value'           => $action['value'],
+                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'true')),
+                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      */
@@ -87,7 +123,7 @@ class StoreRequest extends FormRequest
             'triggers.*.stop_processing' => [new IsBoolean()],
             'triggers.*.active'          => [new IsBoolean()],
             'actions.*.type'             => 'required|in:'.implode(',', $validActions),
-            'actions.*.value'            => 'required_if:actions.*.type,'.$contextActions.'|ruleActionValue',
+            'actions.*.value'            => [sprintf('required_if:actions.*.type,%s', $contextActions), new IsValidActionExpression(), 'ruleActionValue'],
             'actions.*.stop_processing'  => [new IsBoolean()],
             'actions.*.active'           => [new IsBoolean()],
             'strict'                     => [new IsBoolean()],
@@ -197,40 +233,4 @@ class StoreRequest extends FormRequest
             $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_action'));
         }
     }
-
-    private function getRuleTriggers(): array
-    {
-        $triggers = $this->get('triggers');
-        $return   = [];
-        if (is_array($triggers)) {
-            foreach ($triggers as $trigger) {
-                $return[] = [
-                    'type'            => $trigger['type'],
-                    'value'           => $trigger['value'],
-                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'true')),
-                    'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
-                ];
-            }
-        }
-
-        return $return;
-    }
-
-    private function getRuleActions(): array
-    {
-        $actions = $this->get('actions');
-        $return  = [];
-        if (is_array($actions)) {
-            foreach ($actions as $action) {
-                $return[] = [
-                    'type'            => $action['type'],
-                    'value'           => $action['value'],
-                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'true')),
-                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
-                ];
-            }
-        }
-
-        return $return;
-    }
 }

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

@@ -47,16 +47,6 @@ class TestRequest extends FormRequest
         ];
     }
 
-    public function rules(): array
-    {
-        return [
-            'start'      => 'date',
-            'end'        => 'date|after_or_equal:start',
-            'accounts'   => '',
-            'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
-        ];
-    }
-
     private function getPage(): int
     {
         return 0 === (int)$this->query('page') ? 1 : (int)$this->query('page');
@@ -81,4 +71,14 @@ class TestRequest extends FormRequest
     {
         return $this->get('accounts');
     }
+
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after_or_equal:start',
+            'accounts'   => '',
+            'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
+        ];
+    }
 }

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

@@ -46,16 +46,6 @@ class TriggerRequest extends FormRequest
         ];
     }
 
-    public function rules(): array
-    {
-        return [
-            'start'      => 'date',
-            'end'        => 'date|after_or_equal:start',
-            'accounts'   => '',
-            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
-        ];
-    }
-
     private function getDate(string $field): ?Carbon
     {
         $value  = $this->query($field);
@@ -75,4 +65,14 @@ class TriggerRequest extends FormRequest
     {
         return $this->get('accounts') ?? [];
     }
+
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after_or_equal:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
+    }
 }

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

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
 use FireflyIII\Models\Rule;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
@@ -70,6 +71,50 @@ class UpdateRequest extends FormRequest
         return $return;
     }
 
+    private function getRuleTriggers(): ?array
+    {
+        if (!$this->has('triggers')) {
+            return null;
+        }
+        $triggers = $this->get('triggers');
+        $return   = [];
+        if (is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $active         = array_key_exists('active', $trigger) ? $trigger['active'] : true;
+                $stopProcessing = array_key_exists('stop_processing', $trigger) ? $trigger['stop_processing'] : false;
+                $return[]       = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $active,
+                    'stop_processing' => $stopProcessing,
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    private function getRuleActions(): ?array
+    {
+        if (!$this->has('actions')) {
+            return null;
+        }
+        $actions = $this->get('actions');
+        $return  = [];
+        if (is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'type'            => $action['type'],
+                    'value'           => $action['value'],
+                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      */
@@ -96,7 +141,7 @@ class UpdateRequest extends FormRequest
             'triggers.*.stop_processing' => [new IsBoolean()],
             'triggers.*.active'          => [new IsBoolean()],
             'actions.*.type'             => 'required|in:'.implode(',', $validActions),
-            'actions.*.value'            => 'required_if:actions.*.type,'.$contextActions.'|ruleActionValue',
+            'actions.*.value'            => [sprintf('required_if:actions.*.type,%s', $contextActions), new IsValidActionExpression(), 'ruleActionValue'],
             'actions.*.stop_processing'  => [new IsBoolean()],
             'actions.*.active'           => [new IsBoolean()],
             'strict'                     => [new IsBoolean()],
@@ -204,48 +249,4 @@ class UpdateRequest extends FormRequest
             $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_action'));
         }
     }
-
-    private function getRuleTriggers(): ?array
-    {
-        if (!$this->has('triggers')) {
-            return null;
-        }
-        $triggers = $this->get('triggers');
-        $return   = [];
-        if (is_array($triggers)) {
-            foreach ($triggers as $trigger) {
-                $active         = array_key_exists('active', $trigger) ? $trigger['active'] : true;
-                $stopProcessing = array_key_exists('stop_processing', $trigger) ? $trigger['stop_processing'] : false;
-                $return[]       = [
-                    'type'            => $trigger['type'],
-                    'value'           => $trigger['value'],
-                    'active'          => $active,
-                    'stop_processing' => $stopProcessing,
-                ];
-            }
-        }
-
-        return $return;
-    }
-
-    private function getRuleActions(): ?array
-    {
-        if (!$this->has('actions')) {
-            return null;
-        }
-        $actions = $this->get('actions');
-        $return  = [];
-        if (is_array($actions)) {
-            foreach ($actions as $action) {
-                $return[] = [
-                    'type'            => $action['type'],
-                    'value'           => $action['value'],
-                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'false')),
-                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
-                ];
-            }
-        }
-
-        return $return;
-    }
 }

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

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * ValidateExpressionRequest.php
+ * Copyright (c) 2024 Michael Thomas
+ *
+ * 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\Requests\Models\Rule;
+
+use FireflyIII\Rules\IsValidActionExpression;
+use FireflyIII\Support\Request\ChecksLogin;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class ValidateExpressionRequest
+ */
+class ValidateExpressionRequest extends FormRequest
+{
+    use ChecksLogin;
+
+    public function rules(): array
+    {
+        return ['expression' => ['required', new IsValidActionExpression()]];
+    }
+}

app/Api/V1/Requests/Models/RuleGroup/TestRequest.php

@@ -46,16 +46,6 @@ class TestRequest extends FormRequest
         ];
     }
 
-    public function rules(): array
-    {
-        return [
-            'start'      => 'date',
-            'end'        => 'date|after_or_equal:start',
-            'accounts'   => '',
-            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
-        ];
-    }
-
     private function getDate(string $field): ?Carbon
     {
         $value  = $this->query($field);
@@ -75,4 +65,14 @@ class TestRequest extends FormRequest
     {
         return $this->get('accounts');
     }
+
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after_or_equal:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
+    }
 }

app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php

@@ -46,14 +46,6 @@ class TriggerRequest extends FormRequest
         ];
     }
 
-    public function rules(): array
-    {
-        return [
-            'start' => 'date',
-            'end'   => 'date|after_or_equal:start',
-        ];
-    }
-
     private function getDate(string $field): ?Carbon
     {
         $value  = $this->query($field);
@@ -77,4 +69,12 @@ class TriggerRequest extends FormRequest
 
         return $this->get('accounts');
     }
+
+    public function rules(): array
+    {
+        return [
+            'start' => 'date',
+            'end'   => 'date|after_or_equal:start',
+        ];
+    }
 }

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

@@ -69,6 +69,101 @@ class StoreRequest extends FormRequest
         // TODO include location and ability to process it.
     }
 
+    /**
+     * Get transaction data.
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+
+        /**
+         * @var array $transaction
+         */
+        foreach ($this->get('transactions') as $transaction) {
+            $object   = new NullArrayObject($transaction);
+            $return[] = [
+                'type'                  => $this->clearString($object['type']),
+                'date'                  => $this->dateFromValue($object['date']),
+                'order'                 => $this->integerFromValue((string)$object['order']),
+
+                'currency_id'           => $this->integerFromValue((string)$object['currency_id']),
+                'currency_code'         => $this->clearString((string)$object['currency_code']),
+
+                // foreign currency info:
+                'foreign_currency_id'   => $this->integerFromValue((string)$object['foreign_currency_id']),
+                'foreign_currency_code' => $this->clearString((string)$object['foreign_currency_code']),
+
+                // amount and foreign amount. Cannot be 0.
+                'amount'                => $this->clearString((string)$object['amount']),
+                'foreign_amount'        => $this->clearString((string)$object['foreign_amount']),
+
+                // description.
+                'description'           => $this->clearString($object['description']),
+
+                // source of transaction. If everything is null, assume cash account.
+                'source_id'             => $this->integerFromValue((string)$object['source_id']),
+                'source_name'           => $this->clearString((string)$object['source_name']),
+                'source_iban'           => $this->clearString((string)$object['source_iban']),
+                'source_number'         => $this->clearString((string)$object['source_number']),
+                'source_bic'            => $this->clearString((string)$object['source_bic']),
+
+                // destination of transaction. If everything is null, assume cash account.
+                'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
+                'destination_name'      => $this->clearString((string)$object['destination_name']),
+                'destination_iban'      => $this->clearString((string)$object['destination_iban']),
+                'destination_number'    => $this->clearString((string)$object['destination_number']),
+                'destination_bic'       => $this->clearString((string)$object['destination_bic']),
+
+                // budget info
+                'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
+                'budget_name'           => $this->clearString((string)$object['budget_name']),
+
+                // category info
+                'category_id'           => $this->integerFromValue((string)$object['category_id']),
+                'category_name'         => $this->clearString((string)$object['category_name']),
+
+                // journal bill reference. Optional. Will only work for withdrawals
+                'bill_id'               => $this->integerFromValue((string)$object['bill_id']),
+                'bill_name'             => $this->clearString((string)$object['bill_name']),
+
+                // piggy bank reference. Optional. Will only work for transfers
+                'piggy_bank_id'         => $this->integerFromValue((string)$object['piggy_bank_id']),
+                'piggy_bank_name'       => $this->clearString((string)$object['piggy_bank_name']),
+
+                // some other interesting properties
+                'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
+                'notes'                 => $this->clearStringKeepNewlines((string)$object['notes']),
+                'tags'                  => $this->arrayFromValue($object['tags']),
+
+                // all custom fields:
+                'internal_reference'    => $this->clearString((string)$object['internal_reference']),
+                'external_id'           => $this->clearString((string)$object['external_id']),
+                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
+                'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
+                'external_url'          => $this->clearString((string)$object['external_url']),
+
+                'sepa_cc'               => $this->clearString((string)$object['sepa_cc']),
+                'sepa_ct_op'            => $this->clearString((string)$object['sepa_ct_op']),
+                'sepa_ct_id'            => $this->clearString((string)$object['sepa_ct_id']),
+                'sepa_db'               => $this->clearString((string)$object['sepa_db']),
+                'sepa_country'          => $this->clearString((string)$object['sepa_country']),
+                'sepa_ep'               => $this->clearString((string)$object['sepa_ep']),
+                'sepa_ci'               => $this->clearString((string)$object['sepa_ci']),
+                'sepa_batch_id'         => $this->clearString((string)$object['sepa_batch_id']),
+                // custom date fields. Must be Carbon objects. Presence is optional.
+                'interest_date'         => $this->dateFromValue($object['interest_date']),
+                'book_date'             => $this->dateFromValue($object['book_date']),
+                'process_date'          => $this->dateFromValue($object['process_date']),
+                'due_date'              => $this->dateFromValue($object['due_date']),
+                'payment_date'          => $this->dateFromValue($object['payment_date']),
+                'invoice_date'          => $this->dateFromValue($object['invoice_date']),
+            ];
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      */
@@ -196,99 +291,4 @@ class StoreRequest extends FormRequest
             Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
         }
     }
-
-    /**
-     * Get transaction data.
-     */
-    private function getTransactionData(): array
-    {
-        $return = [];
-
-        /**
-         * @var array $transaction
-         */
-        foreach ($this->get('transactions') as $transaction) {
-            $object   = new NullArrayObject($transaction);
-            $return[] = [
-                'type'                  => $this->clearString($object['type']),
-                'date'                  => $this->dateFromValue($object['date']),
-                'order'                 => $this->integerFromValue((string)$object['order']),
-
-                'currency_id'           => $this->integerFromValue((string)$object['currency_id']),
-                'currency_code'         => $this->clearString((string)$object['currency_code']),
-
-                // foreign currency info:
-                'foreign_currency_id'   => $this->integerFromValue((string)$object['foreign_currency_id']),
-                'foreign_currency_code' => $this->clearString((string)$object['foreign_currency_code']),
-
-                // amount and foreign amount. Cannot be 0.
-                'amount'                => $this->clearString((string)$object['amount']),
-                'foreign_amount'        => $this->clearString((string)$object['foreign_amount']),
-
-                // description.
-                'description'           => $this->clearString($object['description']),
-
-                // source of transaction. If everything is null, assume cash account.
-                'source_id'             => $this->integerFromValue((string)$object['source_id']),
-                'source_name'           => $this->clearString((string)$object['source_name']),
-                'source_iban'           => $this->clearString((string)$object['source_iban']),
-                'source_number'         => $this->clearString((string)$object['source_number']),
-                'source_bic'            => $this->clearString((string)$object['source_bic']),
-
-                // destination of transaction. If everything is null, assume cash account.
-                'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
-                'destination_name'      => $this->clearString((string)$object['destination_name']),
-                'destination_iban'      => $this->clearString((string)$object['destination_iban']),
-                'destination_number'    => $this->clearString((string)$object['destination_number']),
-                'destination_bic'       => $this->clearString((string)$object['destination_bic']),
-
-                // budget info
-                'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
-                'budget_name'           => $this->clearString((string)$object['budget_name']),
-
-                // category info
-                'category_id'           => $this->integerFromValue((string)$object['category_id']),
-                'category_name'         => $this->clearString((string)$object['category_name']),
-
-                // journal bill reference. Optional. Will only work for withdrawals
-                'bill_id'               => $this->integerFromValue((string)$object['bill_id']),
-                'bill_name'             => $this->clearString((string)$object['bill_name']),
-
-                // piggy bank reference. Optional. Will only work for transfers
-                'piggy_bank_id'         => $this->integerFromValue((string)$object['piggy_bank_id']),
-                'piggy_bank_name'       => $this->clearString((string)$object['piggy_bank_name']),
-
-                // some other interesting properties
-                'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
-                'notes'                 => $this->clearStringKeepNewlines((string)$object['notes']),
-                'tags'                  => $this->arrayFromValue($object['tags']),
-
-                // all custom fields:
-                'internal_reference'    => $this->clearString((string)$object['internal_reference']),
-                'external_id'           => $this->clearString((string)$object['external_id']),
-                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
-                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
-                'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
-                'external_url'          => $this->clearString((string)$object['external_url']),
-
-                'sepa_cc'               => $this->clearString((string)$object['sepa_cc']),
-                'sepa_ct_op'            => $this->clearString((string)$object['sepa_ct_op']),
-                'sepa_ct_id'            => $this->clearString((string)$object['sepa_ct_id']),
-                'sepa_db'               => $this->clearString((string)$object['sepa_db']),
-                'sepa_country'          => $this->clearString((string)$object['sepa_country']),
-                'sepa_ep'               => $this->clearString((string)$object['sepa_ep']),
-                'sepa_ci'               => $this->clearString((string)$object['sepa_ci']),
-                'sepa_batch_id'         => $this->clearString((string)$object['sepa_batch_id']),
-                // custom date fields. Must be Carbon objects. Presence is optional.
-                'interest_date'         => $this->dateFromValue($object['interest_date']),
-                'book_date'             => $this->dateFromValue($object['book_date']),
-                'process_date'          => $this->dateFromValue($object['process_date']),
-                'due_date'              => $this->dateFromValue($object['due_date']),
-                'payment_date'          => $this->dateFromValue($object['payment_date']),
-                'invoice_date'          => $this->dateFromValue($object['invoice_date']),
-            ];
-        }
-
-        return $return;
-    }
 }

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

@@ -90,127 +90,6 @@ class UpdateRequest extends FormRequest
         return $data;
     }
 
-    /**
-     * The rules that the incoming request must be matched against.
-     */
-    public function rules(): array
-    {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
-        $validProtocols = config('firefly.valid_url_protocols');
-
-        return [
-            // basic fields for group:
-            'group_title'                            => 'min:1|max:1000|nullable',
-            'apply_rules'                            => [new IsBoolean()],
-
-            // transaction rules (in array for splits):
-            'transactions.*.type'                    => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
-            'transactions.*.date'                    => [new IsDateOrTime()],
-            'transactions.*.order'                   => 'numeric|min:0',
-
-            // group id:
-            'transactions.*.transaction_journal_id'  => ['nullable', 'numeric', new BelongsUser()],
-
-            // currency info
-            'transactions.*.currency_id'             => 'numeric|exists:transaction_currencies,id|nullable',
-            'transactions.*.currency_code'           => 'min:3|max:51|exists:transaction_currencies,code|nullable',
-            'transactions.*.foreign_currency_id'     => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code'   => 'nullable|min:3|max:51|exists:transaction_currencies,code',
-
-            // amount
-            'transactions.*.amount'                  => [new IsValidPositiveAmount()],
-            'transactions.*.foreign_amount'          => ['nullable', new IsValidZeroOrMoreAmount()],
-
-            // description
-            'transactions.*.description'             => 'nullable|min:1|max:1000',
-
-            // source of transaction
-            'transactions.*.source_id'               => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.source_name'             => 'min:1|max:255|nullable',
-
-            // destination of transaction
-            'transactions.*.destination_id'          => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.destination_name'        => 'min:1|max:255|nullable',
-
-            // budget, category, bill and piggy
-            'transactions.*.budget_id'               => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
-            'transactions.*.budget_name'             => ['min:1', 'max:255', 'nullable', new BelongsUser()],
-            'transactions.*.category_id'             => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
-            'transactions.*.category_name'           => 'min:1|max:255|nullable',
-            'transactions.*.bill_id'                 => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
-            'transactions.*.bill_name'               => ['min:1', 'max:255', 'nullable', new BelongsUser()],
-
-            // other interesting fields
-            'transactions.*.reconciled'              => [new IsBoolean()],
-            'transactions.*.notes'                   => 'min:1|max:32768|nullable',
-            'transactions.*.tags'                    => 'min:0|max:255|nullable',
-            'transactions.*.tags.*'                  => 'min:0|max:255',
-
-            // meta info fields
-            'transactions.*.internal_reference'      => 'min:1|max:255|nullable',
-            'transactions.*.external_id'             => 'min:1|max:255|nullable',
-            'transactions.*.recurrence_id'           => 'min:1|max:255|nullable',
-            'transactions.*.bunq_payment_id'         => 'min:1|max:255|nullable',
-            'transactions.*.external_url'            => sprintf('min:1|max:255|nullable|url:%s', $validProtocols),
-
-            // SEPA fields:
-            'transactions.*.sepa_cc'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ct_op'              => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ct_id'              => 'min:1|max:255|nullable',
-            'transactions.*.sepa_db'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_country'            => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ep'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ci'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_batch_id'           => 'min:1|max:255|nullable',
-
-            // dates
-            'transactions.*.interest_date'           => 'date|nullable',
-            'transactions.*.book_date'               => 'date|nullable',
-            'transactions.*.process_date'            => 'date|nullable',
-            'transactions.*.due_date'                => 'date|nullable',
-            'transactions.*.payment_date'            => 'date|nullable',
-            'transactions.*.invoice_date'            => 'date|nullable',
-        ];
-    }
-
-    /**
-     * Configure the validator instance.
-     */
-    public function withValidator(Validator $validator): void
-    {
-        app('log')->debug('Now in withValidator');
-
-        /** @var TransactionGroup $transactionGroup */
-        $transactionGroup = $this->route()->parameter('transactionGroup');
-        $validator->after(
-            function (Validator $validator) use ($transactionGroup): void {
-                // if more than one, verify that there are journal ID's present.
-                $this->validateJournalIds($validator, $transactionGroup);
-
-                // all transaction types must be equal:
-                $this->validateTransactionTypesForUpdate($validator);
-
-                // user wants to update a reconciled transaction.
-                // source, destination, amount + foreign_amount cannot be changed
-                // and must be omitted from the request.
-                $this->preventUpdateReconciled($validator, $transactionGroup);
-
-                // validate source/destination is equal, depending on the transaction journal type.
-                $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
-
-                // see method:
-                // $this->preventNoAccountInfo($validator, );
-
-                // validate that the currency fits the source and/or destination account.
-                // validate all account info
-                $this->validateAccountInformationUpdate($validator, $transactionGroup);
-            }
-        );
-        if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
-        }
-    }
-
     /**
      * Get transaction data.
      *
@@ -362,4 +241,125 @@ class UpdateRequest extends FormRequest
 
         return $current;
     }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $validProtocols = config('firefly.valid_url_protocols');
+
+        return [
+            // basic fields for group:
+            'group_title'                           => 'min:1|max:1000|nullable',
+            'apply_rules'                           => [new IsBoolean()],
+
+            // transaction rules (in array for splits):
+            'transactions.*.type'                   => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
+            'transactions.*.date'                   => [new IsDateOrTime()],
+            'transactions.*.order'                  => 'numeric|min:0',
+
+            // group id:
+            'transactions.*.transaction_journal_id' => ['nullable', 'numeric', new BelongsUser()],
+
+            // currency info
+            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id|nullable',
+            'transactions.*.currency_code'          => 'min:3|max:51|exists:transaction_currencies,code|nullable',
+            'transactions.*.foreign_currency_id'    => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:51|exists:transaction_currencies,code',
+
+            // amount
+            'transactions.*.amount'                 => [new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'         => ['nullable', new IsValidZeroOrMoreAmount()],
+
+            // description
+            'transactions.*.description'            => 'nullable|min:1|max:1000',
+
+            // source of transaction
+            'transactions.*.source_id'              => ['numeric', 'nullable', new BelongsUser()],
+            'transactions.*.source_name'            => 'min:1|max:255|nullable',
+
+            // destination of transaction
+            'transactions.*.destination_id'         => ['numeric', 'nullable', new BelongsUser()],
+            'transactions.*.destination_name'       => 'min:1|max:255|nullable',
+
+            // budget, category, bill and piggy
+            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
+            'transactions.*.budget_name'            => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
+            'transactions.*.category_name'          => 'min:1|max:255|nullable',
+            'transactions.*.bill_id'                => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
+            'transactions.*.bill_name'              => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+
+            // other interesting fields
+            'transactions.*.reconciled'             => [new IsBoolean()],
+            'transactions.*.notes'                  => 'min:1|max:32768|nullable',
+            'transactions.*.tags'                   => 'min:0|max:255|nullable',
+            'transactions.*.tags.*'                 => 'min:0|max:255',
+
+            // meta info fields
+            'transactions.*.internal_reference'     => 'min:1|max:255|nullable',
+            'transactions.*.external_id'            => 'min:1|max:255|nullable',
+            'transactions.*.recurrence_id'          => 'min:1|max:255|nullable',
+            'transactions.*.bunq_payment_id'        => 'min:1|max:255|nullable',
+            'transactions.*.external_url'           => sprintf('min:1|max:255|nullable|url:%s', $validProtocols),
+
+            // SEPA fields:
+            'transactions.*.sepa_cc'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_op'             => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_id'             => 'min:1|max:255|nullable',
+            'transactions.*.sepa_db'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_country'           => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ep'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ci'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_batch_id'          => 'min:1|max:255|nullable',
+
+            // dates
+            'transactions.*.interest_date'          => 'date|nullable',
+            'transactions.*.book_date'              => 'date|nullable',
+            'transactions.*.process_date'           => 'date|nullable',
+            'transactions.*.due_date'               => 'date|nullable',
+            'transactions.*.payment_date'           => 'date|nullable',
+            'transactions.*.invoice_date'           => 'date|nullable',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     */
+    public function withValidator(Validator $validator): void
+    {
+        app('log')->debug('Now in withValidator');
+
+        /** @var TransactionGroup $transactionGroup */
+        $transactionGroup = $this->route()->parameter('transactionGroup');
+        $validator->after(
+            function (Validator $validator) use ($transactionGroup): void {
+                // if more than one, verify that there are journal ID's present.
+                $this->validateJournalIds($validator, $transactionGroup);
+
+                // all transaction types must be equal:
+                $this->validateTransactionTypesForUpdate($validator);
+
+                // user wants to update a reconciled transaction.
+                // source, destination, amount + foreign_amount cannot be changed
+                // and must be omitted from the request.
+                $this->preventUpdateReconciled($validator, $transactionGroup);
+
+                // validate source/destination is equal, depending on the transaction journal type.
+                $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
+
+                // see method:
+                // $this->preventNoAccountInfo($validator, );
+
+                // validate that the currency fits the source and/or destination account.
+                // validate all account info
+                $this->validateAccountInformationUpdate($validator, $transactionGroup);
+            }
+        );
+        if ($validator->fails()) {
+            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+        }
+    }
 }

app/Api/V2/Controllers/Controller.php

@@ -67,43 +67,6 @@ class Controller extends BaseController
         );
     }
 
-    final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
-    {
-        $manager  = new Manager();
-        $baseUrl  = request()->getSchemeAndHttpHost().'/api/v2';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        $objects  = $paginator->getCollection();
-
-        // the transformer, at this point, needs to collect information that ALL items in the collection
-        // require, like meta-data and stuff like that, and save it for later.
-        $transformer->collectMetaData($objects);
-
-        $resource = new FractalCollection($objects, $transformer, $key);
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return $manager->createData($resource)->toArray();
-    }
-
-    /**
-     * Returns a JSON API object and returns it.
-     *
-     * @param array<int, mixed>|Model $object
-     */
-    final protected function jsonApiObject(string $key, array|Model $object, AbstractTransformer $transformer): array
-    {
-        // create some objects:
-        $manager  = new Manager();
-        $baseUrl  = request()->getSchemeAndHttpHost().'/api/v2';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        $transformer->collectMetaData(new Collection([$object]));
-
-        $resource = new Item($object, $transformer, $key);
-
-        return $manager->createData($resource)->toArray();
-    }
-
     /**
      * TODO duplicate from V1 controller
      * Method to grab all parameters from the URL.
@@ -184,4 +147,42 @@ class Controller extends BaseController
 
         return $bag;
     }
+
+    final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
+    {
+        $manager  = new Manager();
+        $baseUrl  = request()->getSchemeAndHttpHost().'/api/v2';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $objects  = $paginator->getCollection();
+
+        // the transformer, at this point, needs to collect information that ALL items in the collection
+        // require, like meta-data and stuff like that, and save it for later.
+        $objects  = $transformer->collectMetaData($objects);
+        $paginator->setCollection($objects);
+
+        $resource = new FractalCollection($objects, $transformer, $key);
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return $manager->createData($resource)->toArray();
+    }
+
+    /**
+     * Returns a JSON API object and returns it.
+     *
+     * @param array<int, mixed>|Model $object
+     */
+    final protected function jsonApiObject(string $key, array|Model $object, AbstractTransformer $transformer): array
+    {
+        // create some objects:
+        $manager  = new Manager();
+        $baseUrl  = request()->getSchemeAndHttpHost().'/api/v2';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $transformer->collectMetaData(new Collection([$object]));
+
+        $resource = new Item($object, $transformer, $key);
+
+        return $manager->createData($resource)->toArray();
+    }
 }

app/Api/V2/Controllers/Model/Account/IndexController.php

@@ -0,0 +1,104 @@
+<?php
+/*
+ * IndexController.php
+ * Copyright (c) 2024 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\V2\Controllers\Model\Account;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Model\Account\IndexRequest;
+use FireflyIII\Api\V2\Request\Model\Transaction\InfiniteListRequest;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Transformers\V2\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+class IndexController extends Controller
+{
+    public const string RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                // new way of user group validation
+                $userGroup        = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO see autocomplete/accountcontroller for list.
+     */
+    public function index(IndexRequest $request): JsonResponse
+    {
+        $this->repository->resetAccountOrder();
+        $types        = $request->getAccountTypes();
+        $instructions = $request->getSortInstructions('accounts');
+        $accounts     = $this->repository->getAccountsByType($types, $instructions);
+        $pageSize     = $this->parameters->get('limit');
+        $count        = $accounts->count();
+        $accounts     = $accounts->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $transformer  = new AccountTransformer();
+
+        $this->parameters->set('sort', $instructions);
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList('accounts', $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+
+    public function infiniteList(InfiniteListRequest $request): JsonResponse
+    {
+        $this->repository->resetAccountOrder();
+
+        // get accounts of the specified type, and return.
+        $types       = $request->getAccountTypes();
+
+        // get from repository
+        $accounts    = $this->repository->getAccountsInOrder($types, $request->getSortInstructions('accounts'), $request->getStartRow(), $request->getEndRow());
+        $total       = $this->repository->countAccounts($types);
+        $count       = $request->getEndRow() - $request->getStartRow();
+        $paginator   = new LengthAwarePaginator($accounts, $total, $count, $this->parameters->get('page'));
+        $transformer = new AccountTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

app/Api/V2/Controllers/Model/Account/UpdateController.php

@@ -0,0 +1,79 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2024 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\V2\Controllers\Model\Account;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Model\Account\UpdateRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Transformers\V2\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+
+class UpdateController extends Controller
+{
+    public const string RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                // new way of user group validation
+                $userGroup        = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO this endpoint is not yet reachable.
+     */
+    public function update(UpdateRequest $request, Account $account): JsonResponse
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $data         = $request->getUpdateData();
+        $data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type);
+        $account      = $this->repository->update($account, $data);
+        $account->refresh();
+        app('preferences')->mark();
+
+        $transformer  = new AccountTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('accounts', $account, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

app/Api/V2/Controllers/Model/Budget/ShowController.php

@@ -51,20 +51,6 @@ class ShowController extends Controller
         );
     }
 
-    /**
-     * Show a budget.
-     */
-    public function show(Budget $budget): JsonResponse
-    {
-        $transformer = new BudgetTransformer();
-        $transformer->setParameters($this->parameters);
-
-        return response()
-            ->api($this->jsonApiObject('budgets', $budget, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
-    }
-
     /**
      * 2023-10-29 removed the cerSum reference, not sure where this is used atm
      * so removed from api.php. Also applies to "spent" method.
@@ -80,6 +66,20 @@ class ShowController extends Controller
         return response()->json($result);
     }
 
+    /**
+     * Show a budget.
+     */
+    public function show(Budget $budget): JsonResponse
+    {
+        $transformer = new BudgetTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('budgets', $budget, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+
     /**
      * This endpoint is documented at:
      * TODO add URL

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

@@ -114,23 +114,6 @@ class BasicController extends Controller
         return response()->json($total);
     }
 
-    /**
-     * Check if date is outside session range.
-     */
-    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
-    {
-        $result = false;
-        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
-        }
-        // start and end in the past? use $end
-        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
-        }
-
-        return $result;
-    }
-
     /**
      * @throws FireflyException
      */
@@ -315,7 +298,7 @@ class BasicController extends Controller
             app('log')->debug(sprintf('Amount left is %s', $left));
 
             // how much left per day?
-            $days                    = $today->diffInDays($end) + 1;
+            $days                    = (int) $today->diffInDays($end, true) + 1;
             $perDay                  = '0';
             $perDayNative            = '0';
             if (0 !== $days && bccomp($left, '0') > -1) {
@@ -411,4 +394,21 @@ class BasicController extends Controller
 
         return $return;
     }
+
+    /**
+     * Check if date is outside session range.
+     */
+    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
+    {
+        $result = false;
+        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
+            $result = true;
+        }
+        // start and end in the past? use $end
+        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
+            $result = true;
+        }
+
+        return $result;
+    }
 }

app/Api/V2/Controllers/Transaction/List/TransactionController.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Controllers\Transaction\List;
 
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Api\V2\Request\Model\Transaction\ListByCountRequest;
+use FireflyIII\Api\V2\Request\Model\Transaction\InfiniteListRequest;
 use FireflyIII\Api\V2\Request\Model\Transaction\ListRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Transformers\V2\TransactionGroupTransformer;
@@ -35,8 +35,11 @@ use Illuminate\Http\JsonResponse;
  */
 class TransactionController extends Controller
 {
-    public function listByCount(ListByCountRequest $request): JsonResponse
+    public function infiniteList(InfiniteListRequest $request): JsonResponse
     {
+        // get sort instructions
+        $instructions = $request->getSortInstructions('transactions');
+
         // collect transactions:
         /** @var GroupCollectorInterface $collector */
         $collector    = app(GroupCollectorInterface::class);
@@ -45,6 +48,7 @@ class TransactionController extends Controller
             ->setStartRow($request->getStartRow())
             ->setEndRow($request->getEndRow())
             ->setTypes($request->getTransactionTypes())
+            ->setSorting($instructions)
         ;
 
         $start        = $this->parameters->get('start');
@@ -61,7 +65,7 @@ class TransactionController extends Controller
         $paginator->setPath(
             sprintf(
                 '%s?%s',
-                route('api.v2.transactions.list'),
+                route('api.v2.infinite.transactions.list'),
                 $params
             )
         );
@@ -97,9 +101,6 @@ class TransactionController extends Controller
             $collector->setEnd($end);
         }
 
-        //        $collector->dumpQuery();
-        //        exit;
-
         $paginator = $collector->getPaginatedGroups();
         $params    = $request->buildParams($pageSize);
         $paginator->setPath(

app/Api/V2/Controllers/UserGroup/IndexController.php

@@ -0,0 +1,73 @@
+<?php
+/*
+ * IndexController.php
+ * Copyright (c) 2024 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\V2\Controllers\UserGroup;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Model\Account\IndexRequest;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\Transformers\V2\UserGroupTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+class IndexController extends Controller
+{
+    public const string RESOURCE_KEY = 'user_groups';
+
+    private UserGroupRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(UserGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO see autocomplete/accountcontroller for list.
+     */
+    public function index(IndexRequest $request): JsonResponse
+    {
+        $administrations = $this->repository->get();
+        $pageSize        = $this->parameters->get('limit');
+        $count           = $administrations->count();
+        $administrations = $administrations->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator       = new LengthAwarePaginator($administrations, $count, $pageSize, $this->parameters->get('page'));
+        $transformer     = new UserGroupTransformer();
+
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

app/Api/V2/Request/Model/Account/IndexRequest.php

@@ -0,0 +1,69 @@
+<?php
+/*
+ * IndexRequest.php
+ * Copyright (c) 2024 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\V2\Request\Model\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetSortInstructions;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class IndexRequest
+ *
+ * Lots of code stolen from the SingleDateRequest.
+ */
+class IndexRequest extends FormRequest
+{
+    use AccountFilter;
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    use GetSortInstructions;
+
+    public function getAccountTypes(): array
+    {
+        $type = (string)$this->get('type', 'default');
+
+        return $this->mapAccountTypes($type);
+    }
+
+    /**
+     * Get all data from the request.
+     */
+    public function getDate(): Carbon
+    {
+        return $this->getCarbonDate('date');
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        return [
+            'date' => 'date|after:1900-01-01|before:2099-12-31',
+        ];
+    }
+}

app/Api/V2/Request/Model/Account/UpdateRequest.php

@@ -0,0 +1,116 @@
+<?php
+/*
+ * UpdateRequest.php
+ * Copyright (c) 2024 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\V2\Request\Model\Account;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Location;
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\UniqueAccountNumber;
+use FireflyIII\Rules\UniqueIban;
+use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateRequest extends FormRequest
+{
+    use AppendsLocationData;
+    use ChecksLogin;
+    use ConvertsDataTypes;
+
+    /**
+     * TODO is a duplicate of the v1 update thing.
+     */
+    public function getUpdateData(): array
+    {
+        $fields = [
+            'name'                    => ['name', 'convertString'],
+            'active'                  => ['active', 'boolean'],
+            'include_net_worth'       => ['include_net_worth', 'boolean'],
+            'account_type_name'       => ['type', 'convertString'],
+            'virtual_balance'         => ['virtual_balance', 'convertString'],
+            'iban'                    => ['iban', 'convertString'],
+            'BIC'                     => ['bic', 'convertString'],
+            'account_number'          => ['account_number', 'convertString'],
+            'account_role'            => ['account_role', 'convertString'],
+            'liability_type'          => ['liability_type', 'convertString'],
+            'opening_balance'         => ['opening_balance', 'convertString'],
+            'opening_balance_date'    => ['opening_balance_date', 'convertDateTime'],
+            'cc_type'                 => ['credit_card_type', 'convertString'],
+            'cc_monthly_payment_date' => ['monthly_payment_date', 'convertDateTime'],
+            'notes'                   => ['notes', 'stringWithNewlines'],
+            'interest'                => ['interest', 'convertString'],
+            'interest_period'         => ['interest_period', 'convertString'],
+            'order'                   => ['order', 'convertInteger'],
+            'currency_id'             => ['currency_id', 'convertInteger'],
+            'currency_code'           => ['currency_code', 'convertString'],
+            'liability_direction'     => ['liability_direction', 'convertString'],
+            'liability_amount'        => ['liability_amount', 'convertString'],
+            'liability_start_date'    => ['liability_start_date', 'date'],
+        ];
+        $data   = $this->getAllData($fields);
+
+        return $this->appendLocationData($data, null);
+    }
+
+    /**
+     * TODO is a duplicate of the v1 UpdateRequest method.
+     *
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        /** @var Account $account */
+        $account        = $this->route()->parameter('account');
+        $accountRoles   = implode(',', config('firefly.accountRoles'));
+        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
+        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
+
+        $rules          = [
+            'name'                 => sprintf('min:1|max:1024|uniqueAccountForUser:%d', $account->id),
+            'type'                 => sprintf('in:%s', $types),
+            'iban'                 => ['iban', 'nullable', new UniqueIban($account, $this->convertString('type'))],
+            'bic'                  => 'bic|nullable',
+            'account_number'       => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber($account, $this->convertString('type'))],
+            'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
+            'opening_balance_date' => 'date|required_with:opening_balance|nullable',
+            'virtual_balance'      => 'numeric|nullable',
+            'order'                => 'numeric|nullable',
+            'currency_id'          => 'numeric|exists:transaction_currencies,id',
+            'currency_code'        => 'min:3|max:51|exists:transaction_currencies,code',
+            'active'               => [new IsBoolean()],
+            'include_net_worth'    => [new IsBoolean()],
+            'account_role'         => sprintf('in:%s|nullable|required_if:type,asset', $accountRoles),
+            'credit_card_type'     => sprintf('in:%s|nullable|required_if:account_role,ccAsset', $ccPaymentTypes),
+            'monthly_payment_date' => 'date|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
+            'liability_type'       => 'required_if:type,liability|in:loan,debt,mortgage',
+            'liability_direction'  => 'required_if:type,liability|in:credit,debit',
+            'interest'             => 'required_if:type,liability|min:0|max:100|numeric',
+            'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
+            'notes'                => 'min:0|max:32768',
+        ];
+
+        return Location::requestRules($rules);
+    }
+}

app/Api/V2/Request/Model/Transaction/InfiniteListRequest.php

@@ -25,19 +25,23 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Request\Model\Transaction;
 
 use Carbon\Carbon;
+use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetSortInstructions;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
- * Class ListRequest
+ * Class InfiniteListRequest
  * Used specifically to list transactions.
  */
-class ListByCountRequest extends FormRequest
+class InfiniteListRequest extends FormRequest
 {
+    use AccountFilter;
     use ChecksLogin;
     use ConvertsDataTypes;
+    use GetSortInstructions;
     use TransactionFilter;
 
     public function buildParams(): string
@@ -57,13 +61,6 @@ class ListByCountRequest extends FormRequest
         return http_build_query($array);
     }
 
-    public function getPage(): int
-    {
-        $page = $this->convertInteger('page');
-
-        return 0 === $page || $page > 65536 ? 1 : $page;
-    }
-
     public function getStartRow(): int
     {
         $startRow = $this->convertInteger('start_row');
@@ -88,6 +85,20 @@ class ListByCountRequest extends FormRequest
         return $this->getCarbonDate('end');
     }
 
+    public function getAccountTypes(): array
+    {
+        $type = (string)$this->get('type', 'default');
+
+        return $this->mapAccountTypes($type);
+    }
+
+    public function getPage(): int
+    {
+        $page = $this->convertInteger('page');
+
+        return 0 === $page || $page > 65536 ? 1 : $page;
+    }
+
     public function getTransactionTypes(): array
     {
         $type = (string)$this->get('type', 'default');

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -78,6 +78,103 @@ class StoreRequest extends FormRequest
         ];
     }
 
+    /**
+     * Get transaction data.
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+
+        /**
+         * @var array $transaction
+         */
+        foreach ($this->get('transactions') as $transaction) {
+            $object   = new NullArrayObject($transaction);
+            $result   = [
+                'type'                  => $this->clearString($object['type']),
+                'date'                  => $this->dateFromValue($object['date']),
+                'order'                 => $this->integerFromValue((string)$object['order']),
+
+                'currency_id'           => $this->integerFromValue((string)$object['currency_id']),
+                'currency_code'         => $this->clearString((string)$object['currency_code']),
+
+                // foreign currency info:
+                'foreign_currency_id'   => $this->integerFromValue((string)$object['foreign_currency_id']),
+                'foreign_currency_code' => $this->clearString((string)$object['foreign_currency_code']),
+
+                // amount and foreign amount. Cannot be 0.
+                'amount'                => $this->clearString((string)$object['amount']),
+                'foreign_amount'        => $this->clearString((string)$object['foreign_amount']),
+
+                // description.
+                'description'           => $this->clearString($object['description']),
+
+                // source of transaction. If everything is null, assume cash account.
+                'source_id'             => $this->integerFromValue((string)$object['source_id']),
+                'source_name'           => $this->clearString((string)$object['source_name']),
+                'source_iban'           => $this->clearString((string)$object['source_iban']),
+                'source_number'         => $this->clearString((string)$object['source_number']),
+                'source_bic'            => $this->clearString((string)$object['source_bic']),
+
+                // destination of transaction. If everything is null, assume cash account.
+                'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
+                'destination_name'      => $this->clearString((string)$object['destination_name']),
+                'destination_iban'      => $this->clearString((string)$object['destination_iban']),
+                'destination_number'    => $this->clearString((string)$object['destination_number']),
+                'destination_bic'       => $this->clearString((string)$object['destination_bic']),
+
+                // budget info
+                'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
+                'budget_name'           => $this->clearString((string)$object['budget_name']),
+
+                // category info
+                'category_id'           => $this->integerFromValue((string)$object['category_id']),
+                'category_name'         => $this->clearString((string)$object['category_name']),
+
+                // journal bill reference. Optional. Will only work for withdrawals
+                'bill_id'               => $this->integerFromValue((string)$object['bill_id']),
+                'bill_name'             => $this->clearString((string)$object['bill_name']),
+
+                // piggy bank reference. Optional. Will only work for transfers
+                'piggy_bank_id'         => $this->integerFromValue((string)$object['piggy_bank_id']),
+                'piggy_bank_name'       => $this->clearString((string)$object['piggy_bank_name']),
+
+                // some other interesting properties
+                'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
+                'notes'                 => $this->clearStringKeepNewlines((string)$object['notes']),
+                'tags'                  => $this->arrayFromValue($object['tags']),
+
+                // all custom fields:
+                'internal_reference'    => $this->clearString((string)$object['internal_reference']),
+                'external_id'           => $this->clearString((string)$object['external_id']),
+                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
+                'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
+                'external_url'          => $this->clearString((string)$object['external_url']),
+
+                'sepa_cc'               => $this->clearString((string)$object['sepa_cc']),
+                'sepa_ct_op'            => $this->clearString((string)$object['sepa_ct_op']),
+                'sepa_ct_id'            => $this->clearString((string)$object['sepa_ct_id']),
+                'sepa_db'               => $this->clearString((string)$object['sepa_db']),
+                'sepa_country'          => $this->clearString((string)$object['sepa_country']),
+                'sepa_ep'               => $this->clearString((string)$object['sepa_ep']),
+                'sepa_ci'               => $this->clearString((string)$object['sepa_ci']),
+                'sepa_batch_id'         => $this->clearString((string)$object['sepa_batch_id']),
+                // custom date fields. Must be Carbon objects. Presence is optional.
+                'interest_date'         => $this->dateFromValue($object['interest_date']),
+                'book_date'             => $this->dateFromValue($object['book_date']),
+                'process_date'          => $this->dateFromValue($object['process_date']),
+                'due_date'              => $this->dateFromValue($object['due_date']),
+                'payment_date'          => $this->dateFromValue($object['payment_date']),
+                'invoice_date'          => $this->dateFromValue($object['invoice_date']),
+            ];
+            $result   = $this->addFromromTransactionStore($transaction, $result);
+            $return[] = $result;
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      */
@@ -216,101 +313,4 @@ class StoreRequest extends FormRequest
             Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
         }
     }
-
-    /**
-     * Get transaction data.
-     */
-    private function getTransactionData(): array
-    {
-        $return = [];
-
-        /**
-         * @var array $transaction
-         */
-        foreach ($this->get('transactions') as $transaction) {
-            $object   = new NullArrayObject($transaction);
-            $result   = [
-                'type'                  => $this->clearString($object['type']),
-                'date'                  => $this->dateFromValue($object['date']),
-                'order'                 => $this->integerFromValue((string)$object['order']),
-
-                'currency_id'           => $this->integerFromValue((string)$object['currency_id']),
-                'currency_code'         => $this->clearString((string)$object['currency_code']),
-
-                // foreign currency info:
-                'foreign_currency_id'   => $this->integerFromValue((string)$object['foreign_currency_id']),
-                'foreign_currency_code' => $this->clearString((string)$object['foreign_currency_code']),
-
-                // amount and foreign amount. Cannot be 0.
-                'amount'                => $this->clearString((string)$object['amount']),
-                'foreign_amount'        => $this->clearString((string)$object['foreign_amount']),
-
-                // description.
-                'description'           => $this->clearString($object['description']),
-
-                // source of transaction. If everything is null, assume cash account.
-                'source_id'             => $this->integerFromValue((string)$object['source_id']),
-                'source_name'           => $this->clearString((string)$object['source_name']),
-                'source_iban'           => $this->clearString((string)$object['source_iban']),
-                'source_number'         => $this->clearString((string)$object['source_number']),
-                'source_bic'            => $this->clearString((string)$object['source_bic']),
-
-                // destination of transaction. If everything is null, assume cash account.
-                'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
-                'destination_name'      => $this->clearString((string)$object['destination_name']),
-                'destination_iban'      => $this->clearString((string)$object['destination_iban']),
-                'destination_number'    => $this->clearString((string)$object['destination_number']),
-                'destination_bic'       => $this->clearString((string)$object['destination_bic']),
-
-                // budget info
-                'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
-                'budget_name'           => $this->clearString((string)$object['budget_name']),
-
-                // category info
-                'category_id'           => $this->integerFromValue((string)$object['category_id']),
-                'category_name'         => $this->clearString((string)$object['category_name']),
-
-                // journal bill reference. Optional. Will only work for withdrawals
-                'bill_id'               => $this->integerFromValue((string)$object['bill_id']),
-                'bill_name'             => $this->clearString((string)$object['bill_name']),
-
-                // piggy bank reference. Optional. Will only work for transfers
-                'piggy_bank_id'         => $this->integerFromValue((string)$object['piggy_bank_id']),
-                'piggy_bank_name'       => $this->clearString((string)$object['piggy_bank_name']),
-
-                // some other interesting properties
-                'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
-                'notes'                 => $this->clearStringKeepNewlines((string)$object['notes']),
-                'tags'                  => $this->arrayFromValue($object['tags']),
-
-                // all custom fields:
-                'internal_reference'    => $this->clearString((string)$object['internal_reference']),
-                'external_id'           => $this->clearString((string)$object['external_id']),
-                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
-                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
-                'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
-                'external_url'          => $this->clearString((string)$object['external_url']),
-
-                'sepa_cc'               => $this->clearString((string)$object['sepa_cc']),
-                'sepa_ct_op'            => $this->clearString((string)$object['sepa_ct_op']),
-                'sepa_ct_id'            => $this->clearString((string)$object['sepa_ct_id']),
-                'sepa_db'               => $this->clearString((string)$object['sepa_db']),
-                'sepa_country'          => $this->clearString((string)$object['sepa_country']),
-                'sepa_ep'               => $this->clearString((string)$object['sepa_ep']),
-                'sepa_ci'               => $this->clearString((string)$object['sepa_ci']),
-                'sepa_batch_id'         => $this->clearString((string)$object['sepa_batch_id']),
-                // custom date fields. Must be Carbon objects. Presence is optional.
-                'interest_date'         => $this->dateFromValue($object['interest_date']),
-                'book_date'             => $this->dateFromValue($object['book_date']),
-                'process_date'          => $this->dateFromValue($object['process_date']),
-                'due_date'              => $this->dateFromValue($object['due_date']),
-                'payment_date'          => $this->dateFromValue($object['payment_date']),
-                'invoice_date'          => $this->dateFromValue($object['invoice_date']),
-            ];
-            $result   = $this->addFromromTransactionStore($transaction, $result);
-            $return[] = $result;
-        }
-
-        return $return;
-    }
 }

app/Api/V2/Request/Model/Transaction/UpdateRequest.php

@@ -91,127 +91,6 @@ class UpdateRequest extends Request
         return $data;
     }
 
-    /**
-     * The rules that the incoming request must be matched against.
-     */
-    public function rules(): array
-    {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
-        $validProtocols = config('firefly.valid_url_protocols');
-
-        return [
-            // basic fields for group:
-            'group_title'                            => 'min:1|max:1000|nullable',
-            'apply_rules'                            => [new IsBoolean()],
-
-            // transaction rules (in array for splits):
-            'transactions.*.type'                    => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
-            'transactions.*.date'                    => [new IsDateOrTime()],
-            'transactions.*.order'                   => 'numeric|min:0',
-
-            // group id:
-            'transactions.*.transaction_journal_id'  => ['nullable', 'numeric', new BelongsUser()],
-
-            // currency info
-            'transactions.*.currency_id'             => 'numeric|exists:transaction_currencies,id|nullable',
-            'transactions.*.currency_code'           => 'min:3|max:51|exists:transaction_currencies,code|nullable',
-            'transactions.*.foreign_currency_id'     => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code'   => 'nullable|min:3|max:51|exists:transaction_currencies,code',
-
-            // amount
-            'transactions.*.amount'                  => ['nullable', new IsValidPositiveAmount()],
-            'transactions.*.foreign_amount'          => ['nullable', new IsValidZeroOrMoreAmount()],
-
-            // description
-            'transactions.*.description'             => 'nullable|min:1|max:1000',
-
-            // source of transaction
-            'transactions.*.source_id'               => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.source_name'             => 'min:1|max:255|nullable',
-
-            // destination of transaction
-            'transactions.*.destination_id'          => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.destination_name'        => 'min:1|max:255|nullable',
-
-            // budget, category, bill and piggy
-            'transactions.*.budget_id'               => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
-            'transactions.*.budget_name'             => ['min:1', 'max:255', 'nullable', new BelongsUser()],
-            'transactions.*.category_id'             => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
-            'transactions.*.category_name'           => 'min:1|max:255|nullable',
-            'transactions.*.bill_id'                 => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
-            'transactions.*.bill_name'               => ['min:1', 'max:255', 'nullable', new BelongsUser()],
-
-            // other interesting fields
-            'transactions.*.reconciled'              => [new IsBoolean()],
-            'transactions.*.notes'                   => 'min:1|max:32768|nullable',
-            'transactions.*.tags'                    => 'min:0|max:255|nullable',
-            'transactions.*.tags.*'                  => 'min:0|max:255',
-
-            // meta info fields
-            'transactions.*.internal_reference'      => 'min:1|max:255|nullable',
-            'transactions.*.external_id'             => 'min:1|max:255|nullable',
-            'transactions.*.recurrence_id'           => 'min:1|max:255|nullable',
-            'transactions.*.bunq_payment_id'         => 'min:1|max:255|nullable',
-            'transactions.*.external_url'            => sprintf('min:1|max:255|nullable|url:%s', $validProtocols),
-
-            // SEPA fields:
-            'transactions.*.sepa_cc'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ct_op'              => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ct_id'              => 'min:1|max:255|nullable',
-            'transactions.*.sepa_db'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_country'            => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ep'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_ci'                 => 'min:1|max:255|nullable',
-            'transactions.*.sepa_batch_id'           => 'min:1|max:255|nullable',
-
-            // dates
-            'transactions.*.interest_date'           => 'date|nullable',
-            'transactions.*.book_date'               => 'date|nullable',
-            'transactions.*.process_date'            => 'date|nullable',
-            'transactions.*.due_date'                => 'date|nullable',
-            'transactions.*.payment_date'            => 'date|nullable',
-            'transactions.*.invoice_date'            => 'date|nullable',
-        ];
-    }
-
-    /**
-     * Configure the validator instance.
-     */
-    public function withValidator(Validator $validator): void
-    {
-        app('log')->debug('Now in withValidator');
-
-        /** @var TransactionGroup $transactionGroup */
-        $transactionGroup = $this->route()->parameter('userGroupTransaction');
-        $validator->after(
-            function (Validator $validator) use ($transactionGroup): void {
-                // if more than one, verify that there are journal ID's present.
-                $this->validateJournalIds($validator, $transactionGroup);
-
-                // all transaction types must be equal:
-                $this->validateTransactionTypesForUpdate($validator);
-
-                // user wants to update a reconciled transaction.
-                // source, destination, amount + foreign_amount cannot be changed
-                // and must be omitted from the request.
-                $this->preventUpdateReconciled($validator, $transactionGroup);
-
-                // validate source/destination is equal, depending on the transaction journal type.
-                $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
-
-                // see method:
-                // $this->preventNoAccountInfo($validator, );
-
-                // validate that the currency fits the source and/or destination account.
-                // validate all account info
-                $this->validateAccountInformationUpdate($validator, $transactionGroup);
-            }
-        );
-        if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
-        }
-    }
-
     /**
      * Get transaction data.
      *
@@ -363,4 +242,125 @@ class UpdateRequest extends Request
 
         return $current;
     }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $validProtocols = config('firefly.valid_url_protocols');
+
+        return [
+            // basic fields for group:
+            'group_title'                           => 'min:1|max:1000|nullable',
+            'apply_rules'                           => [new IsBoolean()],
+
+            // transaction rules (in array for splits):
+            'transactions.*.type'                   => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
+            'transactions.*.date'                   => [new IsDateOrTime()],
+            'transactions.*.order'                  => 'numeric|min:0',
+
+            // group id:
+            'transactions.*.transaction_journal_id' => ['nullable', 'numeric', new BelongsUser()],
+
+            // currency info
+            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id|nullable',
+            'transactions.*.currency_code'          => 'min:3|max:51|exists:transaction_currencies,code|nullable',
+            'transactions.*.foreign_currency_id'    => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:51|exists:transaction_currencies,code',
+
+            // amount
+            'transactions.*.amount'                 => ['nullable', new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'         => ['nullable', new IsValidZeroOrMoreAmount()],
+
+            // description
+            'transactions.*.description'            => 'nullable|min:1|max:1000',
+
+            // source of transaction
+            'transactions.*.source_id'              => ['numeric', 'nullable', new BelongsUser()],
+            'transactions.*.source_name'            => 'min:1|max:255|nullable',
+
+            // destination of transaction
+            'transactions.*.destination_id'         => ['numeric', 'nullable', new BelongsUser()],
+            'transactions.*.destination_name'       => 'min:1|max:255|nullable',
+
+            // budget, category, bill and piggy
+            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
+            'transactions.*.budget_name'            => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
+            'transactions.*.category_name'          => 'min:1|max:255|nullable',
+            'transactions.*.bill_id'                => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
+            'transactions.*.bill_name'              => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+
+            // other interesting fields
+            'transactions.*.reconciled'             => [new IsBoolean()],
+            'transactions.*.notes'                  => 'min:1|max:32768|nullable',
+            'transactions.*.tags'                   => 'min:0|max:255|nullable',
+            'transactions.*.tags.*'                 => 'min:0|max:255',
+
+            // meta info fields
+            'transactions.*.internal_reference'     => 'min:1|max:255|nullable',
+            'transactions.*.external_id'            => 'min:1|max:255|nullable',
+            'transactions.*.recurrence_id'          => 'min:1|max:255|nullable',
+            'transactions.*.bunq_payment_id'        => 'min:1|max:255|nullable',
+            'transactions.*.external_url'           => sprintf('min:1|max:255|nullable|url:%s', $validProtocols),
+
+            // SEPA fields:
+            'transactions.*.sepa_cc'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_op'             => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_id'             => 'min:1|max:255|nullable',
+            'transactions.*.sepa_db'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_country'           => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ep'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ci'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_batch_id'          => 'min:1|max:255|nullable',
+
+            // dates
+            'transactions.*.interest_date'          => 'date|nullable',
+            'transactions.*.book_date'              => 'date|nullable',
+            'transactions.*.process_date'           => 'date|nullable',
+            'transactions.*.due_date'               => 'date|nullable',
+            'transactions.*.payment_date'           => 'date|nullable',
+            'transactions.*.invoice_date'           => 'date|nullable',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     */
+    public function withValidator(Validator $validator): void
+    {
+        app('log')->debug('Now in withValidator');
+
+        /** @var TransactionGroup $transactionGroup */
+        $transactionGroup = $this->route()->parameter('userGroupTransaction');
+        $validator->after(
+            function (Validator $validator) use ($transactionGroup): void {
+                // if more than one, verify that there are journal ID's present.
+                $this->validateJournalIds($validator, $transactionGroup);
+
+                // all transaction types must be equal:
+                $this->validateTransactionTypesForUpdate($validator);
+
+                // user wants to update a reconciled transaction.
+                // source, destination, amount + foreign_amount cannot be changed
+                // and must be omitted from the request.
+                $this->preventUpdateReconciled($validator, $transactionGroup);
+
+                // validate source/destination is equal, depending on the transaction journal type.
+                $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
+
+                // see method:
+                // $this->preventNoAccountInfo($validator, );
+
+                // validate that the currency fits the source and/or destination account.
+                // validate all account info
+                $this->validateAccountInformationUpdate($validator, $transactionGroup);
+            }
+        );
+        if ($validator->fails()) {
+            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+        }
+    }
 }

app/Console/Commands/Correction/FixAccountTypes.php

@@ -248,29 +248,14 @@ class FixAccountTypes extends Command
         }
     }
 
-    private function isLiability(string $destinationType): bool
-    {
-        return AccountType::LOAN === $destinationType || AccountType::DEBT === $destinationType || AccountType::MORTGAGE === $destinationType;
-    }
-
     private function shouldBeTransfer(string $transactionType, string $sourceType, string $destinationType): bool
     {
         return TransactionType::TRANSFER === $transactionType && AccountType::ASSET === $sourceType && $this->isLiability($destinationType);
     }
 
-    private function shouldBeDeposit(string $transactionType, string $sourceType, string $destinationType): bool
+    private function isLiability(string $destinationType): bool
     {
-        return TransactionType::TRANSFER === $transactionType && $this->isLiability($sourceType) && AccountType::ASSET === $destinationType;
-    }
-
-    private function shouldGoToExpenseAccount(string $transactionType, string $sourceType, string $destinationType): bool
-    {
-        return TransactionType::WITHDRAWAL === $transactionType && AccountType::ASSET === $sourceType && AccountType::REVENUE === $destinationType;
-    }
-
-    private function shouldComeFromRevenueAccount(string $transactionType, string $sourceType, string $destinationType): bool
-    {
-        return TransactionType::DEPOSIT === $transactionType && AccountType::EXPENSE === $sourceType && AccountType::ASSET === $destinationType;
+        return AccountType::LOAN === $destinationType || AccountType::DEBT === $destinationType || AccountType::MORTGAGE === $destinationType;
     }
 
     private function makeTransfer(TransactionJournal $journal): void
@@ -286,6 +271,11 @@ class FixAccountTypes extends Command
         $this->inspectJournal($journal);
     }
 
+    private function shouldBeDeposit(string $transactionType, string $sourceType, string $destinationType): bool
+    {
+        return TransactionType::TRANSFER === $transactionType && $this->isLiability($sourceType) && AccountType::ASSET === $destinationType;
+    }
+
     private function makeDeposit(TransactionJournal $journal): void
     {
         // from a liability to an asset should be a deposit.
@@ -299,6 +289,11 @@ class FixAccountTypes extends Command
         $this->inspectJournal($journal);
     }
 
+    private function shouldGoToExpenseAccount(string $transactionType, string $sourceType, string $destinationType): bool
+    {
+        return TransactionType::WITHDRAWAL === $transactionType && AccountType::ASSET === $sourceType && AccountType::REVENUE === $destinationType;
+    }
+
     private function makeExpenseDestination(TransactionJournal $journal, Transaction $destination): void
     {
         // withdrawals with a revenue account as destination instead of an expense account.
@@ -320,6 +315,11 @@ class FixAccountTypes extends Command
         $this->inspectJournal($journal);
     }
 
+    private function shouldComeFromRevenueAccount(string $transactionType, string $sourceType, string $destinationType): bool
+    {
+        return TransactionType::DEPOSIT === $transactionType && AccountType::EXPENSE === $sourceType && AccountType::ASSET === $destinationType;
+    }
+
     private function makeRevenueSource(TransactionJournal $journal, Transaction $source): void
     {
         // deposits with an expense account as source instead of a revenue account.
@@ -355,11 +355,6 @@ class FixAccountTypes extends Command
         return in_array($accountType, $validTypes, true);
     }
 
-    private function canCreateDestination(array $validDestinations): bool
-    {
-        return in_array(AccountTypeEnum::EXPENSE->value, $validDestinations, true);
-    }
-
     private function giveNewRevenue(TransactionJournal $journal, Transaction $source): void
     {
         app('log')->debug(sprintf('An account of type "%s" could be a valid source.', AccountTypeEnum::REVENUE->value));
@@ -373,6 +368,11 @@ class FixAccountTypes extends Command
         $this->inspectJournal($journal);
     }
 
+    private function canCreateDestination(array $validDestinations): bool
+    {
+        return in_array(AccountTypeEnum::EXPENSE->value, $validDestinations, true);
+    }
+
     private function giveNewExpense(TransactionJournal $journal, Transaction $destination): void
     {
         app('log')->debug(sprintf('An account of type "%s" could be a valid destination.', AccountTypeEnum::EXPENSE->value));

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -57,6 +57,19 @@ class CreateGroupMemberships extends Command
         return 0;
     }
 
+    /**
+     * @throws FireflyException
+     */
+    private function createGroupMemberships(): void
+    {
+        $users = User::get();
+
+        /** @var User $user */
+        foreach ($users as $user) {
+            self::createGroupMembership($user);
+        }
+    }
+
     /**
      * TODO move to helper.
      *
@@ -93,17 +106,4 @@ class CreateGroupMemberships extends Command
             $user->save();
         }
     }
-
-    /**
-     * @throws FireflyException
-     */
-    private function createGroupMemberships(): void
-    {
-        $users = User::get();
-
-        /** @var User $user */
-        foreach ($users as $user) {
-            self::createGroupMembership($user);
-        }
-    }
 }

app/Console/Commands/System/LaravelPassportKeys.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * LaravelPassportKeys.php
+ * Copyright (c) 2024 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\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Symfony\Component\Console\Command\Command as CommandAlias;
+
+class LaravelPassportKeys extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:laravel-passport-keys';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Calls the Laravel "passport:keys" but doesn\'t exit 1.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        Artisan::call('passport:keys --no-interaction', []);
+        $result = Artisan::output();
+        if (str_contains($result, 'Encryption keys already exist')) {
+            $this->friendlyInfo('Encryption keys exist already.');
+
+            return CommandAlias::SUCCESS;
+        }
+        $this->friendlyPositive('Encryption keys have been created, nice!');
+
+        return CommandAlias::SUCCESS;
+    }
+}

app/Console/Commands/Tools/ApplyRules.php

@@ -1,7 +1,7 @@
 <?php
-/**
+/*
  * ApplyRules.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -16,7 +16,7 @@
  * 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);

app/Console/Commands/Tools/Cron.php

@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * Cron.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,7 +17,7 @@
  * 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);

app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php

@@ -110,7 +110,7 @@ class AppendBudgetLimitPeriods extends Command
             return 'daily';
         }
         // is weekly
-        if ('1' === $limit->start_date->format('N') && '7' === $limit->end_date->format('N') && 6 === $limit->end_date->diffInDays($limit->start_date)) {
+        if ('1' === $limit->start_date->format('N') && '7' === $limit->end_date->format('N') && 6 === (int)$limit->end_date->diffInDays($limit->start_date, true)) {
             return 'weekly';
         }
 
@@ -129,7 +129,7 @@ class AppendBudgetLimitPeriods extends Command
         if (
             in_array($limit->start_date->format('j-n'), $start, true) // start of quarter
             && in_array($limit->end_date->format('j-n'), $end, true) // end of quarter
-            && 2 === $limit->start_date->diffInMonths($limit->end_date)
+            && 2 === (int)$limit->start_date->diffInMonths($limit->end_date, true)
         ) {
             return 'quarterly';
         }
@@ -139,7 +139,7 @@ class AppendBudgetLimitPeriods extends Command
         if (
             in_array($limit->start_date->format('j-n'), $start, true) // start of quarter
             && in_array($limit->end_date->format('j-n'), $end, true) // end of quarter
-            && 5 === $limit->start_date->diffInMonths($limit->end_date)
+            && 5 === (int)$limit->start_date->diffInMonths($limit->end_date, true)
         ) {
             return 'half_year';
         }

app/Console/Commands/Upgrade/MigrateRuleActions.php

@@ -0,0 +1,182 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * MigrateRuleActions.php
+ * Copyright (c) 2024 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\Console\Commands\Upgrade;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Models\RuleAction;
+use Illuminate\Console\Command;
+
+class MigrateRuleActions extends Command
+{
+    use ShowsFriendlyMessages;
+
+    public const string CONFIG_NAME = '610_migrate_rule_actions';
+
+    protected $description          = 'Migrate rule actions away from expression engine';
+
+    protected $signature            = 'firefly-iii:migrate-rule-actions {--F|force : Force the execution of this command.}';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        if ($this->isExecuted() && true !== $this->option('force')) {
+            $this->friendlyInfo('This command has already been executed.');
+
+            return 0;
+        }
+        if (false === config('firefly.feature_flags.expression_engine')) {
+            $this->friendlyInfo('Expression engine is not enabled. Nothing to do.');
+
+            return 0;
+        }
+        $this->replaceEqualSign();
+        $this->replaceObsoleteActions();
+
+        return 0;
+    }
+
+    private function isExecuted(): bool
+    {
+        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        if (null !== $configVar) {
+            return (bool)$configVar->data;
+        }
+
+        return false;
+    }
+
+    private function replaceEqualSign(): void
+    {
+        $count   = 0;
+        $actions = RuleAction::get();
+
+        /** @var RuleAction $action */
+        foreach ($actions as $action) {
+            if (str_starts_with($action->action_value, '=')) {
+                $action->action_value = sprintf('%s%s', '\=', substr($action->action_value, 1));
+                $action->save();
+                ++$count;
+            }
+        }
+        if ($count > 0) {
+            $this->friendlyInfo(sprintf('Upgrading %d rule action(s) for the new expression engine.', $count));
+        }
+        if (0 === $count) {
+            $this->friendlyInfo('All rule actions are up to date.');
+        }
+    }
+
+    private function replaceObsoleteActions(): void
+    {
+        $obsolete = [
+            'append_description',
+            'prepend_description',
+            'append_notes',
+            'prepend_notes',
+            'append_descr_to_notes',
+            'append_notes_to_descr',
+            'move_descr_to_notes',
+            'move_notes_to_descr',
+        ];
+        $actions  = RuleAction::whereIn('action_type', $obsolete)->get();
+
+        /** @var RuleAction $action */
+        foreach ($actions as $action) {
+            $oldType = $action->action_type;
+
+            switch ($action->action_type) {
+                default:
+                    $this->friendlyError(sprintf('Cannot deal with action type "%s", skip it.', $action->action_type));
+
+                    break;
+
+                case 'append_description':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = sprintf('=description~"%s"', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'prepend_description':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = sprintf('="%s"~description', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'append_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = sprintf('=notes~"%s"', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'prepend_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = sprintf('="%s"~notes', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'append_descr_to_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = '=notes~" "~description';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'append_notes_to_descr':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = '=description~" "~notes';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'move_descr_to_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = '=description';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'move_notes_to_descr':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = '=notes';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+            }
+        }
+    }
+}

app/Console/Commands/Upgrade/MigrateToGroups.php

@@ -193,22 +193,6 @@ class MigrateToGroups extends Command
         );
     }
 
-    private function findOpposingTransaction(TransactionJournal $journal, Transaction $transaction): ?Transaction
-    {
-        $set = $journal->transactions->filter(
-            static function (Transaction $subject) use ($transaction) {
-                $amount     = (float) $transaction->amount * -1 === (float) $subject->amount;  // intentional float
-                $identifier = $transaction->identifier === $subject->identifier;
-                app('log')->debug(sprintf('Amount the same? %s', var_export($amount, true)));
-                app('log')->debug(sprintf('ID the same?     %s', var_export($identifier, true)));
-
-                return $amount && $identifier;
-            }
-        );
-
-        return $set->first();
-    }
-
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -299,6 +283,22 @@ class MigrateToGroups extends Command
         ];
     }
 
+    private function findOpposingTransaction(TransactionJournal $journal, Transaction $transaction): ?Transaction
+    {
+        $set = $journal->transactions->filter(
+            static function (Transaction $subject) use ($transaction) {
+                $amount     = (float)$transaction->amount * -1 === (float)$subject->amount;  // intentional float
+                $identifier = $transaction->identifier === $subject->identifier;
+                app('log')->debug(sprintf('Amount the same? %s', var_export($amount, true)));
+                app('log')->debug(sprintf('ID the same?     %s', var_export($identifier, true)));
+
+                return $amount && $identifier;
+            }
+        );
+
+        return $set->first();
+    }
+
     private function getTransactionBudget(Transaction $left, Transaction $right): ?int
     {
         app('log')->debug('Now in getTransactionBudget()');

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -63,6 +63,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:upgrade-liabilities',
             'firefly-iii:liabilities-600',
             'firefly-iii:budget-limit-periods',
+            'firefly-iii:migrate-rule-actions',
             'firefly-iii:restore-oauth-keys',
             // also just in case, some integrity commands:
             'firefly-iii:create-group-memberships',

app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub

@@ -26,11 +26,11 @@ class UpgradeSkeleton extends Command
     {
         $start = microtime(true);
         if ($this->isExecuted() && true !== $this->option('force')) {
-            $this->info('FRIENDLY This command has already been executed.');
+            $this->friendlyInfo('This command has already been executed.');
 
             return 0;
         }
-        $this->warn('Congrats, you found the skeleton command. Boo!');
+        $this->friendlyWarning('Congrats, you found the skeleton command. Boo!');
 
         //$this->markAsExecuted();
 

app/Enums/UserRoleEnum.php

@@ -41,7 +41,6 @@ enum UserRoleEnum: string
     // manage other financial objects:
     case MANAGE_BUDGETS       = 'mng_budgets';
     case MANAGE_PIGGY_BANKS   = 'mng_piggies';
-    case MANAGE_REPETITIONS   = 'mng_reps';
     case MANAGE_SUBSCRIPTIONS = 'mng_subscriptions';
     case MANAGE_RULES         = 'mng_rules';
     case MANAGE_RECURRING     = 'mng_recurring';
@@ -51,7 +50,7 @@ enum UserRoleEnum: string
     // view and generate reports
     case VIEW_REPORTS         = 'view_reports';
 
-    // view memberships. needs FULL to manage them.
+    // view memberships AND roles. needs FULL to manage them.
     case VIEW_MEMBERSHIPS     = 'view_memberships';
 
     // everything the creator can, except remove/change original creator and delete group

app/Exceptions/GracefulNotFoundHandler.php

@@ -117,6 +117,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
                 return redirect(route('tags.index'));
 
             case 'categories.show':
+            case 'categories.edit':
             case 'categories.show.all':
                 $request->session()->reflash();
 

app/Exceptions/Handler.php

@@ -227,6 +227,16 @@ class Handler extends ExceptionHandler
         parent::report($e);
     }
 
+    private function shouldntReportLocal(\Throwable $e): bool
+    {
+        return null !== Arr::first(
+            $this->dontReport,
+            static function ($type) use ($e) {
+                return $e instanceof $type;
+            }
+        );
+    }
+
     /**
      * Convert a validation exception into a response.
      *
@@ -244,16 +254,6 @@ class Handler extends ExceptionHandler
         ;
     }
 
-    private function shouldntReportLocal(\Throwable $e): bool
-    {
-        return null !== Arr::first(
-            $this->dontReport,
-            static function ($type) use ($e) {
-                return $e instanceof $type;
-            }
-        );
-    }
-
     /**
      * Only return the redirectTo property from the exception if it is a valid URL. Return NULL otherwise.
      */

app/Factory/AccountFactory.php

@@ -121,21 +121,6 @@ class AccountFactory
         return $return;
     }
 
-    public function find(string $accountName, string $accountType): ?Account
-    {
-        app('log')->debug(sprintf('Now in AccountFactory::find("%s", "%s")', $accountName, $accountType));
-        $type = AccountType::whereType($accountType)->first();
-
-        // @var Account|null
-        return $this->user->accounts()->where('account_type_id', $type->id)->where('name', $accountName)->first();
-    }
-
-    public function setUser(User $user): void
-    {
-        $this->user = $user;
-        $this->accountRepository->setUser($user);
-    }
-
     /**
      * @throws FireflyException
      */
@@ -169,6 +154,15 @@ class AccountFactory
         return $result;
     }
 
+    public function find(string $accountName, string $accountType): ?Account
+    {
+        app('log')->debug(sprintf('Now in AccountFactory::find("%s", "%s")', $accountName, $accountType));
+        $type = AccountType::whereType($accountType)->first();
+
+        // @var Account|null
+        return $this->user->accounts()->where('account_type_id', $type->id)->where('name', $accountName)->first();
+    }
+
     /**
      * @throws FireflyException
      */
@@ -365,4 +359,10 @@ class AccountFactory
         $updateService->setUser($account->user);
         $updateService->update($account, ['order' => $order]);
     }
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+        $this->accountRepository->setUser($user);
+    }
 }

app/Factory/TransactionFactory.php

@@ -72,64 +72,6 @@ class TransactionFactory
         return $this->create(app('steam')->negative($amount), $foreignAmount);
     }
 
-    /**
-     * Create transaction with positive amount (for destination accounts).
-     *
-     * @throws FireflyException
-     */
-    public function createPositive(string $amount, ?string $foreignAmount): Transaction
-    {
-        if ('' === $foreignAmount) {
-            $foreignAmount = null;
-        }
-        if (null !== $foreignAmount) {
-            $foreignAmount = app('steam')->positive($foreignAmount);
-        }
-
-        return $this->create(app('steam')->positive($amount), $foreignAmount);
-    }
-
-    public function setAccount(Account $account): void
-    {
-        $this->account = $account;
-    }
-
-    public function setAccountInformation(array $accountInformation): void
-    {
-        $this->accountInformation = $accountInformation;
-    }
-
-    public function setCurrency(TransactionCurrency $currency): void
-    {
-        $this->currency = $currency;
-    }
-
-    /**
-     * @param null|TransactionCurrency $foreignCurrency |null
-     */
-    public function setForeignCurrency(?TransactionCurrency $foreignCurrency): void
-    {
-        $this->foreignCurrency = $foreignCurrency;
-    }
-
-    public function setJournal(TransactionJournal $journal): void
-    {
-        $this->journal = $journal;
-    }
-
-    public function setReconciled(bool $reconciled): void
-    {
-        $this->reconciled = $reconciled;
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function setUser(User $user): void
-    {
-        // empty function.
-    }
-
     /**
      * @throws FireflyException
      */
@@ -224,4 +166,62 @@ class TransactionFactory
         $service   = app(AccountUpdateService::class);
         $service->update($this->account, ['iban' => $this->accountInformation['iban']]);
     }
+
+    /**
+     * Create transaction with positive amount (for destination accounts).
+     *
+     * @throws FireflyException
+     */
+    public function createPositive(string $amount, ?string $foreignAmount): Transaction
+    {
+        if ('' === $foreignAmount) {
+            $foreignAmount = null;
+        }
+        if (null !== $foreignAmount) {
+            $foreignAmount = app('steam')->positive($foreignAmount);
+        }
+
+        return $this->create(app('steam')->positive($amount), $foreignAmount);
+    }
+
+    public function setAccount(Account $account): void
+    {
+        $this->account = $account;
+    }
+
+    public function setAccountInformation(array $accountInformation): void
+    {
+        $this->accountInformation = $accountInformation;
+    }
+
+    public function setCurrency(TransactionCurrency $currency): void
+    {
+        $this->currency = $currency;
+    }
+
+    /**
+     * @param null|TransactionCurrency $foreignCurrency |null
+     */
+    public function setForeignCurrency(?TransactionCurrency $foreignCurrency): void
+    {
+        $this->foreignCurrency = $foreignCurrency;
+    }
+
+    public function setJournal(TransactionJournal $journal): void
+    {
+        $this->journal = $journal;
+    }
+
+    public function setReconciled(bool $reconciled): void
+    {
+        $this->reconciled = $reconciled;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setUser(User $user): void
+    {
+        // empty function.
+    }
 }

app/Factory/TransactionJournalFactory.php

@@ -141,49 +141,6 @@ class TransactionJournalFactory
         return $collection;
     }
 
-    /**
-     * Set the user.
-     */
-    public function setUser(User $user): void
-    {
-        $this->user = $user;
-        $this->currencyRepository->setUser($this->user);
-        $this->tagFactory->setUser($user);
-        $this->billRepository->setUser($this->user);
-        $this->budgetRepository->setUser($this->user);
-        $this->categoryRepository->setUser($this->user);
-        $this->piggyRepository->setUser($this->user);
-        $this->accountRepository->setUser($this->user);
-    }
-
-    public function setErrorOnHash(bool $errorOnHash): void
-    {
-        $this->errorOnHash = $errorOnHash;
-        if (true === $errorOnHash) {
-            app('log')->info('Will trigger duplication alert for this journal.');
-        }
-    }
-
-    protected function storeMeta(TransactionJournal $journal, NullArrayObject $data, string $field): void
-    {
-        $set     = [
-            'journal' => $journal,
-            'name'    => $field,
-            'data'    => (string) ($data[$field] ?? ''),
-        ];
-        if ($data[$field] instanceof Carbon) {
-            $data[$field]->setTimezone(config('app.timezone'));
-            app('log')->debug(sprintf('%s Date: %s (%s)', $field, $data[$field], $data[$field]->timezone->getName()));
-            $set['data'] = $data[$field]->format('Y-m-d H:i:s');
-        }
-
-        app('log')->debug(sprintf('Going to store meta-field "%s", with value "%s".', $set['name'], $set['data']));
-
-        /** @var TransactionJournalMetaFactory $factory */
-        $factory = app(TransactionJournalMetaFactory::class);
-        $factory->updateOrCreate($set);
-    }
-
     /**
      * TODO typeOverrule: the account validator may have another opinion on the transaction type. not sure what to do
      * with this.
@@ -326,18 +283,6 @@ class TransactionJournalFactory
         return $journal;
     }
 
-    private function storeLocation(TransactionJournal $journal, NullArrayObject $data): void
-    {
-        if (true === $data['store_location']) {
-            $location             = new Location();
-            $location->longitude  = $data['longitude'];
-            $location->latitude   = $data['latitude'];
-            $location->zoom_level = $data['zoom_level'];
-            $location->locatable()->associate($journal);
-            $location->save();
-        }
-    }
-
     private function hashArray(NullArrayObject $row): string
     {
         $dataRow = $row->getArrayCopy();
@@ -428,6 +373,21 @@ class TransactionJournalFactory
         }
     }
 
+    /**
+     * Set the user.
+     */
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+        $this->currencyRepository->setUser($this->user);
+        $this->tagFactory->setUser($user);
+        $this->billRepository->setUser($this->user);
+        $this->budgetRepository->setUser($this->user);
+        $this->categoryRepository->setUser($this->user);
+        $this->piggyRepository->setUser($this->user);
+        $this->accountRepository->setUser($this->user);
+    }
+
     private function reconciliationSanityCheck(?Account $sourceAccount, ?Account $destinationAccount): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
@@ -567,4 +527,44 @@ class TransactionJournalFactory
             $this->storeMeta($journal, $transaction, $field);
         }
     }
+
+    protected function storeMeta(TransactionJournal $journal, NullArrayObject $data, string $field): void
+    {
+        $set     = [
+            'journal' => $journal,
+            'name'    => $field,
+            'data'    => (string)($data[$field] ?? ''),
+        ];
+        if ($data[$field] instanceof Carbon) {
+            $data[$field]->setTimezone(config('app.timezone'));
+            app('log')->debug(sprintf('%s Date: %s (%s)', $field, $data[$field], $data[$field]->timezone->getName()));
+            $set['data'] = $data[$field]->format('Y-m-d H:i:s');
+        }
+
+        app('log')->debug(sprintf('Going to store meta-field "%s", with value "%s".', $set['name'], $set['data']));
+
+        /** @var TransactionJournalMetaFactory $factory */
+        $factory = app(TransactionJournalMetaFactory::class);
+        $factory->updateOrCreate($set);
+    }
+
+    private function storeLocation(TransactionJournal $journal, NullArrayObject $data): void
+    {
+        if (true === $data['store_location']) {
+            $location             = new Location();
+            $location->longitude  = $data['longitude'];
+            $location->latitude   = $data['latitude'];
+            $location->zoom_level = $data['zoom_level'];
+            $location->locatable()->associate($journal);
+            $location->save();
+        }
+    }
+
+    public function setErrorOnHash(bool $errorOnHash): void
+    {
+        $this->errorOnHash = $errorOnHash;
+        if (true === $errorOnHash) {
+            app('log')->info('Will trigger duplication alert for this journal.');
+        }
+    }
 }

app/Generator/Report/Account/MonthReportGenerator.php

@@ -67,6 +67,14 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $result;
     }
 
+    /**
+     * Return the preferred period.
+     */
+    protected function preferredPeriod(): string
+    {
+        return 'day';
+    }
+
     /**
      * Set accounts.
      */
@@ -130,12 +138,4 @@ class MonthReportGenerator implements ReportGeneratorInterface
     {
         return $this;
     }
-
-    /**
-     * Return the preferred period.
-     */
-    protected function preferredPeriod(): string
-    {
-        return 'day';
-    }
 }

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -125,26 +125,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
-    /**
-     * Set the involved budgets.
-     */
-    public function setBudgets(Collection $budgets): ReportGeneratorInterface
-    {
-        $this->budgets = $budgets;
-
-        return $this;
-    }
-
-    /**
-     * Set the involved accounts.
-     */
-    public function setAccounts(Collection $accounts): ReportGeneratorInterface
-    {
-        $this->accounts = $accounts;
-
-        return $this;
-    }
-
     /**
      * Get the expenses.
      */
@@ -170,4 +150,24 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         return $journals;
     }
+
+    /**
+     * Set the involved budgets.
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        $this->budgets = $budgets;
+
+        return $this;
+    }
+
+    /**
+     * Set the involved accounts.
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
 }

app/Generator/Report/Category/MonthReportGenerator.php

@@ -124,26 +124,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
-    /**
-     * Set the categories involved in this report.
-     */
-    public function setCategories(Collection $categories): ReportGeneratorInterface
-    {
-        $this->categories = $categories;
-
-        return $this;
-    }
-
-    /**
-     * Set the involved accounts.
-     */
-    public function setAccounts(Collection $accounts): ReportGeneratorInterface
-    {
-        $this->accounts = $accounts;
-
-        return $this;
-    }
-
     /**
      * Get the expenses for this report.
      */
@@ -168,6 +148,26 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $transactions;
     }
 
+    /**
+     * Set the categories involved in this report.
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        $this->categories = $categories;
+
+        return $this;
+    }
+
+    /**
+     * Set the involved accounts.
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
     /**
      * Get the income for this report.
      */

app/Generator/Report/ReportGeneratorFactory.php

@@ -40,12 +40,12 @@ class ReportGeneratorFactory
     {
         $period = 'Month';
         // more than two months date difference means year report.
-        if ($start->diffInMonths($end) > 1) {
+        if ($start->diffInMonths($end, true) > 1) {
             $period = 'Year';
         }
 
-        // more than one year date difference means multi year report.
-        if ($start->diffInMonths($end) > 12) {
+        // more than one year date difference means multi-year report.
+        if ($start->diffInMonths($end, true) > 12) {
             $period = 'MultiYear';
         }
 

app/Generator/Webhook/StandardMessageGenerator.php

@@ -72,31 +72,6 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         $this->run();
     }
 
-    public function getVersion(): int
-    {
-        return $this->version;
-    }
-
-    public function setObjects(Collection $objects): void
-    {
-        $this->objects = $objects;
-    }
-
-    public function setTrigger(int $trigger): void
-    {
-        $this->trigger = $trigger;
-    }
-
-    public function setUser(User $user): void
-    {
-        $this->user = $user;
-    }
-
-    public function setWebhooks(Collection $webhooks): void
-    {
-        $this->webhooks = $webhooks;
-    }
-
     private function getWebhooks(): Collection
     {
         return $this->user->webhooks()->where('active', true)->where('trigger', $this->trigger)->get(['webhooks.*']);
@@ -206,6 +181,11 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         $this->storeMessage($webhook, $basicMessage);
     }
 
+    public function getVersion(): int
+    {
+        return $this->version;
+    }
+
     private function collectAccounts(TransactionGroup $transactionGroup): Collection
     {
         $accounts = new Collection();
@@ -232,4 +212,24 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         $webhookMessage->save();
         app('log')->debug(sprintf('Stored new webhook message #%d', $webhookMessage->id));
     }
+
+    public function setObjects(Collection $objects): void
+    {
+        $this->objects = $objects;
+    }
+
+    public function setTrigger(int $trigger): void
+    {
+        $this->trigger = $trigger;
+    }
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    public function setWebhooks(Collection $webhooks): void
+    {
+        $this->webhooks = $webhooks;
+    }
 }

app/Handlers/Events/Model/BudgetLimitHandler.php

@@ -49,20 +49,6 @@ class BudgetLimitHandler
         $this->updateAvailableBudget($event->budgetLimit);
     }
 
-    public function deleted(Deleted $event): void
-    {
-        app('log')->debug(sprintf('BudgetLimitHandler::deleted(#%s)', $event->budgetLimit->id));
-        $budgetLimit     = $event->budgetLimit;
-        $budgetLimit->id = 0;
-        $this->updateAvailableBudget($event->budgetLimit);
-    }
-
-    public function updated(Updated $event): void
-    {
-        app('log')->debug(sprintf('BudgetLimitHandler::updated(#%s)', $event->budgetLimit->id));
-        $this->updateAvailableBudget($event->budgetLimit);
-    }
-
     private function updateAvailableBudget(BudgetLimit $budgetLimit): void
     {
         app('log')->debug(sprintf('Now in updateAvailableBudget(#%d)', $budgetLimit->id));
@@ -248,4 +234,18 @@ class BudgetLimitHandler
 
         return $amount;
     }
+
+    public function deleted(Deleted $event): void
+    {
+        app('log')->debug(sprintf('BudgetLimitHandler::deleted(#%s)', $event->budgetLimit->id));
+        $budgetLimit     = $event->budgetLimit;
+        $budgetLimit->id = 0;
+        $this->updateAvailableBudget($event->budgetLimit);
+    }
+
+    public function updated(Updated $event): void
+    {
+        app('log')->debug(sprintf('BudgetLimitHandler::updated(#%s)', $event->budgetLimit->id));
+        $this->updateAvailableBudget($event->budgetLimit);
+    }
 }

app/Handlers/Events/UserEventHandler.php

@@ -405,7 +405,7 @@ class UserEventHandler
             }
             // clean up old entries (6 months)
             $carbon = Carbon::createFromFormat('Y-m-d H:i:s', $preference[$index]['time']);
-            if (false !== $carbon && $carbon->diffInMonths(today()) > 6) {
+            if (false !== $carbon && $carbon->diffInMonths(today(), true) > 6) {
                 app('log')->debug(sprintf('Entry for %s is very old, remove it.', $row['ip']));
                 unset($preference[$index]);
             }

app/Helpers/Attachments/AttachmentHelper.php

@@ -236,7 +236,9 @@ class AttachmentHelper implements AttachmentHelperInterface
             $fileObject->rewind();
 
             if (0 === $file->getSize()) {
-                throw new FireflyException('Cannot upload empty or non-existent file.');
+                $this->errors->add('attachments', trans('validation.file_zero_length'));
+
+                return null;
             }
 
             $content              = (string)$fileObject->fread($file->getSize());

app/Helpers/Collector/Extensions/AttachmentCollection.php

@@ -81,6 +81,27 @@ trait AttachmentCollection
         return $this;
     }
 
+    /**
+     * Join table to get attachment information.
+     */
+    private function joinAttachmentTables(): void
+    {
+        if (false === $this->hasJoinedAttTables) {
+            // join some extra tables:
+            $this->hasJoinedAttTables = true;
+            $this->query->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
+                ->where(
+                    static function (EloquentBuilder $q1): void { // @phpstan-ignore-line
+                        $q1->where('attachments.attachable_type', TransactionJournal::class);
+                        $q1->where('attachments.uploaded', true);
+                        $q1->whereNull('attachments.deleted_at');
+                        $q1->orWhereNull('attachments.attachable_type');
+                    }
+                )
+            ;
+        }
+    }
+
     public function withAttachmentInformation(): GroupCollectorInterface
     {
         $this->fields[] = 'attachments.id as attachment_id';
@@ -511,25 +532,4 @@ trait AttachmentCollection
 
         return $this;
     }
-
-    /**
-     * Join table to get attachment information.
-     */
-    private function joinAttachmentTables(): void
-    {
-        if (false === $this->hasJoinedAttTables) {
-            // join some extra tables:
-            $this->hasJoinedAttTables = true;
-            $this->query->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
-                ->where(
-                    static function (EloquentBuilder $q1): void { // @phpstan-ignore-line
-                        $q1->where('attachments.attachable_type', TransactionJournal::class);
-                        $q1->where('attachments.uploaded', true);
-                        $q1->whereNull('attachments.deleted_at');
-                        $q1->orWhereNull('attachments.attachable_type');
-                    }
-                )
-            ;
-        }
-    }
 }

app/Helpers/Collector/Extensions/CollectorProperties.php

@@ -34,6 +34,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 trait CollectorProperties
 {
     public const string TEST = 'Test';
+
+    /** @var array<int, string> */
+    public array    $sorting;
+    private ?int    $endRow;
     private bool    $expandGroupSearch;
     private array   $fields;
     private bool    $hasAccountInfo;
@@ -49,10 +53,8 @@ trait CollectorProperties
     private ?int    $page;
     private array   $postFilters;
     private HasMany $query;
-    private array   $stringFields;
-
     private ?int    $startRow;
-    private ?int $endRow;
+    private array   $stringFields;
     /*
      * This array is used to collect ALL tags the user may search for (using 'setTags').
      * This way the user can call 'setTags' multiple times and get a joined result.

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -171,6 +171,19 @@ trait MetaCollection
         return $this;
     }
 
+    /**
+     * Join table to get tag information.
+     */
+    protected function joinMetaDataTables(): void
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+            $this->fields[]            = 'journal_meta.name as meta_name';
+            $this->fields[]            = 'journal_meta.data as meta_data';
+        }
+    }
+
     public function excludeExternalUrl(string $url): GroupCollectorInterface
     {
         $this->joinMetaDataTables();
@@ -369,6 +382,19 @@ trait MetaCollection
         return $this;
     }
 
+    /**
+     * Join table to get tag information.
+     */
+    protected function joinTagTables(): void
+    {
+        if (false === $this->hasJoinedTagTables) {
+            // join some extra tables:
+            $this->hasJoinedTagTables = true;
+            $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
+            $this->query->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id');
+        }
+    }
+
     public function internalReferenceContains(string $internalReference): GroupCollectorInterface
     {
         $internalReference = (string)json_encode($internalReference);
@@ -539,6 +565,63 @@ trait MetaCollection
         return $this;
     }
 
+    /**
+     * Limit results to a SPECIFIC set of tags.
+     */
+    public function setAllTags(Collection $tags): GroupCollectorInterface
+    {
+        Log::debug(sprintf('Now in setAllTags(%d tag(s))', $tags->count()));
+        $this->withTagInformation();
+        $this->query->whereNotNull('tag_transaction_journal.tag_id');
+
+        // this method adds a "postFilter" to the collector.
+        $list                = $tags->pluck('tag')->toArray();
+        $list                = array_map('strtolower', $list);
+        $filter              = static function (array $object) use ($list): bool|array {
+            $includedJournals       = [];
+            $return                 = $object;
+            unset($return['transactions']);
+            $return['transactions'] = [];
+            Log::debug(sprintf('Now in setAllTags(%s) filter', implode(', ', $list)));
+            $expectedTagCount       = count($list);
+            $foundTagCount          = 0;
+            foreach ($object['transactions'] as $transaction) {
+                $transactionTagCount = count($transaction['tags']);
+                app('log')->debug(sprintf('Transaction #%d has %d tag(s)', $transaction['transaction_journal_id'], $transactionTagCount));
+                if ($transactionTagCount < $expectedTagCount) {
+                    app('log')->debug(sprintf('Transaction has %d tag(s), we expect %d tag(s), return false.', $transactionTagCount, $expectedTagCount));
+
+                    return false;
+                }
+                foreach ($transaction['tags'] as $tag) {
+                    Log::debug(sprintf('"%s" versus', strtolower($tag['name'])), $list);
+                    if (in_array(strtolower($tag['name']), $list, true)) {
+                        app('log')->debug(sprintf('Transaction has tag "%s" so count++.', $tag['name']));
+                        ++$foundTagCount;
+                        $journalId = $transaction['transaction_journal_id'];
+                        // #8377 prevent adding a transaction twice when multiple tag searches find this transaction
+                        if (!in_array($journalId, $includedJournals, true)) {
+                            $includedJournals[]       = $journalId;
+                            $return['transactions'][] = $transaction;
+                        }
+                    }
+                }
+            }
+            Log::debug(sprintf('Found %d tags, need at least %d.', $foundTagCount, $expectedTagCount));
+
+            // found at least the expected tags.
+            $result                 = $foundTagCount >= $expectedTagCount;
+            if (true === $result) {
+                return $return;
+            }
+
+            return false;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
     /**
      * Limit the search to a specific bill.
      */
@@ -669,63 +752,6 @@ trait MetaCollection
         return $this;
     }
 
-    /**
-     * Limit results to a SPECIFIC set of tags.
-     */
-    public function setAllTags(Collection $tags): GroupCollectorInterface
-    {
-        Log::debug(sprintf('Now in setAllTags(%d tag(s))', $tags->count()));
-        $this->withTagInformation();
-        $this->query->whereNotNull('tag_transaction_journal.tag_id');
-
-        // this method adds a "postFilter" to the collector.
-        $list                = $tags->pluck('tag')->toArray();
-        $list                = array_map('strtolower', $list);
-        $filter              = static function (array $object) use ($list): bool|array {
-            $includedJournals       = [];
-            $return                 = $object;
-            unset($return['transactions']);
-            $return['transactions'] = [];
-            Log::debug(sprintf('Now in setAllTags(%s) filter', implode(', ', $list)));
-            $expectedTagCount       = count($list);
-            $foundTagCount          = 0;
-            foreach ($object['transactions'] as $transaction) {
-                $transactionTagCount = count($transaction['tags']);
-                app('log')->debug(sprintf('Transaction #%d has %d tag(s)', $transaction['transaction_journal_id'], $transactionTagCount));
-                if ($transactionTagCount < $expectedTagCount) {
-                    app('log')->debug(sprintf('Transaction has %d tag(s), we expect %d tag(s), return false.', $transactionTagCount, $expectedTagCount));
-
-                    return false;
-                }
-                foreach ($transaction['tags'] as $tag) {
-                    Log::debug(sprintf('"%s" versus', strtolower($tag['name'])), $list);
-                    if (in_array(strtolower($tag['name']), $list, true)) {
-                        app('log')->debug(sprintf('Transaction has tag "%s" so count++.', $tag['name']));
-                        ++$foundTagCount;
-                        $journalId = $transaction['transaction_journal_id'];
-                        // #8377 prevent adding a transaction twice when multiple tag searches find this transaction
-                        if (!in_array($journalId, $includedJournals, true)) {
-                            $includedJournals[]       = $journalId;
-                            $return['transactions'][] = $transaction;
-                        }
-                    }
-                }
-            }
-            Log::debug(sprintf('Found %d tags, need at least %d.', $foundTagCount, $expectedTagCount));
-
-            // found at least the expected tags.
-            $result                 = $foundTagCount >= $expectedTagCount;
-            if (true === $result) {
-                return $return;
-            }
-
-            return false;
-        };
-        $this->postFilters[] = $filter;
-
-        return $this;
-    }
-
     /**
      * Limit results to any of the tags in the list.
      */
@@ -938,30 +964,4 @@ trait MetaCollection
 
         return $this;
     }
-
-    /**
-     * Join table to get tag information.
-     */
-    protected function joinMetaDataTables(): void
-    {
-        if (false === $this->hasJoinedMetaTables) {
-            $this->hasJoinedMetaTables = true;
-            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
-            $this->fields[]            = 'journal_meta.name as meta_name';
-            $this->fields[]            = 'journal_meta.data as meta_data';
-        }
-    }
-
-    /**
-     * Join table to get tag information.
-     */
-    protected function joinTagTables(): void
-    {
-        if (false === $this->hasJoinedTagTables) {
-            // join some extra tables:
-            $this->hasJoinedTagTables = true;
-            $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
-            $this->query->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id');
-        }
-    }
 }

app/Helpers/Collector/GroupCollector.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Helpers\Collector;
 
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
+use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\Extensions\AccountCollection;
 use FireflyIII\Helpers\Collector\Extensions\AmountCollection;
@@ -61,6 +62,7 @@ class GroupCollector implements GroupCollectorInterface
      */
     public function __construct()
     {
+        $this->sorting              = [];
         $this->postFilters          = [];
         $this->tags                 = [];
         $this->user                 = null;
@@ -466,6 +468,9 @@ class GroupCollector implements GroupCollectorInterface
         // filter the array using all available post filters:
         $collection  = $this->postFilterCollection($collection);
 
+        // sort the collection, if sort instructions are present.
+        $collection  = $this->sortCollection($collection);
+
         // count it and continue:
         $this->total = $collection->count();
 
@@ -483,226 +488,6 @@ class GroupCollector implements GroupCollectorInterface
         return $collection;
     }
 
-    /**
-     * Same as getGroups but everything is in a paginator.
-     */
-    public function getPaginatedGroups(): LengthAwarePaginator
-    {
-        $set = $this->getGroups();
-        if (0 === $this->limit) {
-            $this->setLimit(50);
-        }
-        if (null !== $this->startRow && null !== $this->endRow) {
-            $total = $this->endRow - $this->startRow;
-
-            return new LengthAwarePaginator($set, $this->total, $total, 1);
-        }
-
-        return new LengthAwarePaginator($set, $this->total, $this->limit, $this->page);
-    }
-
-    /**
-     * Limit the number of returned entries.
-     */
-    public function setLimit(int $limit): GroupCollectorInterface
-    {
-        $this->limit = $limit;
-        // app('log')->debug(sprintf('GroupCollector: The limit is now %d', $limit));
-
-        return $this;
-    }
-
-    public function isNotReconciled(): GroupCollectorInterface
-    {
-        $this->query->where('source.reconciled', 0)->where('destination.reconciled', 0);
-
-        return $this;
-    }
-
-    public function isReconciled(): GroupCollectorInterface
-    {
-        $this->query->where('source.reconciled', 1)->where('destination.reconciled', 1);
-
-        return $this;
-    }
-
-    /**
-     * Limit results to a specific currency, either foreign or normal one.
-     */
-    public function setCurrency(TransactionCurrency $currency): GroupCollectorInterface
-    {
-        $this->query->where(
-            static function (EloquentBuilder $q) use ($currency): void { // @phpstan-ignore-line
-                $q->where('source.transaction_currency_id', $currency->id);
-                $q->orWhere('source.foreign_currency_id', $currency->id);
-            }
-        );
-
-        return $this;
-    }
-
-    public function setExpandGroupSearch(bool $expandGroupSearch): GroupCollectorInterface
-    {
-        $this->expandGroupSearch = $expandGroupSearch;
-
-        return $this;
-    }
-
-    public function setForeignCurrency(TransactionCurrency $currency): GroupCollectorInterface
-    {
-        $this->query->where('source.foreign_currency_id', $currency->id);
-
-        return $this;
-    }
-
-    /**
-     * Limit the result to a set of specific transaction groups.
-     */
-    public function setIds(array $groupIds): GroupCollectorInterface
-    {
-        $this->query->whereIn('transaction_groups.id', $groupIds);
-
-        return $this;
-    }
-
-    /**
-     * Limit the result to a set of specific journals.
-     */
-    public function setJournalIds(array $journalIds): GroupCollectorInterface
-    {
-        if (0 !== count($journalIds)) {
-            // make all integers.
-            $integerIDs = array_map('intval', $journalIds);
-            Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));
-
-            $this->query->whereIn('transaction_journals.id', $integerIDs);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the page to get.
-     */
-    public function setPage(int $page): GroupCollectorInterface
-    {
-        $page       = 0 === $page ? 1 : $page;
-        $this->page = $page;
-        // app('log')->debug(sprintf('GroupCollector: page is now %d', $page));
-
-        return $this;
-    }
-
-    /**
-     * Search for words in descriptions.
-     */
-    public function setSearchWords(array $array): GroupCollectorInterface
-    {
-        if (0 === count($array)) {
-            return $this;
-        }
-        $this->query->where(
-            static function (EloquentBuilder $q) use ($array): void { // @phpstan-ignore-line
-                $q->where(
-                    static function (EloquentBuilder $q1) use ($array): void {
-                        foreach ($array as $word) {
-                            $keyword = sprintf('%%%s%%', $word);
-                            $q1->where('transaction_journals.description', 'LIKE', $keyword);
-                        }
-                    }
-                );
-                $q->orWhere(
-                    static function (EloquentBuilder $q2) use ($array): void {
-                        foreach ($array as $word) {
-                            $keyword = sprintf('%%%s%%', $word);
-                            $q2->where('transaction_groups.title', 'LIKE', $keyword);
-                        }
-                    }
-                );
-            }
-        );
-
-        return $this;
-    }
-
-    /**
-     * Limit the search to one specific transaction group.
-     */
-    public function setTransactionGroup(TransactionGroup $transactionGroup): GroupCollectorInterface
-    {
-        $this->query->where('transaction_groups.id', $transactionGroup->id);
-
-        return $this;
-    }
-
-    /**
-     * Limit the included transaction types.
-     */
-    public function setTypes(array $types): GroupCollectorInterface
-    {
-        $this->query->whereIn('transaction_types.type', $types);
-
-        return $this;
-    }
-
-    /**
-     * Set the user object and start the query.
-     */
-    public function setUser(User $user): GroupCollectorInterface
-    {
-        if (null === $this->user) {
-            $this->user = $user;
-            $this->startQuery();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the user object and start the query.
-     */
-    public function setUserGroup(UserGroup $userGroup): GroupCollectorInterface
-    {
-        if (null === $this->userGroup) {
-            $this->userGroup = $userGroup;
-            $this->startQueryForGroup();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Automatically include all stuff required to make API calls work.
-     */
-    public function withAPIInformation(): GroupCollectorInterface
-    {
-        // include source + destination account name and type.
-        $this->withAccountInformation()
-            // include category ID + name (if any)
-            ->withCategoryInformation()
-            // include budget ID + name (if any)
-            ->withBudgetInformation()
-            // include bill ID + name (if any)
-            ->withBillInformation()
-        ;
-
-        return $this;
-    }
-
-    public function setEndRow(int $endRow): self
-    {
-        $this->endRow = $endRow;
-
-        return $this;
-    }
-
-    public function setStartRow(int $startRow): self
-    {
-        $this->startRow = $startRow;
-
-        return $this;
-    }
-
     private function getCollectedGroupIds(): array
     {
         return $this->query->get(['transaction_journals.transaction_group_id'])->pluck('transaction_group_id')->toArray();
@@ -998,6 +783,233 @@ class GroupCollector implements GroupCollectorInterface
         return $currentCollection;
     }
 
+    #[\Override]
+    public function sortCollection(Collection $collection): Collection
+    {
+        /**
+         * @var string $field
+         * @var string $direction
+         */
+        foreach ($this->sorting as $field => $direction) {
+            $func       = 'ASC' === $direction ? 'sortBy' : 'sortByDesc';
+            $collection = $collection->{$func}(function (array $product, int $key) use ($field) { // @phpstan-ignore-line
+                // depends on $field:
+                if ('description' === $field) {
+                    if (1 === count($product['transactions'])) {
+                        return array_values($product['transactions'])[0][$field];
+                    }
+                    if (count($product['transactions']) > 1) {
+                        return $product['title'];
+                    }
+
+                    return 'zzz';
+                }
+
+                exit('here we are');
+            });
+        }
+
+        return $collection;
+    }
+
+    /**
+     * Same as getGroups but everything is in a paginator.
+     */
+    public function getPaginatedGroups(): LengthAwarePaginator
+    {
+        $set = $this->getGroups();
+        if (0 === $this->limit) {
+            $this->setLimit(50);
+        }
+        if (null !== $this->startRow && null !== $this->endRow) {
+            /** @var int $total */
+            $total = $this->endRow - $this->startRow;
+
+            return new LengthAwarePaginator($set, $this->total, $total, 1);
+        }
+
+        return new LengthAwarePaginator($set, $this->total, $this->limit, $this->page);
+    }
+
+    /**
+     * Limit the number of returned entries.
+     */
+    public function setLimit(int $limit): GroupCollectorInterface
+    {
+        $this->limit = $limit;
+        // app('log')->debug(sprintf('GroupCollector: The limit is now %d', $limit));
+
+        return $this;
+    }
+
+    public function isNotReconciled(): GroupCollectorInterface
+    {
+        $this->query->where('source.reconciled', 0)->where('destination.reconciled', 0);
+
+        return $this;
+    }
+
+    public function isReconciled(): GroupCollectorInterface
+    {
+        $this->query->where('source.reconciled', 1)->where('destination.reconciled', 1);
+
+        return $this;
+    }
+
+    /**
+     * Limit results to a specific currency, either foreign or normal one.
+     */
+    public function setCurrency(TransactionCurrency $currency): GroupCollectorInterface
+    {
+        $this->query->where(
+            static function (EloquentBuilder $q) use ($currency): void { // @phpstan-ignore-line
+                $q->where('source.transaction_currency_id', $currency->id);
+                $q->orWhere('source.foreign_currency_id', $currency->id);
+            }
+        );
+
+        return $this;
+    }
+
+    public function setEndRow(int $endRow): self
+    {
+        $this->endRow = $endRow;
+
+        return $this;
+    }
+
+    public function setExpandGroupSearch(bool $expandGroupSearch): GroupCollectorInterface
+    {
+        $this->expandGroupSearch = $expandGroupSearch;
+
+        return $this;
+    }
+
+    public function setForeignCurrency(TransactionCurrency $currency): GroupCollectorInterface
+    {
+        $this->query->where('source.foreign_currency_id', $currency->id);
+
+        return $this;
+    }
+
+    /**
+     * Limit the result to a set of specific transaction groups.
+     */
+    public function setIds(array $groupIds): GroupCollectorInterface
+    {
+        $this->query->whereIn('transaction_groups.id', $groupIds);
+
+        return $this;
+    }
+
+    /**
+     * Limit the result to a set of specific journals.
+     */
+    public function setJournalIds(array $journalIds): GroupCollectorInterface
+    {
+        if (0 !== count($journalIds)) {
+            // make all integers.
+            $integerIDs = array_map('intval', $journalIds);
+            Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));
+
+            $this->query->whereIn('transaction_journals.id', $integerIDs);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the page to get.
+     */
+    public function setPage(int $page): GroupCollectorInterface
+    {
+        $page       = 0 === $page ? 1 : $page;
+        $this->page = $page;
+        // app('log')->debug(sprintf('GroupCollector: page is now %d', $page));
+
+        return $this;
+    }
+
+    /**
+     * Search for words in descriptions.
+     */
+    public function setSearchWords(array $array): GroupCollectorInterface
+    {
+        if (0 === count($array)) {
+            return $this;
+        }
+        $this->query->where(
+            static function (EloquentBuilder $q) use ($array): void { // @phpstan-ignore-line
+                $q->where(
+                    static function (EloquentBuilder $q1) use ($array): void {
+                        foreach ($array as $word) {
+                            $keyword = sprintf('%%%s%%', $word);
+                            $q1->where('transaction_journals.description', 'LIKE', $keyword);
+                        }
+                    }
+                );
+                $q->orWhere(
+                    static function (EloquentBuilder $q2) use ($array): void {
+                        foreach ($array as $word) {
+                            $keyword = sprintf('%%%s%%', $word);
+                            $q2->where('transaction_groups.title', 'LIKE', $keyword);
+                        }
+                    }
+                );
+            }
+        );
+
+        return $this;
+    }
+
+    #[\Override]
+    public function setSorting(array $instructions): GroupCollectorInterface
+    {
+        $this->sorting = $instructions;
+
+        return $this;
+    }
+
+    public function setStartRow(int $startRow): self
+    {
+        $this->startRow = $startRow;
+
+        return $this;
+    }
+
+    /**
+     * Limit the search to one specific transaction group.
+     */
+    public function setTransactionGroup(TransactionGroup $transactionGroup): GroupCollectorInterface
+    {
+        $this->query->where('transaction_groups.id', $transactionGroup->id);
+
+        return $this;
+    }
+
+    /**
+     * Limit the included transaction types.
+     */
+    public function setTypes(array $types): GroupCollectorInterface
+    {
+        $this->query->whereIn('transaction_types.type', $types);
+
+        return $this;
+    }
+
+    /**
+     * Set the user object and start the query.
+     */
+    public function setUser(User $user): GroupCollectorInterface
+    {
+        if (null === $this->user) {
+            $this->user = $user;
+            $this->startQuery();
+        }
+
+        return $this;
+    }
+
     /**
      * Build the query.
      */
@@ -1044,6 +1056,19 @@ class GroupCollector implements GroupCollectorInterface
         ;
     }
 
+    /**
+     * Set the user object and start the query.
+     */
+    public function setUserGroup(UserGroup $userGroup): GroupCollectorInterface
+    {
+        if (null === $this->userGroup) {
+            $this->userGroup = $userGroup;
+            $this->startQueryForGroup();
+        }
+
+        return $this;
+    }
+
     /**
      * Build the query.
      */
@@ -1087,4 +1112,22 @@ class GroupCollector implements GroupCollectorInterface
             ->orderBy('source.amount', 'DESC')
         ;
     }
+
+    /**
+     * Automatically include all stuff required to make API calls work.
+     */
+    public function withAPIInformation(): GroupCollectorInterface
+    {
+        // include source + destination account name and type.
+        $this->withAccountInformation()
+            // include category ID + name (if any)
+            ->withCategoryInformation()
+            // include budget ID + name (if any)
+            ->withBudgetInformation()
+            // include bill ID + name (if any)
+            ->withBillInformation()
+        ;
+
+        return $this;
+    }
 }

app/Helpers/Collector/GroupCollectorInterface.php

@@ -401,6 +401,11 @@ interface GroupCollectorInterface
      */
     public function setAfter(Carbon $date): self;
 
+    /**
+     * Limit results to a SPECIFIC set of tags.
+     */
+    public function setAllTags(Collection $tags): self;
+
     /**
      * Collect transactions before a specific date.
      */
@@ -461,6 +466,11 @@ interface GroupCollectorInterface
      */
     public function setEnd(Carbon $end): self;
 
+    /**
+     * Set the page to get.
+     */
+    public function setEndRow(int $endRow): self;
+
     public function setExpandGroupSearch(bool $expandGroupSearch): self;
 
     /**
@@ -526,16 +536,6 @@ interface GroupCollectorInterface
      */
     public function setPage(int $page): self;
 
-    /**
-     * Set the page to get.
-     */
-    public function setStartRow(int $startRow): self;
-
-    /**
-     * Set the page to get.
-     */
-    public function setEndRow(int $endRow): self;
-
     /**
      * Set the start and end time of the results to return.
      */
@@ -553,6 +553,8 @@ interface GroupCollectorInterface
 
     public function setSepaCT(string $sepaCT): self;
 
+    public function setSorting(array $instructions): self;
+
     /**
      * Set source accounts.
      */
@@ -563,6 +565,11 @@ interface GroupCollectorInterface
      */
     public function setStart(Carbon $start): self;
 
+    /**
+     * Set the page to get.
+     */
+    public function setStartRow(int $startRow): self;
+
     /**
      * Limit results to a specific tag.
      */
@@ -573,11 +580,6 @@ interface GroupCollectorInterface
      */
     public function setTags(Collection $tags): self;
 
-    /**
-     * Limit results to a SPECIFIC set of tags.
-     */
-    public function setAllTags(Collection $tags): self;
-
     /**
      * Limit the search to one specific transaction group.
      */
@@ -613,6 +615,11 @@ interface GroupCollectorInterface
      */
     public function setXorAccounts(Collection $accounts): self;
 
+    /**
+     * Sort the collection on a column.
+     */
+    public function sortCollection(Collection $collection): Collection;
+
     /**
      * Automatically include all stuff required to make API calls work.
      */

app/Helpers/Report/NetWorth.php

@@ -51,7 +51,7 @@ class NetWorth implements NetWorthInterface
 
     private CurrencyRepositoryInterface $currencyRepos;
     private User                        $user;
-    private null|UserGroup            $userGroup;
+    private ?UserGroup                  $userGroup;
 
     /**
      * This method collects the user's net worth in ALL the user's currencies
@@ -144,6 +144,15 @@ class NetWorth implements NetWorthInterface
         return $netWorth;
     }
 
+    private function getRepository(): AccountRepositoryInterface|AdminAccountRepositoryInterface
+    {
+        if (null === $this->userGroup) {
+            return $this->accountRepository;
+        }
+
+        return $this->adminAccountRepository;
+    }
+
     public function setUser(null|Authenticatable|User $user): void
     {
         if (!$user instanceof User) {
@@ -202,15 +211,6 @@ class NetWorth implements NetWorthInterface
         return $return;
     }
 
-    private function getRepository(): AccountRepositoryInterface|AdminAccountRepositoryInterface
-    {
-        if (null === $this->userGroup) {
-            return $this->accountRepository;
-        }
-
-        return $this->adminAccountRepository;
-    }
-
     private function getAccounts(): Collection
     {
         $accounts = $this->getRepository()->getAccountsByType(

app/Http/Controllers/Account/ReconcileController.php

@@ -75,7 +75,7 @@ class ReconcileController extends Controller
      *
      * @throws FireflyException
      *                                              */
-    public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
+    public function reconcile(Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
         if (!$this->isEditableAccount($account)) {
             return $this->redirectAccountToAccount($account);

app/Http/Controllers/Account/ShowController.php

@@ -75,7 +75,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      *                                              */
-    public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
         $objectType       = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
 

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -95,6 +95,21 @@ class ForgotPasswordController extends Controller
         return back()->with('status', trans($response));
     }
 
+    /**
+     * @throws FireflyException
+     */
+    private function validateHost(): void
+    {
+        $configuredHost = parse_url((string)config('app.url'), PHP_URL_HOST);
+        if (false === $configuredHost || null === $configuredHost) {
+            throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.');
+        }
+        $host           = request()->host();
+        if ($configuredHost !== $host) {
+            throw new FireflyException('The Host-header does not match the host in the APP_URL environment variable. Please make sure these match. See also: https://bit.ly/FF3-host-header');
+        }
+    }
+
     /**
      * Show form for email recovery.
      *
@@ -121,19 +136,4 @@ class ForgotPasswordController extends Controller
 
         return view('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
     }
-
-    /**
-     * @throws FireflyException
-     */
-    private function validateHost(): void
-    {
-        $configuredHost = parse_url((string)config('app.url'), PHP_URL_HOST);
-        if (false === $configuredHost || null === $configuredHost) {
-            throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.');
-        }
-        $host           = request()->host();
-        if ($configuredHost !== $host) {
-            throw new FireflyException('The Host-header does not match the host in the APP_URL environment variable. Please make sure these match. See also: https://bit.ly/FF3-host-header');
-        }
-    }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -80,7 +80,18 @@ class LoginController extends Controller
         Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get($this->username())));
         app('log')->debug('User is trying to login.');
 
+        try {
             $this->validateLogin($request);
+        } catch (ValidationException $e) {
+            return redirect(route('login'))
+                ->withErrors(
+                    [
+                        $this->username => trans('auth.failed'),
+                    ]
+                )
+                ->onlyInput($this->username)
+            ;
+        }
         app('log')->debug('Login data is present.');
 
         // Copied directly from AuthenticatesUsers, but with logging added:
@@ -91,7 +102,6 @@ class LoginController extends Controller
             Log::channel('audit')->warning(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));
             app('log')->error(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));
             $this->fireLockoutEvent($request);
-
             $this->sendLockoutResponse($request);
         }
         // Copied directly from AuthenticatesUsers, but with logging added:
@@ -132,6 +142,25 @@ class LoginController extends Controller
         return $this->username;
     }
 
+    /**
+     * Get the failed login response instance.
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
+     * @throws ValidationException
+     */
+    protected function sendFailedLoginResponse(Request $request): void
+    {
+        $exception             = ValidationException::withMessages(
+            [
+                $this->username() => [trans('auth.failed')],
+            ]
+        );
+        $exception->redirectTo = route('login');
+
+        throw $exception;
+    }
+
     /**
      * Log the user out of the application.
      *
@@ -210,23 +239,4 @@ class LoginController extends Controller
 
         return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title', 'usernameField'));
     }
-
-    /**
-     * Get the failed login response instance.
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
-     * @throws ValidationException
-     */
-    protected function sendFailedLoginResponse(Request $request): void
-    {
-        $exception             = ValidationException::withMessages(
-            [
-                $this->username() => [trans('auth.failed')],
-            ]
-        );
-        $exception->redirectTo = route('login');
-
-        throw $exception;
-    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -109,6 +109,31 @@ class RegisterController extends Controller
         return redirect($this->redirectPath());
     }
 
+    /**
+     * @throws FireflyException
+     */
+    protected function allowedToRegister(): bool
+    {
+        // is allowed to register?
+        $allowRegistration = true;
+
+        try {
+            $singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {
+            $singleUserMode = true;
+        }
+        $userCount         = User::count();
+        $guard             = config('auth.defaults.guard');
+        if (true === $singleUserMode && $userCount > 0 && 'web' === $guard) {
+            $allowRegistration = false;
+        }
+        if ('web' !== $guard) {
+            $allowRegistration = false;
+        }
+
+        return $allowRegistration;
+    }
+
     /**
      * Show the application registration form if the invitation code is valid.
      *
@@ -164,29 +189,4 @@ class RegisterController extends Controller
 
         return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
     }
-
-    /**
-     * @throws FireflyException
-     */
-    protected function allowedToRegister(): bool
-    {
-        // is allowed to register?
-        $allowRegistration = true;
-
-        try {
-            $singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
-        } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {
-            $singleUserMode = true;
-        }
-        $userCount         = User::count();
-        $guard             = config('auth.defaults.guard');
-        if (true === $singleUserMode && $userCount > 0 && 'web' === $guard) {
-            $allowRegistration = false;
-        }
-        if ('web' !== $guard) {
-            $allowRegistration = false;
-        }
-
-        return $allowRegistration;
-    }
 }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -31,7 +31,6 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use PragmaRX\Google2FALaravel\Support\Authenticator;
-use Preferences;
 
 /**
  * Class TwoFactorController.

app/Http/Controllers/Bill/IndexController.php

@@ -134,24 +134,6 @@ class IndexController extends Controller
         return view('bills.index', compact('bills', 'sums', 'total', 'totals', 'today'));
     }
 
-    /**
-     * Set the order of a bill.
-     */
-    public function setOrder(Request $request, Bill $bill): JsonResponse
-    {
-        $objectGroupTitle = (string)$request->get('objectGroupTitle');
-        $newOrder         = (int)$request->get('order');
-        $this->repository->setOrder($bill, $newOrder);
-        if ('' !== $objectGroupTitle) {
-            $this->repository->setObjectGroup($bill, $objectGroupTitle);
-        }
-        if ('' === $objectGroupTitle) {
-            $this->repository->removeObjectGroup($bill);
-        }
-
-        return response()->json(['data' => 'OK']);
-    }
-
     /**
      * @throws FireflyException
      */
@@ -268,4 +250,22 @@ class IndexController extends Controller
 
         return $totals;
     }
+
+    /**
+     * Set the order of a bill.
+     */
+    public function setOrder(Request $request, Bill $bill): JsonResponse
+    {
+        $objectGroupTitle = (string)$request->get('objectGroupTitle');
+        $newOrder         = (int)$request->get('order');
+        $this->repository->setOrder($bill, $newOrder);
+        if ('' !== $objectGroupTitle) {
+            $this->repository->setObjectGroup($bill, $objectGroupTitle);
+        }
+        if ('' === $objectGroupTitle) {
+            $this->repository->removeObjectGroup($bill);
+        }
+
+        return response()->json(['data' => 'OK']);
+    }
 }

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -235,12 +235,12 @@ class BudgetLimitController extends Controller
             new Collection([$budgetLimit->budget]),
             $budgetLimit->transactionCurrency
         );
+        $daysLeft                        = $this->activeDaysLeft($limit->start_date, $limit->end_date);
         $array['spent']                  = $spentArr[$budgetLimit->transactionCurrency->id]['sum'] ?? '0';
         $array['left_formatted']         = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], $array['amount']));
         $array['amount_formatted']       = app('amount')->formatAnything($limit->transactionCurrency, $limit['amount']);
-        $array['days_left']              = (string)$this->activeDaysLeft($limit->start_date, $limit->end_date);
-        // left per day:
-        $array['left_per_day']           = bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
+        $array['days_left']              = (string)$daysLeft;
+        $array['left_per_day']           = 0 === $daysLeft ? bcadd($array['spent'], $array['amount']) : bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
 
         // left per day formatted.
         $array['amount']                 = app('steam')->bcround($limit['amount'], $limit->transactionCurrency->decimal_places);

app/Http/Controllers/Budget/IndexController.php

@@ -85,7 +85,7 @@ class IndexController extends Controller
      *
      * @throws FireflyException
      *                                              */
-    public function index(Carbon $start = null, Carbon $end = null)
+    public function index(?Carbon $start = null, ?Carbon $end = null)
     {
         $this->abRepository->cleanup();
         app('log')->debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d')));
@@ -116,7 +116,6 @@ class IndexController extends Controller
 
         // get all available budgets:
         $availableBudgets = $this->getAllAvailableBudgets($start, $end);
-
         // get all active budgets:
         $budgets          = $this->getAllBudgets($start, $end, $currencies, $defaultCurrency);
         $sums             = $this->getSums($budgets);
@@ -159,24 +158,6 @@ class IndexController extends Controller
         );
     }
 
-    public function reorder(Request $request, BudgetRepositoryInterface $repository): JsonResponse
-    {
-        $this->abRepository->cleanup();
-        $budgetIds = $request->get('budgetIds');
-
-        foreach ($budgetIds as $index => $budgetId) {
-            $budgetId = (int)$budgetId;
-            $budget   = $repository->find($budgetId);
-            if (null !== $budget) {
-                app('log')->debug(sprintf('Set budget #%d ("%s") to position %d', $budget->id, $budget->name, $index + 1));
-                $repository->setBudgetOrder($budget, $index + 1);
-            }
-        }
-        app('preferences')->mark();
-
-        return response()->json(['OK']);
-    }
-
     private function getAllAvailableBudgets(Carbon $start, Carbon $end): array
     {
         // get all available budgets.
@@ -316,4 +297,22 @@ class IndexController extends Controller
 
         return $sums;
     }
+
+    public function reorder(Request $request, BudgetRepositoryInterface $repository): JsonResponse
+    {
+        $this->abRepository->cleanup();
+        $budgetIds = $request->get('budgetIds');
+
+        foreach ($budgetIds as $index => $budgetId) {
+            $budgetId = (int)$budgetId;
+            $budget   = $repository->find($budgetId);
+            if (null !== $budget) {
+                app('log')->debug(sprintf('Set budget #%d ("%s") to position %d', $budget->id, $budget->name, $index + 1));
+                $repository->setBudgetOrder($budget, $index + 1);
+            }
+        }
+        app('preferences')->mark();
+
+        return response()->json(['OK']);
+    }
 }

app/Http/Controllers/Budget/ShowController.php

@@ -75,7 +75,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      */
-    public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)
+    public function noBudget(Request $request, ?Carbon $start = null, ?Carbon $end = null)
     {
         // @var Carbon $start
         $start ??= session('start');

app/Http/Controllers/Category/NoCategoryController.php

@@ -70,7 +70,7 @@ class NoCategoryController extends Controller
      *
      * @throws FireflyException
      */
-    public function show(Request $request, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, ?Carbon $start = null, ?Carbon $end = null)
     {
         app('log')->debug('Start of noCategory()');
         // @var Carbon $start

app/Http/Controllers/Category/ShowController.php

@@ -71,7 +71,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      */
-    public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Category $category, ?Carbon $start = null, ?Carbon $end = null)
     {
         // @var Carbon $start
         $start ??= session('start', today(config('app.timezone'))->startOfMonth());

app/Http/Controllers/Chart/AccountController.php

@@ -409,6 +409,58 @@ class AccountController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * @throws FireflyException
+     */
+    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
+    {
+        app('log')->debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
+        $locale            = app('steam')->getLocale();
+        $step              = $this->calculateStep($start, $end);
+        $result            = [
+            'label'           => sprintf('%s (%s)', $account->name, $currency->symbol),
+            'currency_symbol' => $currency->symbol,
+            'currency_code'   => $currency->code,
+        ];
+        $entries           = [];
+        $current           = clone $start;
+        app('log')->debug(sprintf('Step is %s', $step));
+
+        // fix for issue https://github.com/firefly-iii/firefly-iii/issues/8041
+        // have to make sure this chart is always based on the balance at the END of the period.
+        // This period depends on the size of the chart
+        $current           = app('navigation')->endOfX($current, $step, null);
+        app('log')->debug(sprintf('$current date is %s', $current->format('Y-m-d')));
+        if ('1D' === $step) {
+            // per day the entire period, balance for every day.
+            $format   = (string)trans('config.month_and_day_js', [], $locale);
+            $range    = app('steam')->balanceInRange($account, $start, $end, $currency);
+            $previous = array_values($range)[0];
+            while ($end >= $current) {
+                $theDate         = $current->format('Y-m-d');
+                $balance         = $range[$theDate] ?? $previous;
+                $label           = $current->isoFormat($format);
+                $entries[$label] = (float)$balance;
+                $previous        = $balance;
+                $current->addDay();
+            }
+        }
+        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
+            while ($end >= $current) {
+                app('log')->debug(sprintf('Current is: %s', $current->format('Y-m-d')));
+                $balance         = (float)app('steam')->balance($account, $current, $currency);
+                $label           = app('navigation')->periodShow($current, $step);
+                $entries[$label] = $balance;
+                $current         = app('navigation')->addPeriod($current, $step, 0);
+                // here too, to fix #8041, the data is corrected to the end of the period.
+                $current         = app('navigation')->endOfX($current, $step, null);
+            }
+        }
+        $result['entries'] = $entries;
+
+        return $result;
+    }
+
     /**
      * Shows the balances for a given set of dates and accounts.
      *
@@ -512,56 +564,4 @@ class AccountController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * @throws FireflyException
-     */
-    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
-    {
-        app('log')->debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
-        $locale            = app('steam')->getLocale();
-        $step              = $this->calculateStep($start, $end);
-        $result            = [
-            'label'           => sprintf('%s (%s)', $account->name, $currency->symbol),
-            'currency_symbol' => $currency->symbol,
-            'currency_code'   => $currency->code,
-        ];
-        $entries           = [];
-        $current           = clone $start;
-        app('log')->debug(sprintf('Step is %s', $step));
-
-        // fix for issue https://github.com/firefly-iii/firefly-iii/issues/8041
-        // have to make sure this chart is always based on the balance at the END of the period.
-        // This period depends on the size of the chart
-        $current           = app('navigation')->endOfX($current, $step, null);
-        app('log')->debug(sprintf('$current date is %s', $current->format('Y-m-d')));
-        if ('1D' === $step) {
-            // per day the entire period, balance for every day.
-            $format   = (string)trans('config.month_and_day_js', [], $locale);
-            $range    = app('steam')->balanceInRange($account, $start, $end, $currency);
-            $previous = array_values($range)[0];
-            while ($end >= $current) {
-                $theDate         = $current->format('Y-m-d');
-                $balance         = $range[$theDate] ?? $previous;
-                $label           = $current->isoFormat($format);
-                $entries[$label] = (float)$balance;
-                $previous        = $balance;
-                $current->addDay();
-            }
-        }
-        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
-            while ($end >= $current) {
-                app('log')->debug(sprintf('Current is: %s', $current->format('Y-m-d')));
-                $balance         = (float)app('steam')->balance($account, $current, $currency);
-                $label           = app('navigation')->periodShow($current, $step);
-                $entries[$label] = $balance;
-                $current         = app('navigation')->addPeriod($current, $step, 0);
-                // here too, to fix #8041, the data is corrected to the end of the period.
-                $current         = app('navigation')->endOfX($current, $step, null);
-            }
-        }
-        $result['entries'] = $entries;
-
-        return $result;
-    }
 }

app/Http/Controllers/Chart/BudgetReportController.php

@@ -195,6 +195,23 @@ class BudgetReportController extends Controller
         return response()->json($data);
     }
 
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     /**
      * Chart that groups expenses by the account.
      */
@@ -224,21 +241,4 @@ class BudgetReportController extends Controller
 
         return response()->json($data);
     }
-
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }

app/Http/Controllers/Chart/CategoryController.php

@@ -94,6 +94,11 @@ class CategoryController extends Controller
         return response()->json($data);
     }
 
+    private function getDate(): Carbon
+    {
+        return today(config('app.timezone'));
+    }
+
     /**
      * Shows the category chart on the front page.
      * TODO test method for category refactor.
@@ -141,66 +146,6 @@ class CategoryController extends Controller
         return response()->json($data);
     }
 
-    /**
-     * Chart for period for transactions without a category.
-     * TODO test me.
-     */
-    public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
-    {
-        $cache = new CacheProperties();
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('chart.category.period.no-cat');
-        $cache->addProperty($accounts->pluck('id')->toArray());
-        if ($cache->has()) {
-            return response()->json($cache->get());
-        }
-        $data  = $this->reportPeriodChart($accounts, $start, $end, null);
-
-        $cache->store($data);
-
-        return response()->json($data);
-    }
-
-    /**
-     * Chart for a specific period.
-     * TODO test me, for category refactor.
-     *
-     * @throws FireflyException
-     */
-    public function specificPeriod(Category $category, Carbon $date): JsonResponse
-    {
-        $range          = app('navigation')->getViewRange(false);
-        $start          = app('navigation')->startOfPeriod($date, $range);
-        $end            = session()->get('end');
-        if ($end < $start) {
-            [$end, $start] = [$start, $end];
-        }
-
-        $cache          = new CacheProperties();
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($category->id);
-        $cache->addProperty('chart.category.period-chart');
-        if ($cache->has()) {
-            return response()->json($cache->get());
-        }
-
-        /** @var WholePeriodChartGenerator $chartGenerator */
-        $chartGenerator = app(WholePeriodChartGenerator::class);
-        $chartData      = $chartGenerator->generate($category, $start, $end);
-        $data           = $this->generator->multiSet($chartData);
-
-        $cache->store($data);
-
-        return response()->json($data);
-    }
-
-    private function getDate(): Carbon
-    {
-        return today(config('app.timezone'));
-    }
-
     /**
      * Generate report chart for either with or without category.
      */
@@ -279,4 +224,59 @@ class CategoryController extends Controller
 
         return $this->generator->multiSet($chartData);
     }
+
+    /**
+     * Chart for period for transactions without a category.
+     * TODO test me.
+     */
+    public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
+    {
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('chart.category.period.no-cat');
+        $cache->addProperty($accounts->pluck('id')->toArray());
+        if ($cache->has()) {
+            return response()->json($cache->get());
+        }
+        $data  = $this->reportPeriodChart($accounts, $start, $end, null);
+
+        $cache->store($data);
+
+        return response()->json($data);
+    }
+
+    /**
+     * Chart for a specific period.
+     * TODO test me, for category refactor.
+     *
+     * @throws FireflyException
+     */
+    public function specificPeriod(Category $category, Carbon $date): JsonResponse
+    {
+        $range          = app('navigation')->getViewRange(false);
+        $start          = app('navigation')->startOfPeriod($date, $range);
+        $end            = session()->get('end');
+        if ($end < $start) {
+            [$end, $start] = [$start, $end];
+        }
+
+        $cache          = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($category->id);
+        $cache->addProperty('chart.category.period-chart');
+        if ($cache->has()) {
+            return response()->json($cache->get());
+        }
+
+        /** @var WholePeriodChartGenerator $chartGenerator */
+        $chartGenerator = app(WholePeriodChartGenerator::class);
+        $chartData      = $chartGenerator->generate($category, $start, $end);
+        $data           = $this->generator->multiSet($chartData);
+
+        $cache->store($data);
+
+        return response()->json($data);
+    }
 }

app/Http/Controllers/Chart/CategoryReportController.php

@@ -269,6 +269,26 @@ class CategoryReportController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * TODO duplicate function
+     */
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     public function sourceExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): JsonResponse
     {
         $result = [];
@@ -324,24 +344,4 @@ class CategoryReportController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * TODO duplicate function
-     */
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }

app/Http/Controllers/Chart/DoubleReportController.php

@@ -212,6 +212,44 @@ class DoubleReportController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * TODO duplicate function
+     */
+    private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
+    {
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            if ($account->name === $name && $account->id !== $id) {
+                return $account->name;
+            }
+            if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
+                return $account->iban;
+            }
+        }
+
+        return $name;
+    }
+
+    /**
+     * TODO duplicate function
+     */
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     public function tagExpense(Collection $accounts, Collection $others, Carbon $start, Carbon $end): JsonResponse
     {
         $result           = [];
@@ -317,42 +355,4 @@ class DoubleReportController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * TODO duplicate function
-     */
-    private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
-    {
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            if ($account->name === $name && $account->id !== $id) {
-                return $account->name;
-            }
-            if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
-                return $account->iban;
-            }
-        }
-
-        return $name;
-    }
-
-    /**
-     * TODO duplicate function
-     */
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }

app/Http/Controllers/Chart/ReportController.php

@@ -143,7 +143,7 @@ class ReportController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
-            return response()->json($cache->get());
+            // return response()->json($cache->get());
         }
 
         app('log')->debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
@@ -222,8 +222,11 @@ class ReportController extends Controller
             while ($currentStart <= $currentEnd) {
                 $key          = $currentStart->format($format);
                 $title        = $currentStart->isoFormat($titleFormat);
+                // #8663 make sure the period exists in the data previously collected.
+                if (array_key_exists($key, $currency)) {
                     $income['entries'][$title]  = app('steam')->bcround($currency[$key]['earned'] ?? '0', $currency['currency_decimal_places']);
                     $expense['entries'][$title] = app('steam')->bcround($currency[$key]['spent'] ?? '0', $currency['currency_decimal_places']);
+                }
                 $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange, 0);
             }
 

app/Http/Controllers/Chart/TagReportController.php

@@ -274,6 +274,26 @@ class TagReportController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * TODO duplicate function
+     */
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     public function sourceExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse
     {
         $result = [];
@@ -381,24 +401,4 @@ class TagReportController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * TODO duplicate function
-     */
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }

app/Http/Controllers/Controller.php

@@ -69,6 +69,11 @@ abstract class Controller extends BaseController
         $authGuard        = config('firefly.authentication_guard');
         $logoutUrl        = config('firefly.custom_logout_url');
 
+        // overrule v2 layout back to v1.
+        if ('true' === request()->get('force_default_layout') && 'v2' === config('firefly.layout')) {
+            app('view')->getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
+        }
+
         app('view')->share('authGuard', $authGuard);
         app('view')->share('logoutUrl', $logoutUrl);
 

app/Http/Controllers/DebugController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
+use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Models\AccountType;
@@ -140,21 +141,6 @@ class DebugController extends Controller
         return view('debug', compact('table', 'now', 'logContent'));
     }
 
-    /**
-     * Flash all types of messages.
-     *
-     * @return Redirector|RedirectResponse
-     */
-    public function testFlash(Request $request)
-    {
-        $request->session()->flash('success', 'This is a success message.');
-        $request->session()->flash('info', 'This is an info message.');
-        $request->session()->flash('warning', 'This is a warning.');
-        $request->session()->flash('error', 'This is an error!');
-
-        return redirect(route('home'));
-    }
-
     private function generateTable(): string
     {
         // system information:
@@ -202,6 +188,7 @@ class DebugController extends Controller
         try {
             if (file_exists('/var/www/counter-main.txt')) {
                 $return['build'] = trim((string)file_get_contents('/var/www/counter-main.txt'));
+                app('log')->debug(sprintf('build is now "%s"', $return['build']));
             }
         } catch (\Exception $e) { // @phpstan-ignore-line
             app('log')->debug('Could not check build counter, but thats ok.');
@@ -336,4 +323,19 @@ class DebugController extends Controller
 
         return implode(' ', $flags);
     }
+
+    /**
+     * Flash all types of messages.
+     *
+     * @return Redirector|RedirectResponse
+     */
+    public function testFlash(Request $request)
+    {
+        $request->session()->flash('success', 'This is a success message.');
+        $request->session()->flash('info', 'This is an info message.');
+        $request->session()->flash('warning', 'This is a warning.');
+        $request->session()->flash('error', 'This is an error!');
+
+        return redirect(route('home'));
+    }
 }

app/Http/Controllers/HomeController.php

@@ -89,7 +89,7 @@ class HomeController extends Controller
         $label         = $request->get('label');
         $isCustomRange = false;
 
-        app('log')->debug('Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
+        app('log')->debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
         // check if the label is "everything" or "Custom range" which will betray
         // a possible problem with the budgets.
         if ($label === (string)trans('firefly.everything') || $label === (string)trans('firefly.customRange')) {
@@ -97,10 +97,10 @@ class HomeController extends Controller
             app('log')->debug('Range is now marked as "custom".');
         }
 
-        $diff          = $start->diffInDays($end) + 1;
+        $diff          = $start->diffInDays($end, true) + 1;
 
-        if ($diff > 50) {
-            $request->session()->flash('warning', (string)trans('firefly.warning_much_data', ['days' => $diff]));
+        if ($diff > 366) {
+            $request->session()->flash('warning', (string)trans('firefly.warning_much_data', ['days' => (int)$diff]));
         }
 
         $request->session()->put('is_custom_range', $isCustomRange);

app/Http/Controllers/Json/BoxController.php

@@ -113,7 +113,7 @@ class BoxController extends Controller
         $spentAmount       = $spent[$currency->id]['sum'] ?? '0';
         app('log')->debug(sprintf('Spent for default currency for all budgets in this period: %s', $spentAmount));
 
-        $days              = $today->between($start, $end) ? $today->diffInDays($start) + 1 : $end->diffInDays($start) + 1;
+        $days              = (int)($today->between($start, $end) ? $today->diffInDays($start, true) + 1 : $end->diffInDays($start, true) + 1);
         app('log')->debug(sprintf('Number of days left: %d', $days));
         $spentPerDay       = bcdiv($spentAmount, (string)$days);
         app('log')->debug(sprintf('Available to spend per day: %s', $spentPerDay));
@@ -130,7 +130,7 @@ class BoxController extends Controller
                 $boxTitle         = (string)trans('firefly.left_to_spend');
                 $activeDaysLeft   = $this->activeDaysLeft($start, $end);   // see method description.
                 $display          = 1;                                     // not overspent
-                $leftPerDayAmount = bcdiv($leftToSpendAmount, (string)$activeDaysLeft);
+                $leftPerDayAmount = 0 === (int) $activeDaysLeft ? $leftToSpendAmount : bcdiv($leftToSpendAmount, (string)$activeDaysLeft);
                 app('log')->debug(sprintf('Left to spend per day is %s', $leftPerDayAmount));
             }
         }

app/Http/Controllers/Json/IntroController.php

@@ -38,7 +38,7 @@ class IntroController extends Controller
     /**
      * Returns the introduction wizard for a page.
      */
-    public function getIntroSteps(string $route, string $specificPage = null): JsonResponse
+    public function getIntroSteps(string $route, ?string $specificPage = null): JsonResponse
     {
         app('log')->debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
         $specificPage ??= '';
@@ -91,7 +91,7 @@ class IntroController extends Controller
      *
      * @throws FireflyException
      */
-    public function postEnable(string $route, string $specialPage = null): JsonResponse
+    public function postEnable(string $route, ?string $specialPage = null): JsonResponse
     {
         $specialPage ??= '';
         $route = str_replace('.', '_', $route);
@@ -111,7 +111,7 @@ class IntroController extends Controller
      *
      * @throws FireflyException
      */
-    public function postFinished(string $route, string $specialPage = null): JsonResponse
+    public function postFinished(string $route, ?string $specialPage = null): JsonResponse
     {
         $specialPage ??= '';
         $key = 'shown_demo_'.$route;

app/Http/Controllers/Json/ReconcileController.php

@@ -34,6 +34,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class ReconcileController
@@ -66,14 +67,13 @@ class ReconcileController extends Controller
      *
      * @throws FireflyException
      */
-    public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
+    public function overview(Request $request, ?Account $account = null, ?Carbon $start = null, ?Carbon $end = null): JsonResponse
     {
         $startBalance    = $request->get('startBalance');
         $endBalance      = $request->get('endBalance');
         $accountCurrency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
         $amount          = '0';
         $clearedAmount   = '0';
-        $route           = '';
 
         if (null === $start && null === $end) {
             throw new FireflyException('Invalid dates submitted.');
@@ -103,14 +103,11 @@ class ReconcileController extends Controller
             $clearedJournals = $collector->getExtractedJournals();
         }
 
-        app('log')->debug('Start transaction loop');
-
         /** @var array $journal */
         foreach ($journals as $journal) {
             $amount = $this->processJournal($account, $accountCurrency, $journal, $amount);
         }
         app('log')->debug(sprintf('Final amount is %s', $amount));
-        app('log')->debug('End transaction loop');
 
         /** @var array $journal */
         foreach ($clearedJournals as $journal) {
@@ -118,31 +115,17 @@ class ReconcileController extends Controller
                 $clearedAmount = $this->processJournal($account, $accountCurrency, $journal, $clearedAmount);
             }
         }
+        Log::debug(sprintf('Start balance: "%s"', $startBalance));
+        Log::debug(sprintf('End balance: "%s"', $endBalance));
+        Log::debug(sprintf('Cleared amount: "%s"', $clearedAmount));
+        Log::debug(sprintf('Amount: "%s"', $amount));
         $difference      = bcadd(bcadd(bcsub($startBalance, $endBalance), $clearedAmount), $amount);
         $diffCompare     = bccomp($difference, '0');
         $countCleared    = count($clearedJournals);
-
         $reconSum        = bcadd(bcadd($startBalance, $amount), $clearedAmount);
 
         try {
-            $view = view(
-                'accounts.reconcile.overview',
-                compact(
-                    'account',
-                    'start',
-                    'diffCompare',
-                    'difference',
-                    'end',
-                    'clearedAmount',
-                    'startBalance',
-                    'endBalance',
-                    'amount',
-                    'route',
-                    'countCleared',
-                    'reconSum',
-                    'selectedIds'
-                )
-            )->render();
+            $view = view('accounts.reconcile.overview', compact('account', 'start', 'diffCompare', 'difference', 'end', 'clearedAmount', 'startBalance', 'endBalance', 'amount', 'route', 'countCleared', 'reconSum', 'selectedIds'))->render();
         } catch (\Throwable $e) {
             app('log')->debug(sprintf('View error: %s', $e->getMessage()));
             app('log')->error($e->getTraceAsString());
@@ -151,14 +134,42 @@ class ReconcileController extends Controller
             throw new FireflyException($view, 0, $e);
         }
 
-        $return          = [
-            'post_url' => $route,
-            'html'     => $view,
-        ];
+        $return          = ['post_url' => $route, 'html' => $view];
 
         return response()->json($return);
     }
 
+    private function processJournal(Account $account, TransactionCurrency $currency, array $journal, string $amount): string
+    {
+        $toAdd  = '0';
+        app('log')->debug(sprintf('User submitted %s #%d: "%s"', $journal['transaction_type_type'], $journal['transaction_journal_id'], $journal['description']));
+
+        // not much magic below we need to cover using tests.
+
+        if ($account->id === $journal['source_account_id']) {
+            if ($currency->id === $journal['currency_id']) {
+                $toAdd = $journal['amount'];
+            }
+            if (null !== $journal['foreign_currency_id'] && $journal['foreign_currency_id'] === $currency->id) {
+                $toAdd = $journal['foreign_amount'];
+            }
+        }
+        if ($account->id === $journal['destination_account_id']) {
+            if ($currency->id === $journal['currency_id']) {
+                $toAdd = bcmul($journal['amount'], '-1');
+            }
+            if (null !== $journal['foreign_currency_id'] && $journal['foreign_currency_id'] === $currency->id) {
+                $toAdd = bcmul($journal['foreign_amount'], '-1');
+            }
+        }
+
+        app('log')->debug(sprintf('Going to add %s to %s', $toAdd, $amount));
+        $amount = bcadd($amount, $toAdd);
+        app('log')->debug(sprintf('Result is %s', $amount));
+
+        return $amount;
+    }
+
     /**
      * Returns a list of transactions in a modal.
      *
@@ -166,7 +177,7 @@ class ReconcileController extends Controller
      *
      * @throws FireflyException
      */
-    public function transactions(Account $account, Carbon $start = null, Carbon $end = null)
+    public function transactions(Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
         if (null === $start || null === $end) {
             throw new FireflyException('Invalid dates submitted.');
@@ -176,6 +187,7 @@ class ReconcileController extends Controller
         }
         $startDate      = clone $start;
         $startDate->subDay();
+        $end->endOfDay();
 
         $currency       = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
         $startBalance   = app('steam')->bcround(app('steam')->balance($account, $startDate), $currency->decimal_places);
@@ -214,37 +226,6 @@ class ReconcileController extends Controller
         return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
     }
 
-    private function processJournal(Account $account, TransactionCurrency $currency, array $journal, string $amount): string
-    {
-        $toAdd  = '0';
-        app('log')->debug(sprintf('User submitted %s #%d: "%s"', $journal['transaction_type_type'], $journal['transaction_journal_id'], $journal['description']));
-
-        // not much magic below we need to cover using tests.
-
-        if ($account->id === $journal['source_account_id']) {
-            if ($currency->id === $journal['currency_id']) {
-                $toAdd = $journal['amount'];
-            }
-            if (null !== $journal['foreign_currency_id'] && $journal['foreign_currency_id'] === $currency->id) {
-                $toAdd = $journal['foreign_amount'];
-            }
-        }
-        if ($account->id === $journal['destination_account_id']) {
-            if ($currency->id === $journal['currency_id']) {
-                $toAdd = bcmul($journal['amount'], '-1');
-            }
-            if (null !== $journal['foreign_currency_id'] && $journal['foreign_currency_id'] === $currency->id) {
-                $toAdd = bcmul($journal['foreign_amount'], '-1');
-            }
-        }
-
-        app('log')->debug(sprintf('Going to add %s to %s', $toAdd, $amount));
-        $amount = bcadd($amount, $toAdd);
-        app('log')->debug(sprintf('Result is %s', $amount));
-
-        return $amount;
-    }
-
     /**
      * "fix" amounts to make it easier on the reconciliation overview:
      */

app/Http/Controllers/PiggyBank/IndexController.php

@@ -141,24 +141,6 @@ class IndexController extends Controller
         return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
     }
 
-    /**
-     * Set the order of a piggy bank.
-     */
-    public function setOrder(Request $request, PiggyBank $piggyBank): JsonResponse
-    {
-        $objectGroupTitle = (string)$request->get('objectGroupTitle');
-        $newOrder         = (int)$request->get('order');
-        $this->piggyRepos->setOrder($piggyBank, $newOrder);
-        if ('' !== $objectGroupTitle) {
-            $this->piggyRepos->setObjectGroup($piggyBank, $objectGroupTitle);
-        }
-        if ('' === $objectGroupTitle) {
-            $this->piggyRepos->removeObjectGroup($piggyBank);
-        }
-
-        return response()->json(['data' => 'OK']);
-    }
-
     private function makeSums(array $piggyBanks): array
     {
         $sums = [];
@@ -193,4 +175,22 @@ class IndexController extends Controller
 
         return $piggyBanks;
     }
+
+    /**
+     * Set the order of a piggy bank.
+     */
+    public function setOrder(Request $request, PiggyBank $piggyBank): JsonResponse
+    {
+        $objectGroupTitle = (string)$request->get('objectGroupTitle');
+        $newOrder         = (int)$request->get('order');
+        $this->piggyRepos->setOrder($piggyBank, $newOrder);
+        if ('' !== $objectGroupTitle) {
+            $this->piggyRepos->setObjectGroup($piggyBank, $objectGroupTitle);
+        }
+        if ('' === $objectGroupTitle) {
+            $this->piggyRepos->removeObjectGroup($piggyBank);
+        }
+
+        return response()->json(['data' => 'OK']);
+    }
 }

app/Http/Controllers/ProfileController.php

@@ -497,6 +497,47 @@ class ProfileController extends Controller
         return redirect(route('profile.index'));
     }
 
+    /**
+     * TODO duplicate code.
+     *
+     * @throws FireflyException
+     */
+    private function addToMFAHistory(string $mfaCode): void
+    {
+        /** @var array $mfaHistory */
+        $mfaHistory   = app('preferences')->get('mfa_history', [])->data;
+        $entry        = [
+            'time' => time(),
+            'code' => $mfaCode,
+        ];
+        $mfaHistory[] = $entry;
+
+        app('preferences')->set('mfa_history', $mfaHistory);
+        $this->filterMFAHistory();
+    }
+
+    /**
+     * Remove old entries from the preferences array.
+     */
+    private function filterMFAHistory(): void
+    {
+        /** @var array $mfaHistory */
+        $mfaHistory = app('preferences')->get('mfa_history', [])->data;
+        $newHistory = [];
+        $now        = time();
+        foreach ($mfaHistory as $entry) {
+            $time = $entry['time'];
+            $code = $entry['code'];
+            if ($now - $time <= 300) {
+                $newHistory[] = [
+                    'time' => $time,
+                    'code' => $code,
+                ];
+            }
+        }
+        app('preferences')->set('mfa_history', $newHistory);
+    }
+
     /**
      * Submit delete account.
      *
@@ -631,45 +672,4 @@ class ProfileController extends Controller
 
         return redirect(route('login'));
     }
-
-    /**
-     * TODO duplicate code.
-     *
-     * @throws FireflyException
-     */
-    private function addToMFAHistory(string $mfaCode): void
-    {
-        /** @var array $mfaHistory */
-        $mfaHistory   = app('preferences')->get('mfa_history', [])->data;
-        $entry        = [
-            'time' => time(),
-            'code' => $mfaCode,
-        ];
-        $mfaHistory[] = $entry;
-
-        app('preferences')->set('mfa_history', $mfaHistory);
-        $this->filterMFAHistory();
-    }
-
-    /**
-     * Remove old entries from the preferences array.
-     */
-    private function filterMFAHistory(): void
-    {
-        /** @var array $mfaHistory */
-        $mfaHistory = app('preferences')->get('mfa_history', [])->data;
-        $newHistory = [];
-        $now        = time();
-        foreach ($mfaHistory as $entry) {
-            $time = $entry['time'];
-            $code = $entry['code'];
-            if ($now - $time <= 300) {
-                $newHistory[] = [
-                    'time' => $time,
-                    'code' => $code,
-                ];
-            }
-        }
-        app('preferences')->set('mfa_history', $newHistory);
-    }
 }

app/Http/Controllers/Report/DoubleController.php

@@ -278,6 +278,24 @@ class DoubleController extends Controller
         return view('reports.double.partials.accounts', compact('sums', 'report'));
     }
 
+    /**
+     * TODO this method is duplicated.
+     */
+    private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
+    {
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            if ($account->name === $name && $account->id !== $id) {
+                return $account->name;
+            }
+            if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
+                return $account->iban;
+            }
+        }
+
+        return $name;
+    }
+
     /**
      * @return Factory|View
      */
@@ -468,22 +486,4 @@ class DoubleController extends Controller
 
         return $result;
     }
-
-    /**
-     * TODO this method is duplicated.
-     */
-    private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
-    {
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            if ($account->name === $name && $account->id !== $id) {
-                return $account->name;
-            }
-            if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
-                return $account->iban;
-            }
-        }
-
-        return $name;
-    }
 }