Merge pull request #11830 from firefly-iii/release-1772260516

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2026-02-28
2026-06-28 19:08:44 -07:00 · 2026-02-28 07:35:25 +01:00 · 2026-02-28 07:35:16 +01:00 · 2026-02-28 07:29:44 +01:00 · 2026-02-28 07:20:22 +01:00 · 2026-02-28 07:17:53 +01:00
1227 changed files with 39632 additions and 37535 deletions
@@ -26,6 +26,7 @@ $paths = [
    $current . '/../../config',
    $current . '/../../routes',
    $current . '/../../tests',
+    $current . '/../../resources/lang/en_US',
 ];

 $finder = PhpCsFixer\Finder::create()
@@ -40,7 +41,9 @@ return $config->setRules(

    [
        // rule sets
-        '@PHP83Migration'               => true,
+        '@PHP8x3Migration'               => true,
+        '@PHP8x4Migration'               => true,
+        '@PHP8x5Migration'               => true,
        '@PhpCsFixer'                   => true,
        '@PhpCsFixer:risky'             => true,
        '@PSR12'                        => true,
@@ -1,5 +1,6 @@
 {
    "require": {
+        "php": ">=8.5.0",
        "friendsofphp/php-cs-fixer": "^3.12"
    }
 }
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "f1e0b38af4ded66da271a99d2bff5be8",
+    "content-hash": "35b5ad9b3c4e1ffe78ef9bec73987499",
    "packages": [
        {
            "name": "clue/ndjson-react",
@@ -402,16 +402,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.92.3",
+            "version": "v3.94.2",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8"
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
-                "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7787ceff91365ba7d623ec410b8f429cdebb4f63",
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63",
                "shasum": ""
            },
            "require": {
@@ -428,7 +428,7 @@
                "react/event-loop": "^1.5",
                "react/socket": "^1.16",
                "react/stream": "^1.4",
-                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0 || ^8.0",
                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0 || ^8.0",
                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
@@ -442,18 +442,18 @@
                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
            },
            "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.7",
-                "infection/infection": "^0.31.0",
-                "justinrainbow/json-schema": "^6.5",
-                "keradus/cli-executor": "^2.2",
+                "facile-it/paraunit": "^1.3.1 || ^2.7.1",
+                "infection/infection": "^0.32.3",
+                "justinrainbow/json-schema": "^6.6.4",
+                "keradus/cli-executor": "^2.3",
                "mikey179/vfsstream": "^1.6.12",
-                "php-coveralls/php-coveralls": "^2.9",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+                "php-coveralls/php-coveralls": "^2.9.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.7",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.7",
+                "phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.51",
                "symfony/polyfill-php85": "^1.33",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2 || ^8.0",
-                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2 || ^8.0"
+                "symfony/var-dumper": "^5.4.48 || ^6.4.32 || ^7.4.4 || ^8.0.4",
+                "symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.1"
            },
            "suggest": {
                "ext-dom": "For handling output formats in XML",
@@ -494,7 +494,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.3"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.94.2"
            },
            "funding": [
                {
@@ -502,7 +502,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-12-18T10:45:02+00:00"
+            "time": "2026-02-20T16:13:53+00:00"
        },
        {
            "name": "psr/container",
@@ -1185,29 +1185,29 @@
        },
        {
            "name": "sebastian/diff",
-            "version": "7.0.0",
+            "version": "8.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
+                "reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
-                "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
+                "reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.3"
+                "php": ">=8.4"
            },
            "require-dev": {
-                "phpunit/phpunit": "^12.0",
+                "phpunit/phpunit": "^13.0",
                "symfony/process": "^7.2"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "7.0-dev"
+                    "dev-main": "8.0-dev"
                }
            },
            "autoload": {
@@ -1240,28 +1240,40 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
                "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
+                "source": "https://github.com/sebastianbergmann/diff/tree/8.0.0"
            },
            "funding": [
                {
                    "url": "https://github.com/sebastianbergmann",
                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
+                    "type": "tidelift"
                }
            ],
-            "time": "2025-02-07T04:55:46+00:00"
+            "time": "2026-02-06T04:42:27+00:00"
        },
        {
            "name": "symfony/console",
-            "version": "v8.0.3",
+            "version": "v8.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "6145b304a5c1ea0bdbd0b04d297a5864f9a7d587"
+                "reference": "488285876e807a4777f074041d8bb508623419fa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6145b304a5c1ea0bdbd0b04d297a5864f9a7d587",
-                "reference": "6145b304a5c1ea0bdbd0b04d297a5864f9a7d587",
+                "url": "https://api.github.com/repos/symfony/console/zipball/488285876e807a4777f074041d8bb508623419fa",
+                "reference": "488285876e807a4777f074041d8bb508623419fa",
                "shasum": ""
            },
            "require": {
@@ -1318,7 +1330,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v8.0.3"
+                "source": "https://github.com/symfony/console/tree/v8.0.6"
            },
            "funding": [
                {
@@ -1338,7 +1350,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-23T14:52:06+00:00"
+            "time": "2026-02-25T16:59:43+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1409,16 +1421,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v8.0.0",
+            "version": "v8.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "573f95783a2ec6e38752979db139f09fec033f03"
+                "reference": "99301401da182b6cfaa4700dbe9987bb75474b47"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/573f95783a2ec6e38752979db139f09fec033f03",
-                "reference": "573f95783a2ec6e38752979db139f09fec033f03",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/99301401da182b6cfaa4700dbe9987bb75474b47",
+                "reference": "99301401da182b6cfaa4700dbe9987bb75474b47",
                "shasum": ""
            },
            "require": {
@@ -1470,7 +1482,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v8.0.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v8.0.4"
            },
            "funding": [
                {
@@ -1490,7 +1502,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-30T14:17:19+00:00"
+            "time": "2026-01-05T11:45:55+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -1570,16 +1582,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v8.0.1",
+            "version": "v8.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "d937d400b980523dc9ee946bb69972b5e619058d"
+                "reference": "7bf9162d7a0dff98d079b72948508fa48018a770"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d937d400b980523dc9ee946bb69972b5e619058d",
-                "reference": "d937d400b980523dc9ee946bb69972b5e619058d",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7bf9162d7a0dff98d079b72948508fa48018a770",
+                "reference": "7bf9162d7a0dff98d079b72948508fa48018a770",
                "shasum": ""
            },
            "require": {
@@ -1616,7 +1628,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v8.0.1"
+                "source": "https://github.com/symfony/filesystem/tree/v8.0.6"
            },
            "funding": [
                {
@@ -1636,20 +1648,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-01T09:13:36+00:00"
+            "time": "2026-02-25T16:59:43+00:00"
        },
        {
            "name": "symfony/finder",
-            "version": "v8.0.3",
+            "version": "v8.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "dd3a2953570a283a2ba4e17063bb98c734cf5b12"
+                "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/dd3a2953570a283a2ba4e17063bb98c734cf5b12",
-                "reference": "dd3a2953570a283a2ba4e17063bb98c734cf5b12",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/441404f09a54de6d1bd6ad219e088cdf4c91f97c",
+                "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c",
                "shasum": ""
            },
            "require": {
@@ -1684,7 +1696,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v8.0.3"
+                "source": "https://github.com/symfony/finder/tree/v8.0.6"
            },
            "funding": [
                {
@@ -1704,7 +1716,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-23T14:52:06+00:00"
+            "time": "2026-01-29T09:41:02+00:00"
        },
        {
            "name": "symfony/options-resolver",
@@ -2358,16 +2370,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v8.0.3",
+            "version": "v8.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "0cbbd88ec836f8757641c651bb995335846abb78"
+                "reference": "b5f3aa6762e33fd95efbaa2ec4f4bc9fdd16d674"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/0cbbd88ec836f8757641c651bb995335846abb78",
-                "reference": "0cbbd88ec836f8757641c651bb995335846abb78",
+                "url": "https://api.github.com/repos/symfony/process/zipball/b5f3aa6762e33fd95efbaa2ec4f4bc9fdd16d674",
+                "reference": "b5f3aa6762e33fd95efbaa2ec4f4bc9fdd16d674",
                "shasum": ""
            },
            "require": {
@@ -2399,7 +2411,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v8.0.3"
+                "source": "https://github.com/symfony/process/tree/v8.0.5"
            },
            "funding": [
                {
@@ -2419,7 +2431,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-19T10:01:18+00:00"
+            "time": "2026-01-26T15:08:38+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -2576,16 +2588,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v8.0.1",
+            "version": "v8.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc"
+                "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ba65a969ac918ce0cc3edfac6cdde847eba231dc",
-                "reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc",
+                "url": "https://api.github.com/repos/symfony/string/zipball/6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
+                "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
                "shasum": ""
            },
            "require": {
@@ -2642,7 +2654,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v8.0.1"
+                "source": "https://github.com/symfony/string/tree/v8.0.6"
            },
            "funding": [
                {
@@ -2662,7 +2674,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-01T09:13:36+00:00"
+            "time": "2026-02-09T10:14:57+00:00"
        }
    ],
    "packages-dev": [],
@@ -2671,7 +2683,9 @@
    "stability-flags": {},
    "prefer-stable": false,
    "prefer-lowest": false,
-    "platform": {},
+    "platform": {
+        "php": ">=8.5.0"
+    },
    "platform-dev": {},
    "plugin-api-version": "2.9.0"
 }
@@ -14,7 +14,15 @@ SITE_OWNER=mail@example.com
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 #
-# Avoid the "#" character in your APP_KEY, it may break things.
+# Try to avoid special characters like #, < and > in your app key. This string does not need full entropy
+# When in doubt, follow the link below and pick one.
+#
+# https://www.random.org/strings/?num=5&len=32&digits=on&upperalpha=on&loweralpha=on&unique=on&format=html&rnd=new
+#
+# If you are a fancy linux nerd like me, use this command:
+#
+# head /dev/urandom | LC_ALL=C tr -dc 'A-Za-z0-9' | head -c 32 && echo
+#
 #
 APP_KEY=SomeRandomStringOf32CharsExactly

@@ -4,9 +4,9 @@ body:
  - type: checkboxes
    attributes:
      label: Support guidelines
-      description: Please read the support guidelines before proceeding.
+      description: Thank you for reading the support guidelines before proceeding.
      options:
-        - label: I've read the <!-- MZ2udTpin6FL --> [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
+        - label: I'm smart and I read the <!-- MZ2udTpin6FL --> [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
          required: true

  - type: checkboxes
@@ -29,7 +29,7 @@ body:
    attributes:
      label: Debug information
      description: Please provide the table from the /debug page. Do not add backticks or quotes.
-      placeholder: The output from the /debug page
+      placeholder: The output from the /debug page or "N/A"
    validations:
      required: true

@@ -1,11 +1,4 @@
 pull_request_rules:
-  - name: Make sure PR are up to date before merging
-    description: This automatically updates PRs when they are out-of-date with the
-      base branch to avoid semantic conflicts (next step is using a merge
-      queue).
-    conditions: []
-    actions:
-      update:
  - name: Close all on main
    conditions:
      - base=main
@@ -1,20 +1,22 @@
 <!--
-Thank you for submitting new code to Firefly III, or any of the related projects. Please read the following rules carefully.

- Please do not submit solutions for problems that are not already reported in an issue.
- Unfortunately, Firefly III can't be your learning experience. If you're new to all of this, please open an issue first.
- Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
- Pull requests for the MAIN branch will be closed.
- DO NOT include translated strings in your PR.
- PRs (or parts thereof) that only fix issues inside code comments will not be accepted.
+Please TALK TO ME FIRST before you open a PR.

-If it feels necessary to open an issue first, please do so, before you open a PR.
+1. If you fix a problem that has no ticket, talk to me FIRST.
+2. If you  introduce new financial solutions or concepts, talk to me FIRST.
+3. If your PR is more than 25 lines, talk to me FIRST.
+4. If you used AI to write your PR, talk to me FIRST.
+5. If you fix spelling or code comments, talk to me FIRST.
+
+Wanna talk to me? Open a GitHub Issue, Discussion, or send me an email: james@firefly-iii.org

 See also: https://docs.firefly-iii.org/explanation/support/#contributing-code

 -->
+
+@JC5 
    
-This PR fixes issue # (if relevant).
+This PR fixes issue # <!-- mandatory field! -->.

 Changes in this pull request:

@@ -41,7 +41,7 @@ jobs:
          DDNOV="${DDNOV:1}"

          echo "Firefly III version is ${{ steps.ff3version.outputs.release }}, without v is $FFNOV"
-          echo "Data importer version is ${{ steps.ff3version.outputs.release }}, without v is $FFNOV"
+          echo "Data importer version is ${{ steps.ff3version.outputs.release }}, without v is $DDNOV"

          # user includes no debug info at all, and does not mention current version.
          # user includes no debug info at all, but does mention current version
@@ -10,7 +10,7 @@ on:
      phpversion:
        description: 'PHP version'
        required: true
-        default: '8.4'
+        default: '8.5'
  schedule:
    - cron: '0 3 * * MON'

@@ -42,7 +42,7 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: ${{ github.event.inputs.phpversion }}
+          php-version: ${{ github.event.inputs.phpversion || '8.5' }}
          extensions: mbstring, intl, zip, bcmath
      - name: Switch and pull
        run: |
@@ -170,10 +170,14 @@ jobs:
          npm run prod  --workspace=v1
          npm run build --workspace=v2
          npm update
+      - name: Setup Mago
+        uses: nhedger/setup-mago@v1
      - name: Run CI
        run: |
          rm -rf vendor composer.lock
-          composer update --no-dev --no-scripts --no-plugins -q
+          composer update --no-scripts --no-plugins -q
+          mago format || true
+          # mago analyze --reporting-format=github || true
          sudo chown -R runner:docker resources/lang
          .ci/phpcs.sh || true
      - name: Calculate variables
@@ -3,6 +3,16 @@
 Over time, many people have contributed to Firefly III. Their efforts are not always visible, but always remembered and appreciated.
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.

+## 2026
+- Cinnamon Pyro
+- R1DEN
+- RiDEN
+- Khoa Nguyen
+- Nick Huang
+- mateuszkulapl
+- Gianluca Martino
+- embedded
+
 ## 2025
 - Diego Algorta
 - Jihad
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -32,11 +31,11 @@ use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Debug\Timer;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;

 /**
@@ -51,7 +50,7 @@ class AccountController extends Controller
    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

    /** @var array<int, string> */
-    private array                      $balanceTypes;
+    private array $balanceTypes;
    private AccountRepositoryInterface $repository;

    /**
@@ -60,16 +59,14 @@ class AccountController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
        $this->balanceTypes = [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
    }

@@ -82,25 +79,17 @@ class AccountController extends Controller
     */
    public function accounts(AutocompleteApiRequest $request): JsonResponse
    {
-        Log::debug('Before All.');
-        [
-            'types' => $types,
-            'query' => $query,
-            'date'  => $date,
-            'limit' => $limit,
-        ]
-                     = $request->attributes->all();
+        // Log::debug('Before All.');
+        ['types' => $types, 'query' => $query, 'date'  => $date, 'limit' => $limit] = $request->attributes->all();

        $date ??= today(config('app.timezone'));

        // set date to end-of-day for account balance. so it is at $date 23:59:59
        $date->endOfDay();

-        $return      = [];
-        $timer       = Timer::getInstance();
-        $timer->start(sprintf('AC accounts "%s"', $query));
-        $result      = $this->repository->searchAccount((string)$query, $types, $limit);
-        $allBalances = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary);
+        $return                                                                     = [];
+        $result                                                                     = $this->repository->searchAccount((string) $query, $types, $limit);
+        $allBalances                                                                = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary);

        /** @var Account $account */
        foreach ($result as $account) {
@@ -118,17 +107,17 @@ class AccountController extends Controller
            }

            $return[]        = [
-                'id'                              => (string)$account->id,
+                'id'                              => (string) $account->id,
                'name'                            => $account->name,
                'name_with_balance'               => $nameWithBalance,
                'active'                          => $account->active,
                'type'                            => $account->accountType->type,
-                'currency_id'                     => (string)$useCurrency->id,
+                'currency_id'                     => (string) $useCurrency->id,
                'currency_name'                   => $useCurrency->name,
                'currency_code'                   => $useCurrency->code,
                'currency_symbol'                 => $useCurrency->symbol,
                'currency_decimal_places'         => $useCurrency->decimal_places,
-                'account_currency_id'             => (string)$currency->id,
+                'account_currency_id'             => (string) $currency->id,
                'account_currency_name'           => $currency->name,
                'account_currency_code'           => $currency->code,
                'account_currency_symbol'         => $currency->symbol,
@@ -137,17 +126,13 @@ class AccountController extends Controller
        }

        // custom order.
-        usort(
-            $return,
-            static function (array $left, array $right): int {
-                $order = [AccountTypeEnum::ASSET->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::EXPENSE->value];
-                $posA  = (int)array_search($left['type'], $order, true);
-                $posB  = (int)array_search($right['type'], $order, true);
+        usort($return, static function (array $left, array $right): int {
+            $order = [AccountTypeEnum::ASSET->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::EXPENSE->value];
+            $posA  = (int) array_search($left['type'], $order, true);
+            $posB  = (int) array_search($right['type'], $order, true);

-                return $posA - $posB;
-            }
-        );
-        $timer->stop(sprintf('AC accounts "%s"', $query));
+            return $posA - $posB;
+        });

        return response()->api($return);
    }
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class BillController
@@ -46,16 +46,14 @@ class BillController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(BillRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -65,13 +63,7 @@ class BillController extends Controller
    public function bills(AutocompleteApiRequest $request): JsonResponse
    {
        $result   = $this->repository->searchBill($request->attributes->get('query'), $request->attributes->get('limit'));
-        $filtered = $result->map(
-            static fn (Bill $item): array => [
-                'id'     => (string) $item->id,
-                'name'   => $item->name,
-                'active' => $item->active,
-            ]
-        );
+        $filtered = $result->map(static fn (Bill $item): array => ['id'     => (string) $item->id, 'name'   => $item->name, 'active' => $item->active]);

        return response()->api($filtered->toArray());
    }
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class BudgetController
@@ -46,16 +46,14 @@ class BudgetController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(BudgetRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(BudgetRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -65,13 +63,7 @@ class BudgetController extends Controller
    public function budgets(AutocompleteApiRequest $request): JsonResponse
    {
        $result   = $this->repository->searchBudget($request->attributes->get('query'), $request->attributes->get('limit'));
-        $filtered = $result->map(
-            static fn (Budget $item): array => [
-                'id'     => (string) $item->id,
-                'name'   => $item->name,
-                'active' => $item->active,
-            ]
-        );
+        $filtered = $result->map(static fn (Budget $item): array => ['id'     => (string) $item->id, 'name'   => $item->name, 'active' => $item->active]);

        return response()->api($filtered->toArray());
    }
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class CategoryController
@@ -46,16 +46,14 @@ class CategoryController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(CategoryRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -65,12 +63,7 @@ class CategoryController extends Controller
    public function categories(AutocompleteApiRequest $request): JsonResponse
    {
        $result   = $this->repository->searchCategory($request->attributes->get('query'), $request->attributes->get('limit'));
-        $filtered = $result->map(
-            static fn (Category $item): array => [
-                'id'   => (string) $item->id,
-                'name' => $item->name,
-            ]
-        );
+        $filtered = $result->map(static fn (Category $item): array => ['id'   => (string) $item->id, 'name' => $item->name]);

        return response()->api($filtered->toArray());
    }
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use Deprecated;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
@@ -33,6 +32,7 @@ use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class CurrencyController
@@ -48,16 +48,14 @@ class CurrencyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(CurrencyRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class ObjectGroupController
@@ -46,16 +46,14 @@ class ObjectGroupController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(ObjectGroupRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(ObjectGroupRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -69,11 +67,7 @@ class ObjectGroupController extends Controller

        /** @var ObjectGroup $objectGroup */
        foreach ($result as $objectGroup) {
-            $return[] = [
-                'id'    => (string) $objectGroup->id,
-                'name'  => $objectGroup->title,
-                'title' => $objectGroup->title,
-            ];
+            $return[] = ['id'    => (string) $objectGroup->id, 'name'  => $objectGroup->title, 'title' => $objectGroup->title];
        }

        return response()->api($return);
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -34,13 +33,14 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class PiggyBankController
 */
 class PiggyBankController extends Controller
 {
-    private AccountRepositoryInterface   $accountRepository;
+    private AccountRepositoryInterface $accountRepository;
    private PiggyBankRepositoryInterface $piggyRepository;
    protected array $acceptedRoles = [UserRoleEnum::READ_PIGGY_BANKS];

@@ -50,19 +50,17 @@ class PiggyBankController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->piggyRepository   = app(PiggyBankRepositoryInterface::class);
-                $this->accountRepository = app(AccountRepositoryInterface::class);
-                $this->piggyRepository->setUser($this->user);
-                $this->piggyRepository->setUserGroup($this->userGroup);
-                $this->accountRepository->setUser($this->user);
-                $this->accountRepository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->piggyRepository   = app(PiggyBankRepositoryInterface::class);
+            $this->accountRepository = app(AccountRepositoryInterface::class);
+            $this->piggyRepository->setUser($this->user);
+            $this->piggyRepository->setUserGroup($this->userGroup);
+            $this->accountRepository->setUser($this->user);
+            $this->accountRepository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function piggyBanks(AutocompleteApiRequest $request): JsonResponse
@@ -84,6 +82,7 @@ class PiggyBankController extends Controller
                'currency_decimal_places' => $currency->decimal_places,
                'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id,
                'object_group_title'      => $objectGroup?->title,
+                'object_group_order'      => $objectGroup?->order,
            ];
        }

@@ -108,7 +107,7 @@ class PiggyBankController extends Controller
                    '%s (%s / %s)',
                    $piggy->name,
                    Amount::formatAnything($currency, $currentAmount, false),
-                    Amount::formatAnything($currency, $piggy->target_amount, false),
+                    Amount::formatAnything($currency, $piggy->target_amount, false)
                ),
                'currency_id'             => (string) $currency->id,
                'currency_name'           => $currency->name,
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class RecurrenceController
@@ -46,16 +46,14 @@ class RecurrenceController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(RecurringRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function recurring(AutocompleteApiRequest $request): JsonResponse
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Rule;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class RuleController
@@ -38,7 +38,7 @@ use Illuminate\Http\JsonResponse;
 class RuleController extends Controller
 {
    private RuleRepositoryInterface $repository;
-    protected array                 $acceptedRoles = [UserRoleEnum::READ_RULES];
+    protected array $acceptedRoles = [UserRoleEnum::READ_RULES];

    /**
     * RuleController constructor.
@@ -46,16 +46,14 @@ class RuleController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(RuleRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(RuleRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function rules(AutocompleteApiRequest $request): JsonResponse
@@ -66,7 +64,7 @@ class RuleController extends Controller
        /** @var Rule $rule */
        foreach ($rules as $rule) {
            $response[] = [
-                'id'          => (string)$rule->id,
+                'id'          => (string) $rule->id,
                'name'        => $rule->title,
                'description' => $rule->description,
                'active'      => $rule->active,
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class RuleGroupController
@@ -46,16 +46,14 @@ class RuleGroupController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(RuleGroupRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(RuleGroupRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function ruleGroups(AutocompleteApiRequest $request): JsonResponse
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class TagController
@@ -46,16 +46,14 @@ class TagController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(TagRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(TagRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function tags(AutocompleteApiRequest $request): JsonResponse
@@ -65,11 +63,7 @@ class TagController extends Controller

        /** @var Tag $tag */
        foreach ($result as $tag) {
-            $array[] = [
-                'id'   => (string) $tag->id,
-                'name' => $tag->tag,
-                'tag'  => $tag->tag,
-            ];
+            $array[] = ['id'   => (string) $tag->id, 'name' => $tag->tag, 'tag'  => $tag->tag];
        }

        return response()->api($array);
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteTransactionApiRequest;
@@ -34,6 +33,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;

 /**
@@ -43,7 +43,7 @@ class TransactionController extends Controller
 {
    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
    private TransactionGroupRepositoryInterface $groupRepository;
-    private JournalRepositoryInterface          $repository;
+    private JournalRepositoryInterface $repository;

    /**
     * TransactionController constructor.
@@ -51,19 +51,17 @@ class TransactionController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository      = app(JournalRepositoryInterface::class);
-                $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
-                $this->groupRepository->setUser($this->user);
-                $this->groupRepository->setUserGroup($this->userGroup);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository      = app(JournalRepositoryInterface::class);
+            $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
+            $this->repository->setUser($this->user);
+            $this->repository->setUserGroup($this->userGroup);
+            $this->groupRepository->setUser($this->user);
+            $this->groupRepository->setUserGroup($this->userGroup);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function transactions(AutocompleteTransactionApiRequest $request): JsonResponse
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class TransactionTypeController
@@ -46,14 +46,12 @@ class TransactionTypeController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(TransactionTypeRepositoryInterface::class);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(TransactionTypeRepositoryInterface::class);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function transactionTypes(AutocompleteApiRequest $request): JsonResponse
@@ -64,11 +62,7 @@ class TransactionTypeController extends Controller
        /** @var TransactionType $type */
        foreach ($types as $type) {
            // different key for consistency.
-            $array[] = [
-                'id'   => (string) $type->id,
-                'name' => $type->type,
-                'type' => $type->type,
-            ];
+            $array[] = ['id'   => (string) $type->id, 'name' => $type->type, 'type' => $type->type];
        }

        return response()->api($array);
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

+use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -49,9 +50,9 @@ class AccountController extends Controller
    use CleansChartData;
    use CollectsAccountsFromFilter;

-    protected array $acceptedRoles                = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

-    private array                      $chartData = [];
+    private array $chartData       = [];
    private AccountRepositoryInterface $repository;

    /**
@@ -60,16 +61,14 @@ class AccountController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->validateUserGroup($request);
-                $this->repository->setUserGroup($this->userGroup);
-                $this->repository->setUser($this->user);
+        $this->middleware(function (Request $request, $next) {
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->validateUserGroup($request);
+            $this->repository->setUserGroup($this->userGroup);
+            $this->repository->setUser($this->user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -115,14 +114,14 @@ class AccountController extends Controller
            'label'                   => $account->name,

            // the currency that belongs to the account.
-            'currency_id'             => (string)$currency->id,
+            'currency_id'             => (string) $currency->id,
            'currency_name'           => $currency->name,
            'currency_code'           => $currency->code,
            'currency_symbol'         => $currency->symbol,
            'currency_decimal_places' => $currency->decimal_places,

            // the primary currency
-            'primary_currency_id'     => (string)$this->primaryCurrency->id,
+            'primary_currency_id'     => (string) $this->primaryCurrency->id,

            // the default currency of the user (could be the same!)
            'date'                    => $params['start']->toAtomString(),
@@ -136,7 +135,7 @@ class AccountController extends Controller
        ];
        if ($this->convertToPrimary) {
            $currentSet['pc_entries']                      = [];
-            $currentSet['primary_currency_id']             = (string)$this->primaryCurrency->id;
+            $currentSet['primary_currency_id']             = (string) $this->primaryCurrency->id;
            $currentSet['primary_currency_code']           = $this->primaryCurrency->code;
            $currentSet['primary_currency_symbol']         = $this->primaryCurrency->symbol;
            $currentSet['primary_currency_decimal_places'] = $this->primaryCurrency->decimal_places;
@@ -144,23 +143,29 @@ class AccountController extends Controller
        }
        // create array of values to collect.

+        $rangeDates        = array_map(static fn (string $d): Carbon => Carbon::createFromFormat('Y-m-d', $d)->startOfDay(), array_keys($range));
+        $rangeVals         = array_values($range);
+        $rangeIdx          = 0;
+        $rangeCount        = count($rangeDates);
+
        while ($currentStart <= $params['end']) {
-            $format                        = $currentStart->format('Y-m-d');
            $label                         = $currentStart->toAtomString();
-            $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
-            $previous                      = $balance;
-            $currentSet['entries'][$label] = $balance;

-
-            // do the same for the primary currency balance, if relevant:
-            $pcBalance                     = null;
-            if ($this->convertToPrimary) {
-                $pcBalance                        = array_key_exists($format, $range) ? $range[$format]['pc_balance'] : $pcPrevious;
-                $pcPrevious                       = $pcBalance;
-                $currentSet['pc_entries'][$label] = $pcBalance;
+            // Advance through all range entries up to current chart date
+            while ($rangeIdx < $rangeCount && $rangeDates[$rangeIdx] <= $currentStart) {
+                $previous = $rangeVals[$rangeIdx]['balance'];
+                if ($this->convertToPrimary) {
+                    $pcPrevious = $rangeVals[$rangeIdx]['pc_balance'];
+                }
+                ++$rangeIdx;
            }
+
+            $currentSet['entries'][$label] = $previous;
+            if ($this->convertToPrimary) {
+                $currentSet['pc_entries'][$label] = $pcPrevious;
+            }
+
            $currentStart                  = Navigation::addPeriod($currentStart, $period);
-            // $currentStart->addDay();
        }
        $this->chartData[] = $currentSet;
    }
@@ -1,6 +1,5 @@
 <?php

-
 /*
 * BalanceController.php
 * Copyright (c) 2025 james@firefly-iii.org
@@ -25,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -37,6 +35,7 @@ use FireflyIII\Support\Http\Api\AccountBalanceGrouped;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class BalanceController
@@ -45,10 +44,11 @@ class BalanceController extends Controller
 {
    use CleansChartData;
    use CollectsAccountsFromFilter;
-    protected array $acceptedRoles            = [UserRoleEnum::READ_ONLY];

-    private array                  $chartData = [];
-    private GroupCollectorInterface    $collector;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+
+    private array $chartData       = [];
+    private GroupCollectorInterface $collector;
    private AccountRepositoryInterface $repository;

    // private TransactionCurrency        $default;
@@ -56,19 +56,17 @@ class BalanceController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->collector  = app(GroupCollectorInterface::class);
-                $this->repository->setUserGroup($this->userGroup);
-                $this->collector->setUserGroup($this->userGroup);
-                $this->repository->setUser($this->user);
-                $this->collector->setUser($this->user);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->collector  = app(GroupCollectorInterface::class);
+            $this->repository->setUserGroup($this->userGroup);
+            $this->collector->setUserGroup($this->userGroup);
+            $this->repository->setUser($this->user);
+            $this->collector->setUser($this->user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -89,10 +87,16 @@ class BalanceController extends Controller

        // get journals for entire period:

-        $this->collector->setRange($queryParameters['start'], $queryParameters['end'])
+        $this->collector
+            ->setRange($queryParameters['start'], $queryParameters['end'])
            ->withAccountInformation()
            ->setXorAccounts($accounts)
-            ->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::RECONCILIATION->value, TransactionTypeEnum::TRANSFER->value])
+            ->setTypes([
+                TransactionTypeEnum::WITHDRAWAL->value,
+                TransactionTypeEnum::DEPOSIT->value,
+                TransactionTypeEnum::RECONCILIATION->value,
+                TransactionTypeEnum::TRANSFER->value,
+            ])
        ;
        $journals        = $this->collector->getExtractedJournals();

@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

-use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\DateRangeRequest;
@@ -36,13 +35,14 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
-use FireflyIII\Support\Facades\Steam;

 /**
 * Class BudgetController
@@ -52,32 +52,30 @@ class BudgetController extends Controller
    use CleansChartData;
    use ValidatesUserGroupTrait;

-    protected array $acceptedRoles                      = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

    protected OperationsRepositoryInterface $opsRepository;
-    private BudgetLimitRepositoryInterface  $blRepository;
-    private array                           $currencies = [];
-    private BudgetRepositoryInterface       $repository;
+    private BudgetLimitRepositoryInterface $blRepository;
+    private array $currencies      = [];
+    private BudgetRepositoryInterface $repository;

    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository    = app(BudgetRepositoryInterface::class);
-                $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->repository->setUserGroup($this->userGroup);
-                $this->opsRepository->setUserGroup($this->userGroup);
-                $this->blRepository->setUserGroup($this->userGroup);
-                $this->repository->setUser($this->user);
-                $this->opsRepository->setUser($this->user);
-                $this->blRepository->setUser($this->user);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository    = app(BudgetRepositoryInterface::class);
+            $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->repository->setUserGroup($this->userGroup);
+            $this->opsRepository->setUserGroup($this->userGroup);
+            $this->blRepository->setUserGroup($this->userGroup);
+            $this->repository->setUser($this->user);
+            $this->opsRepository->setUser($this->user);
+            $this->blRepository->setUser($this->user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -106,6 +104,48 @@ class BudgetController extends Controller
        return response()->json($this->clean($data));
    }

+    private function filterLimit(int $currencyId, Collection $limits): ?BudgetLimit
+    {
+        $amount    = '0';
+        $limit     = null;
+        $converter = new ExchangeRateConverter();
+
+        /** @var BudgetLimit $current */
+        foreach ($limits as $current) {
+            if ($this->convertToPrimary) {
+                if ($current->transaction_currency_id === $this->primaryCurrency->id) {
+                    // simply add it.
+                    $amount = bcadd($amount, (string) $current->amount);
+                    Log::debug(sprintf('Set amount in limit to %s', $amount));
+                }
+                if ($current->transaction_currency_id !== $this->primaryCurrency->id) {
+                    // convert and then add it.
+                    $converted = $converter->convert($current->transactionCurrency, $this->primaryCurrency, $current->start_date, $current->amount);
+                    $amount    = bcadd($amount, $converted);
+                    Log::debug(sprintf(
+                        'Budgeted in limit #%d: %s %s, converted to %s %s',
+                        $current->id,
+                        $current->transactionCurrency->code,
+                        $current->amount,
+                        $this->primaryCurrency->code,
+                        $converted
+                    ));
+                    Log::debug(sprintf('Set amount in limit to %s', $amount));
+                }
+            }
+            if ($current->transaction_currency_id === $currencyId) {
+                $limit = $current;
+            }
+        }
+        if (null !== $limit && $this->convertToPrimary) {
+            // convert and add all amounts.
+            $limit->amount = Steam::positive($amount);
+            Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount));
+        }
+
+        return $limit;
+    }
+
    /**
     * @throws FireflyException
     */
@@ -158,18 +198,17 @@ class BudgetController extends Controller
            $rows[]              = $row;
        }

-
        // is always an array
        $return     = [];
        foreach ($rows as $row) {
            $current  = [
                'label'                           => $budget->name,
-                'currency_id'                     => (string)$row['currency_id'],
+                'currency_id'                     => (string) $row['currency_id'],
                'currency_name'                   => $row['currency_name'],
                'currency_code'                   => $row['currency_code'],
                'currency_decimal_places'         => $row['currency_decimal_places'],

-                'primary_currency_id'             => (string)$this->primaryCurrency->id,
+                'primary_currency_id'             => (string) $this->primaryCurrency->id,
                'primary_currency_name'           => $this->primaryCurrency->name,
                'primary_currency_code'           => $this->primaryCurrency->code,
                'primary_currency_symbol'         => $this->primaryCurrency->symbol,
@@ -181,12 +220,7 @@ class BudgetController extends Controller
                'end_date'                        => $row['end'],
                'yAxisID'                         => 0,
                'type'                            => 'bar',
-                'entries'                         => [
-                    'budgeted'  => $row['budgeted'],
-                    'spent'     => $row['spent'],
-                    'left'      => $row['left'],
-                    'overspent' => $row['overspent'],
-                ],
+                'entries'                         => ['budgeted'  => $row['budgeted'], 'spent'     => $row['spent'], 'left'      => $row['left'], 'overspent' => $row['overspent']],
                'pc_entries'                      => [
                    'budgeted'  => $row['pc_budgeted'],
                    'spent'     => $row['pc_spent'],
@@ -233,11 +267,11 @@ class BudgetController extends Controller
        foreach ($spent as $currencyId => $block) {
            $this->currencies[$currencyId] ??= Amount::getTransactionCurrencyById($currencyId);
            $return[$currencyId]           ??= [
-                'currency_id'             => (string)$currencyId,
+                'currency_id'             => (string) $currencyId,
                'currency_code'           => $block['currency_code'],
                'currency_name'           => $block['currency_name'],
                'currency_symbol'         => $block['currency_symbol'],
-                'currency_decimal_places' => (int)$block['currency_decimal_places'],
+                'currency_decimal_places' => (int) $block['currency_decimal_places'],
                'start'                   => $start->toAtomString(),
                'end'                     => $end->toAtomString(),
                'budgeted'                => '0',
@@ -251,46 +285,11 @@ class BudgetController extends Controller
            /** @var array $journal */
            foreach ($currentBudgetArray['transaction_journals'] as $journal) {
                /** @var numeric-string $amount */
-                $amount                       = (string)$journal['amount'];
+                $amount                       = (string) $journal['amount'];
                $return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], $amount);
            }
        }

        return $return;
    }
-
-    private function filterLimit(int $currencyId, Collection $limits): ?BudgetLimit
-    {
-        $amount    = '0';
-        $limit     = null;
-        $converter = new ExchangeRateConverter();
-
-        /** @var BudgetLimit $current */
-        foreach ($limits as $current) {
-            if ($this->convertToPrimary) {
-                if ($current->transaction_currency_id === $this->primaryCurrency->id) {
-                    // simply add it.
-                    $amount = bcadd($amount, (string)$current->amount);
-                    Log::debug(sprintf('Set amount in limit to %s', $amount));
-                }
-                if ($current->transaction_currency_id !== $this->primaryCurrency->id) {
-                    // convert and then add it.
-                    $converted = $converter->convert($current->transactionCurrency, $this->primaryCurrency, $current->start_date, $current->amount);
-                    $amount    = bcadd($amount, $converted);
-                    Log::debug(sprintf('Budgeted in limit #%d: %s %s, converted to %s %s', $current->id, $current->transactionCurrency->code, $current->amount, $this->primaryCurrency->code, $converted));
-                    Log::debug(sprintf('Set amount in limit to %s', $amount));
-                }
-            }
-            if ($current->transaction_currency_id === $currencyId) {
-                $limit = $current;
-            }
-        }
-        if (null !== $limit && $this->convertToPrimary) {
-            // convert and add all amounts.
-            $limit->amount = Steam::positive($amount);
-            Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount));
-        }
-
-        return $limit;
-    }
 }
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

-use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\DateRangeRequest;
@@ -40,6 +39,7 @@ use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;

 /**
@@ -52,25 +52,23 @@ class CategoryController extends Controller

    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

-    private AccountRepositoryInterface  $accountRepos;
+    private AccountRepositoryInterface $accountRepos;
    private CurrencyRepositoryInterface $currencyRepos;

    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->accountRepos  = app(AccountRepositoryInterface::class);
-                $this->currencyRepos = app(CurrencyRepositoryInterface::class);
-                $this->accountRepos->setUserGroup($this->userGroup);
-                $this->currencyRepos->setUserGroup($this->userGroup);
-                $this->accountRepos->setUser($this->user);
-                $this->currencyRepos->setUser($this->user);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->accountRepos  = app(AccountRepositoryInterface::class);
+            $this->currencyRepos = app(CurrencyRepositoryInterface::class);
+            $this->accountRepos->setUserGroup($this->userGroup);
+            $this->currencyRepos->setUserGroup($this->userGroup);
+            $this->accountRepos->setUser($this->user);
+            $this->currencyRepos->setUser($this->user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -88,7 +86,12 @@ class CategoryController extends Controller

        /** @var Carbon $end */
        $end        = $request->attributes->get('end');
-        $accounts   = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value]);
+        $accounts   = $this->accountRepos->getAccountsByType([
+            AccountTypeEnum::DEBT->value,
+            AccountTypeEnum::LOAN->value,
+            AccountTypeEnum::MORTGAGE->value,
+            AccountTypeEnum::ASSET->value,
+        ]);
        $currencies = [];
        $return     = [];
        $converter  = new ExchangeRateConverter();
@@ -104,7 +107,7 @@ class CategoryController extends Controller
        /** @var array $journal */
        foreach ($journals as $journal) {
            // find journal:
-            $journalCurrencyId              = (int)$journal['currency_id'];
+            $journalCurrencyId              = (int) $journal['currency_id'];
            $type                           = $journal['transaction_type_type'];
            $currency                       = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
            $currencies[$journalCurrencyId] = $currency;
@@ -113,7 +116,7 @@ class CategoryController extends Controller
            $currencyCode                   = $currency->code;
            $currencySymbol                 = $currency->symbol;
            $currencyDecimalPlaces          = $currency->decimal_places;
-            $amount                         = Steam::positive((string)$journal['amount']);
+            $amount                         = Steam::positive((string) $journal['amount']);
            $pcAmount                       = null;

            // overrule if necessary:
@@ -130,18 +133,17 @@ class CategoryController extends Controller
                Log::debug(sprintf('Converted %s %s to %s %s', $journal['currency_code'], $amount, $this->primaryCurrency->code, $pcAmount));
            }

-
-            $categoryName                   = $journal['category_name'] ?? (string)trans('firefly.no_category');
+            $categoryName                   = $journal['category_name'] ?? (string) trans('firefly.no_category');
            $key                            = sprintf('%s-%s', $categoryName, $currencyCode);
            // create arrays
            $return[$key] ??= [
                'label'                           => $categoryName,
-                'currency_id'                     => (string)$currencyId,
+                'currency_id'                     => (string) $currencyId,
                'currency_name'                   => $currencyName,
                'currency_code'                   => $currencyCode,
                'currency_symbol'                 => $currencySymbol,
                'currency_decimal_places'         => $currencyDecimalPlaces,
-                'primary_currency_id'             => (string)$this->primaryCurrency->id,
+                'primary_currency_id'             => (string) $this->primaryCurrency->id,
                'primary_currency_name'           => $this->primaryCurrency->name,
                'primary_currency_code'           => $this->primaryCurrency->code,
                'primary_currency_symbol'         => $this->primaryCurrency->symbol,
@@ -151,14 +153,8 @@ class CategoryController extends Controller
                'end_date'                        => $end->toAtomString(),
                'yAxisID'                         => 0,
                'type'                            => 'bar',
-                'entries'                         => [
-                    'spent'  => '0',
-                    'earned' => '0',
-                ],
-                'pc_entries'                      => [
-                    'spent'  => '0',
-                    'earned' => '0',
-                ],
+                'entries'                         => ['spent'  => '0', 'earned' => '0'],
+                'pc_entries'                      => ['spent'  => '0', 'earned' => '0'],
            ];

            // add monies
@@ -182,7 +178,10 @@ class CategoryController extends Controller
        $return     = array_values($return);

        // order by amount
-        usort($return, static fn (array $a, array $b): int => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1);
+        usort($return, static fn (array $a, array $b): int => ((float) $a['entries']['spent'] + (float) $a['entries']['earned'])
+        < ((float) $b['entries']['spent'] + (float) $b['entries']['earned'])
+            ? 1
+            : -1);

        return response()->json($this->clean($return));
    }
@@ -24,9 +24,9 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers;

-use Deprecated;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
+use Deprecated;
 use FireflyIII\Exceptions\BadHttpHeaderException;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
@@ -63,15 +63,16 @@ abstract class Controller extends BaseController
    use ValidatesRequests;
    use ValidatesUserGroupTrait;

-    protected const string CONTENT_TYPE             = 'application/vnd.api+json';
-    protected const string JSON_CONTENT_TYPE        = 'application/json';
-    protected array $accepts                        = ['application/json', 'application/vnd.api+json'];
+    protected const string CONTENT_TYPE      = 'application/vnd.api+json';
+    protected const string JSON_CONTENT_TYPE = 'application/json';

-    protected bool                $convertToPrimary = false;
+    protected array $accepts                 = ['application/json', 'application/vnd.api+json'];
+
+    protected bool $convertToPrimary         = false;
    protected TransactionCurrency $primaryCurrency;

    /** @deprecated use Request classes */
-    protected ParameterBag        $parameters;
+    protected ParameterBag $parameters;

    /**
     * Controller constructor.
@@ -79,96 +80,22 @@ abstract class Controller extends BaseController
    public function __construct()
    {
        // get global parameters
-        $this->middleware(
-            function ($request, $next) {
-                $this->parameters = $this->getParameters();
-                if (auth()->check()) {
-                    $language               = Steam::getLanguage();
-                    $this->convertToPrimary = Amount::convertToPrimary();
-                    $this->primaryCurrency  = Amount::getPrimaryCurrency();
-                    app()->setLocale($language);
-                }
-
-
-                // filter down what this endpoint accepts.
-                if (!$request->accepts($this->accepts)) {
-                    throw new BadHttpHeaderException(sprintf('Sorry, Accept header "%s" is not something this endpoint can provide.', $request->header('Accept')));
-                }
-
-
-                return $next($request);
+        $this->middleware(function ($request, $next) {
+            $this->parameters = $this->getParameters();
+            if (auth()->check()) {
+                $language               = Steam::getLanguage();
+                $this->convertToPrimary = Amount::convertToPrimary();
+                $this->primaryCurrency  = Amount::getPrimaryCurrency();
+                app()->setLocale($language);
            }
-        );
-    }

-    #[Deprecated(message: <<<'TXT'
-        use Request classes
-         Method to grab all parameters from the URL
-        TXT)]
-    private function getParameters(): ParameterBag
-    {
-        $bag      = new ParameterBag();
-        $page     = (int)request()->get('page');
-        $page     = min(max(1, $page), 2 ** 16);
-        $bag->set('page', $page);
+            // filter down what this endpoint accepts.
+            if (!$request->accepts($this->accepts)) {
+                throw new BadHttpHeaderException(sprintf('Sorry, Accept header "%s" is not something this endpoint can provide.', $request->header('Accept')));
+            }

-        // some date fields:
-        $dates    = ['start', 'end', 'date'];
-        foreach ($dates as $field) {
-            $date = null;
-
-            try {
-                $date = request()->query->get($field);
-            } catch (BadRequestException $e) {
-                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
-                Log::error($e->getMessage());
-                Log::error($e->getTraceAsString());
-            }
-            $obj  = null;
-            if (null !== $date) {
-                try {
-                    $obj = Carbon::parse((string)$date, config('app.timezone'));
-                } catch (InvalidFormatException $e) {
-                    // don't care
-                    Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', substr((string)$date, 0, 20), $e->getMessage()));
-                }
-            }
-            if ($obj instanceof Carbon) {
-                $bag->set($field, $obj);
-            }
-        }
-
-        // integer fields:
-        $integers = ['limit'];
-        foreach ($integers as $integer) {
-            try {
-                $value = request()->query->get($integer);
-            } catch (BadRequestException $e) {
-                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
-                Log::error($e->getMessage());
-                Log::error($e->getTraceAsString());
-                $value = null;
-            }
-            if (null !== $value) {
-                $value = (int)$value;
-                $value = min(max(1, $value), 2 ** 16);
-                $bag->set($integer, $value);
-            }
-            if (null === $value
-                && 'limit' === $integer // @phpstan-ignore-line
-                && auth()->check()) {
-                // set default for user:
-                /** @var User $user */
-                $user     = auth()->user();
-
-                $pageSize = (int)Preferences::getForUser($user, 'listPageSize', 50)->data;
-                $bag->set($integer, $pageSize);
-            }
-        }
-
-        // sort fields:
-        return $bag;
-        // return $this->getSortParameters($bag);
+            return $next($request);
+        });
    }

    /**
@@ -241,4 +168,77 @@ abstract class Controller extends BaseController

        return $manager->createData($resource)->toArray();
    }
+
+    #[Deprecated(message: <<<'TXT'
+        use Request classes
+         Method to grab all parameters from the URL
+        TXT)]
+    private function getParameters(): ParameterBag
+    {
+        $bag      = new ParameterBag();
+        $page     = (int) request()->get('page');
+        $page     = min(max(1, $page), 2 ** 16);
+        $bag->set('page', $page);
+
+        // some date fields:
+        $dates    = ['start', 'end', 'date'];
+        foreach ($dates as $field) {
+            $date = null;
+
+            try {
+                $date = request()->query->get($field);
+            } catch (BadRequestException $e) {
+                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
+                Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
+            }
+            $obj  = null;
+            if (null !== $date) {
+                try {
+                    $obj = Carbon::parse((string) $date, config('app.timezone'));
+                } catch (InvalidFormatException $e) {
+                    // don't care
+                    Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', substr((string) $date, 0, 20), $e->getMessage()));
+                }
+            }
+            if ($obj instanceof Carbon) {
+                $bag->set($field, $obj);
+            }
+        }
+
+        // integer fields:
+        $integers = ['limit'];
+        foreach ($integers as $integer) {
+            try {
+                $value = request()->query->get($integer);
+            } catch (BadRequestException $e) {
+                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
+                Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
+                $value = null;
+            }
+            if (null !== $value) {
+                $value = (int) $value;
+                $value = min(max(1, $value), 2 ** 16);
+                $bag->set($integer, $value);
+            }
+            if (
+                null === $value
+                && 'limit' === $integer // @phpstan-ignore-line
+                && auth()->check()
+            ) {
+                // set default for user:
+                /** @var User $user */
+                $user     = auth()->user();
+
+                $pageSize = (int) Preferences::getForUser($user, 'listPageSize', 50)->data;
+                $bag->set($integer, $pageSize);
+            }
+        }
+
+        // sort fields:
+        return $bag;
+
+        // return $this->getSortParameters($bag);
+    }
 }
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data\Bulk;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Bulk\TransactionRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class TransactionController
@@ -51,16 +51,14 @@ class TransactionController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUserGroup($this->userGroup);
-                $this->repository->setUser($this->user);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->repository->setUserGroup($this->userGroup);
+            $this->repository->setUser($this->user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function update(TransactionRequest $request): JsonResponse
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -49,6 +48,7 @@ use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;

 /**
@@ -63,13 +63,11 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function destroy(DestroyRequest $request): JsonResponse
@@ -77,10 +75,40 @@ class DestroyController extends Controller
        $objects         = $request->getObjects();
        $this->unused    = $request->boolean('unused');

-        $allExceptAssets = [AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::REVENUE->value];
-        $all             = [AccountTypeEnum::ASSET->value, AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::RECONCILIATION->value];
+        $allExceptAssets = [
+            AccountTypeEnum::BENEFICIARY->value,
+            AccountTypeEnum::CASH->value,
+            AccountTypeEnum::CREDITCARD->value,
+            AccountTypeEnum::DEFAULT->value,
+            AccountTypeEnum::EXPENSE->value,
+            AccountTypeEnum::IMPORT->value,
+            AccountTypeEnum::INITIAL_BALANCE->value,
+            AccountTypeEnum::LIABILITY_CREDIT->value,
+            AccountTypeEnum::RECONCILIATION->value,
+            AccountTypeEnum::REVENUE->value,
+        ];
+        $all             = [
+            AccountTypeEnum::ASSET->value,
+            AccountTypeEnum::BENEFICIARY->value,
+            AccountTypeEnum::CASH->value,
+            AccountTypeEnum::CREDITCARD->value,
+            AccountTypeEnum::DEBT->value,
+            AccountTypeEnum::DEFAULT->value,
+            AccountTypeEnum::EXPENSE->value,
+            AccountTypeEnum::IMPORT->value,
+            AccountTypeEnum::INITIAL_BALANCE->value,
+            AccountTypeEnum::LIABILITY_CREDIT->value,
+            AccountTypeEnum::LOAN->value,
+            AccountTypeEnum::MORTGAGE->value,
+            AccountTypeEnum::RECONCILIATION->value,
+        ];
        $liabilities     = [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value];
-        $transactions    = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value];
+        $transactions    = [
+            TransactionTypeEnum::WITHDRAWAL->value,
+            TransactionTypeEnum::DEPOSIT->value,
+            TransactionTypeEnum::TRANSFER->value,
+            TransactionTypeEnum::RECONCILIATION->value,
+        ];

        match ($objects) {
            'budgets'                => $this->destroyBudgets(),
@@ -101,7 +129,7 @@ class DestroyController extends Controller
            'withdrawals'            => $this->destroyTransactions([TransactionTypeEnum::WITHDRAWAL->value]),
            'deposits'               => $this->destroyTransactions([TransactionTypeEnum::DEPOSIT->value]),
            'transfers'              => $this->destroyTransactions([TransactionTypeEnum::TRANSFER->value]),
-            default                  => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)),
+            default                  => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects))
        };

        Preferences::mark();
@@ -109,70 +137,6 @@ class DestroyController extends Controller
        return response()->json([], 204);
    }

-    private function destroyBudgets(): void
-    {
-        /** @var AvailableBudgetRepositoryInterface $abRepository */
-        $abRepository     = app(AvailableBudgetRepositoryInterface::class);
-        $abRepository->destroyAll();
-
-        /** @var BudgetLimitRepositoryInterface $blRepository */
-        $blRepository     = app(BudgetLimitRepositoryInterface::class);
-        $blRepository->destroyAll();
-
-        /** @var BudgetRepositoryInterface $budgetRepository */
-        $budgetRepository = app(BudgetRepositoryInterface::class);
-        $budgetRepository->destroyAll();
-    }
-
-    private function destroyBills(): void
-    {
-        /** @var BillRepositoryInterface $repository */
-        $repository = app(BillRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    private function destroyPiggyBanks(): void
-    {
-        /** @var PiggyBankRepositoryInterface $repository */
-        $repository = app(PiggyBankRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    private function destroyRules(): void
-    {
-        /** @var RuleGroupRepositoryInterface $repository */
-        $repository = app(RuleGroupRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    private function destroyRecurringTransactions(): void
-    {
-        /** @var RecurringRepositoryInterface $repository */
-        $repository = app(RecurringRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    private function destroyCategories(): void
-    {
-        /** @var CategoryRepositoryInterface $categoryRepos */
-        $categoryRepos = app(CategoryRepositoryInterface::class);
-        $categoryRepos->destroyAll();
-    }
-
-    private function destroyTags(): void
-    {
-        /** @var TagRepositoryInterface $tagRepository */
-        $tagRepository = app(TagRepositoryInterface::class);
-        $tagRepository->destroyAll();
-    }
-
-    private function destroyObjectGroups(): void
-    {
-        /** @var ObjectGroupRepositoryInterface $repository */
-        $repository = app(ObjectGroupRepositoryInterface::class);
-        $repository->deleteAll();
-    }
-
    /**
     * @param array<int, string> $types
     */
@@ -201,6 +165,70 @@ class DestroyController extends Controller
        }
    }

+    private function destroyBills(): void
+    {
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    private function destroyBudgets(): void
+    {
+        /** @var AvailableBudgetRepositoryInterface $abRepository */
+        $abRepository     = app(AvailableBudgetRepositoryInterface::class);
+        $abRepository->destroyAll();
+
+        /** @var BudgetLimitRepositoryInterface $blRepository */
+        $blRepository     = app(BudgetLimitRepositoryInterface::class);
+        $blRepository->destroyAll();
+
+        /** @var BudgetRepositoryInterface $budgetRepository */
+        $budgetRepository = app(BudgetRepositoryInterface::class);
+        $budgetRepository->destroyAll();
+    }
+
+    private function destroyCategories(): void
+    {
+        /** @var CategoryRepositoryInterface $categoryRepos */
+        $categoryRepos = app(CategoryRepositoryInterface::class);
+        $categoryRepos->destroyAll();
+    }
+
+    private function destroyObjectGroups(): void
+    {
+        /** @var ObjectGroupRepositoryInterface $repository */
+        $repository = app(ObjectGroupRepositoryInterface::class);
+        $repository->deleteAll();
+    }
+
+    private function destroyPiggyBanks(): void
+    {
+        /** @var PiggyBankRepositoryInterface $repository */
+        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    private function destroyRecurringTransactions(): void
+    {
+        /** @var RecurringRepositoryInterface $repository */
+        $repository = app(RecurringRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    private function destroyRules(): void
+    {
+        /** @var RuleGroupRepositoryInterface $repository */
+        $repository = app(RuleGroupRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    private function destroyTags(): void
+    {
+        /** @var TagRepositoryInterface $tagRepository */
+        $tagRepository = app(TagRepositoryInterface::class);
+        $tagRepository->destroyAll();
+    }
+
    /**
     * @param array<int, string> $types
     */
@@ -24,12 +24,12 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data\Export;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
+use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
 use Safe\Exceptions\DatetimeException;

@@ -49,16 +49,14 @@ class ExportController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
-                $this->exporter = app(ExportDataGenerator::class);
-                $this->exporter->setUserGroup($this->userGroup);
-                $this->exporter->setUser($this->user);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);
+            $this->exporter = app(ExportDataGenerator::class);
+            $this->exporter->setUserGroup($this->userGroup);
+            $this->exporter->setUser($this->user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -74,33 +72,6 @@ class ExportController extends Controller
        return $this->returnExport('accounts');
    }

-    /**
-     * @throws FireflyException
-     * @throws DatetimeException
-     */
-    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((string) $data[$key]))
-        ;
-
-        return $response;
-    }
-
    /**
     * @throws DatetimeException
     * @throws FireflyException
@@ -206,4 +177,31 @@ class ExportController extends Controller

        return $this->returnExport('transactions');
    }
+
+    /**
+     * @throws FireflyException
+     * @throws DatetimeException
+     */
+    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((string) $data[$key]))
+        ;
+
+        return $response;
+    }
 }
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Account;
@@ -40,6 +39,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 /**
 * Class PurgeController
@@ -51,13 +51,11 @@ class PurgeController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->validateUserGroup($request);
+        $this->middleware(function (Request $request, $next) {
+            $this->validateUserGroup($request);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -42,7 +42,7 @@ class AccountController extends Controller
    use ApiSupport;

    private OperationsRepositoryInterface $opsRepository;
-    private AccountRepositoryInterface    $repository;
+    private AccountRepositoryInterface $repository;

    /**
     * AccountController constructor.
@@ -50,18 +50,16 @@ class AccountController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $user                = auth()->user();
-                $this->repository    = app(AccountRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $user                = auth()->user();
+            $this->repository    = app(AccountRepositoryInterface::class);
+            $this->repository->setUser($user);

-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->opsRepository->setUser($user);
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->opsRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function asset(GenericRequest $request): JsonResponse
@@ -46,15 +46,13 @@ class BillController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $user             = auth()->user();
-                $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $user             = auth()->user();
+            $this->repository = app(BillRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -97,7 +95,14 @@ class BillController extends Controller
            if ($convertToPrimary && $journal['currency_id'] !== $primary->id && $primary->id === $journal['foreign_currency_id']) {
                $field = 'foreign_amount';
            }
-            Log::debug(sprintf('Journal #%d in bill #%d will use %s (%s %s)', $journal['transaction_group_id'], $billId, $field, $currencyCode, $journal[$field] ?? '0'));
+            Log::debug(sprintf(
+                'Journal #%d in bill #%d will use %s (%s %s)',
+                $journal['transaction_group_id'],
+                $billId,
+                $field,
+                $currencyCode,
+                $journal[$field] ?? '0'
+            ));

            $key          = sprintf('%d-%d', $billId, $currencyId);

@@ -38,9 +38,9 @@ use Illuminate\Support\Collection;
 */
 class BudgetController extends Controller
 {
-    private NoBudgetRepositoryInterface   $noRepository;
+    private NoBudgetRepositoryInterface $noRepository;
    private OperationsRepositoryInterface $opsRepository;
-    private BudgetRepositoryInterface     $repository;
+    private BudgetRepositoryInterface $repository;

    /**
     * AccountController constructor.
@@ -48,19 +48,17 @@ class BudgetController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->repository    = app(BudgetRepositoryInterface::class);
-                $this->noRepository  = app(NoBudgetRepositoryInterface::class);
-                $user                = auth()->user();
-                $this->opsRepository->setUser($user);
-                $this->repository->setUser($user);
-                $this->noRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->repository    = app(BudgetRepositoryInterface::class);
+            $this->noRepository  = app(NoBudgetRepositoryInterface::class);
+            $user                = auth()->user();
+            $this->opsRepository->setUser($user);
+            $this->repository->setUser($user);
+            $this->noRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function budget(GenericRequest $request): JsonResponse
@@ -40,7 +40,7 @@ class CategoryController extends Controller
 {
    private NoCategoryRepositoryInterface $noRepository;
    private OperationsRepositoryInterface $opsRepository;
-    private CategoryRepositoryInterface   $repository;
+    private CategoryRepositoryInterface $repository;

    /**
     * AccountController constructor.
@@ -48,19 +48,17 @@ class CategoryController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->repository    = app(CategoryRepositoryInterface::class);
-                $this->noRepository  = app(NoCategoryRepositoryInterface::class);
-                $user                = auth()->user();
-                $this->opsRepository->setUser($user);
-                $this->repository->setUser($user);
-                $this->noRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->repository    = app(CategoryRepositoryInterface::class);
+            $this->noRepository  = app(NoCategoryRepositoryInterface::class);
+            $user                = auth()->user();
+            $this->opsRepository->setUser($user);
+            $this->repository->setUser($user);
+            $this->noRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function category(GenericRequest $request): JsonResponse
@@ -73,7 +73,6 @@ class PeriodController extends Controller
                $amount = $journal['amount'];
            }

-
            $response[$currencyId] ??= [
                'difference'       => '0',
                'difference_float' => 0,
@@ -46,14 +46,12 @@ class TagController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(TagRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(TagRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -42,7 +42,7 @@ class AccountController extends Controller
    use ApiSupport;

    private OperationsRepositoryInterface $opsRepository;
-    private AccountRepositoryInterface    $repository;
+    private AccountRepositoryInterface $repository;

    /**
     * AccountController constructor.
@@ -50,18 +50,16 @@ class AccountController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $user                = auth()->user();
-                $this->repository    = app(AccountRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $user                = auth()->user();
+            $this->repository    = app(AccountRepositoryInterface::class);
+            $this->repository->setUser($user);

-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->opsRepository->setUser($user);
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->opsRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function asset(GenericRequest $request): JsonResponse
@@ -40,7 +40,7 @@ class CategoryController extends Controller
 {
    private NoCategoryRepositoryInterface $noRepository;
    private OperationsRepositoryInterface $opsRepository;
-    private CategoryRepositoryInterface   $repository;
+    private CategoryRepositoryInterface $repository;

    /**
     * AccountController constructor.
@@ -48,19 +48,17 @@ class CategoryController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->repository    = app(CategoryRepositoryInterface::class);
-                $this->noRepository  = app(NoCategoryRepositoryInterface::class);
-                $user                = auth()->user();
-                $this->opsRepository->setUser($user);
-                $this->repository->setUser($user);
-                $this->noRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->repository    = app(CategoryRepositoryInterface::class);
+            $this->noRepository  = app(NoCategoryRepositoryInterface::class);
+            $user                = auth()->user();
+            $this->opsRepository->setUser($user);
+            $this->repository->setUser($user);
+            $this->noRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function category(GenericRequest $request): JsonResponse
@@ -46,15 +46,13 @@ class TagController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $user             = auth()->user();
-                $this->repository = app(TagRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $user             = auth()->user();
+            $this->repository = app(TagRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -100,7 +98,6 @@ class TagController extends Controller
            ];
            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], Steam::positive($journal[$field]));
            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
-
        }

        return response()->json(array_values($response));
@@ -161,7 +158,10 @@ class TagController extends Controller
                        'currency_id'      => (string) $foreignCurrencyId,
                        'currency_code'    => $journal['foreign_currency_code'],
                    ];
-                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
+                    $response[$foreignKey]['difference']       = bcadd(
+                        (string) $response[$foreignKey]['difference'],
+                        Steam::positive($journal['foreign_amount'])
+                    );
                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                }
            }
@@ -45,15 +45,13 @@ class AccountController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $user                = auth()->user();
-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->opsRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $user                = auth()->user();
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->opsRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function asset(GenericRequest $request): JsonResponse
@@ -40,7 +40,7 @@ class CategoryController extends Controller
 {
    private NoCategoryRepositoryInterface $noRepository;
    private OperationsRepositoryInterface $opsRepository;
-    private CategoryRepositoryInterface   $repository;
+    private CategoryRepositoryInterface $repository;

    /**
     * AccountController constructor.
@@ -48,19 +48,17 @@ class CategoryController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->repository    = app(CategoryRepositoryInterface::class);
-                $this->noRepository  = app(NoCategoryRepositoryInterface::class);
-                $user                = auth()->user();
-                $this->opsRepository->setUser($user);
-                $this->repository->setUser($user);
-                $this->noRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $this->opsRepository = app(OperationsRepositoryInterface::class);
+            $this->repository    = app(CategoryRepositoryInterface::class);
+            $this->noRepository  = app(NoCategoryRepositoryInterface::class);
+            $user                = auth()->user();
+            $this->opsRepository->setUser($user);
+            $this->repository->setUser($user);
+            $this->noRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function category(GenericRequest $request): JsonResponse
@@ -74,7 +74,6 @@ class PeriodController extends Controller
            ];
            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], Steam::positive($journal[$field]));
            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
-
        }

        return response()->json(array_values($response));
@@ -46,15 +46,13 @@ class TagController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $user             = auth()->user();
-                $this->repository = app(TagRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            $user             = auth()->user();
+            $this->repository = app(TagRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function noTag(GenericRequest $request): JsonResponse
@@ -66,7 +64,6 @@ class TagController extends Controller
        $convertToPrimary = Amount::convertToPrimary();
        $primary          = Amount::getPrimaryCurrency();

-
        // collect all expenses in this period (regardless of type) by the given bills and accounts.
        $collector        = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionTypeEnum::TRANSFER->value])->setRange($start, $end)->setDestinationAccounts($accounts);
@@ -98,7 +95,6 @@ class TagController extends Controller
            ];
            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], Steam::positive($journal[$field]));
            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
-
        }

        return response()->json(array_values($response));
@@ -45,14 +45,12 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\Account;

 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Generic\PaginationDateRangeRequest;
+use FireflyIII\Api\V1\Requests\Models\Transaction\ListRequest;
 use FireflyIII\Api\V1\Requests\PaginationRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
@@ -60,37 +60,31 @@ class ListController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function attachments(PaginationRequest $request, Account $account): JsonResponse
    {
-        $manager     = $this->getManager();
-        [
-            'limit'  => $limit,
-            'offset' => $offset,
-            'page'   => $page,
-        ]            = $request->attributes->all();
-        $collection  = $this->repository->getAttachments($account);
+        $manager                                                     = $this->getManager();
+        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();
+        $collection                                                  = $this->repository->getAttachments($account);

-        $count       = $collection->count();
-        $attachments = $collection->slice($offset, $limit);
+        $count                                                       = $collection->count();
+        $attachments                                                 = $collection->slice($offset, $limit);

        // make paginator:
-        $paginator   = new LengthAwarePaginator($attachments, $count, $limit, $page);
+        $paginator                                                   = new LengthAwarePaginator($attachments, $count, $limit, $page);
        $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams());

        /** @var AttachmentTransformer $transformer */
-        $transformer = app(AttachmentTransformer::class);
+        $transformer                                                 = app(AttachmentTransformer::class);

-        $resource    = new FractalCollection($attachments, $transformer, 'attachments');
+        $resource                                                    = new FractalCollection($attachments, $transformer, 'attachments');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -99,35 +93,31 @@ class ListController extends Controller
    public function piggyBanks(PaginationRequest $request, Account $account): JsonResponse
    {
        // create some objects:
-        $manager     = $this->getManager();
+        $manager                                                     = $this->getManager();

-        [
-            'limit'  => $limit,
-            'offset' => $offset,
-            'page'   => $page,
-        ]            = $request->attributes->all();
+        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();

        // get list of piggy banks. Count it and split it.
-        $collection  = $this->repository->getPiggyBanks($account);
-        $count       = $collection->count();
-        $piggyBanks  = $collection->slice($offset, $limit);
+        $collection                                                  = $this->repository->getPiggyBanks($account);
+        $count                                                       = $collection->count();
+        $piggyBanks                                                  = $collection->slice($offset, $limit);

        // enrich
        /** @var User $admin */
-        $admin       = auth()->user();
-        $enrichment  = new PiggyBankEnrichment();
+        $admin                                                       = auth()->user();
+        $enrichment                                                  = new PiggyBankEnrichment();
        $enrichment->setUser($admin);
-        $piggyBanks  = $enrichment->enrich($piggyBanks);
+        $piggyBanks                                                  = $enrichment->enrich($piggyBanks);

        // make paginator:
-        $paginator   = new LengthAwarePaginator($piggyBanks, $count, $limit, $page);
+        $paginator                                                   = new LengthAwarePaginator($piggyBanks, $count, $limit, $page);
        $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams());

        /** @var PiggyBankTransformer $transformer */
-        $transformer = app(PiggyBankTransformer::class);
+        $transformer                                                 = app(PiggyBankTransformer::class);
        // $transformer->setParameters($this->parameters);

-        $resource    = new FractalCollection($piggyBanks, $transformer, 'piggy-banks');
+        $resource                                                    = new FractalCollection($piggyBanks, $transformer, 'piggy-banks');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -136,14 +126,14 @@ class ListController extends Controller
    /**
     * Show all transaction groups related to the account.
     */
-    public function transactions(PaginationDateRangeRequest $request, Account $account): JsonResponse
+    public function transactions(ListRequest $request, Account $account): JsonResponse
    {
        [
-            'limit'  => $limit,
-            'page'   => $page,
-            'start'  => $start,
-            'end'    => $end,
-            'types'  => $types,
+            'limit' => $limit,
+            'page'  => $page,
+            'start' => $start,
+            'end'   => $end,
+            'types' => $types,
        ]             = $request->attributes->all();
        $manager      = $this->getManager();

@@ -55,14 +55,12 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -80,8 +78,7 @@ class ShowController extends Controller
            'start'  => $start,
            'end'    => $end,
            'date'   => $date,
-        ]
-                     = $request->attributes->all();
+        ]            = $request->attributes->all();
        // get list of accounts. Count it and split it.
        $this->repository->resetAccountOrder();
        $collection  = $this->repository->getAccountsByType($types, $sort);
@@ -127,25 +124,22 @@ class ShowController extends Controller
        // get list of accounts. Count it and split it.
        $this->repository->resetAccountOrder();
        $account->refresh();
-        $manager                = $this->getManager();
-        ['start'     => $start,
-            'end'    => $end,
-            'date'   => $date,] = $request->attributes->all();
+        $manager                                               = $this->getManager();
+        ['start' => $start, 'end'   => $end, 'date'  => $date] = $request->attributes->all();

        // enrich
        /** @var User $admin */
-        $admin                  = auth()->user();
-        $enrichment             = new AccountEnrichment();
+        $admin                                                 = auth()->user();
+        $enrichment                                            = new AccountEnrichment();
        $enrichment->setDate($date);
        $enrichment->setStart($start);
        $enrichment->setEnd($end);
        $enrichment->setUser($admin);
-        $account                = $enrichment->enrichSingle($account);
-
+        $account                                               = $enrichment->enrichSingle($account);

        /** @var AccountTransformer $transformer */
-        $transformer            = app(AccountTransformer::class);
-        $resource               = new Item($account, $transformer, self::RESOURCE_KEY);
+        $transformer                                           = app(AccountTransformer::class);
+        $resource                                              = new Item($account, $transformer, self::RESOURCE_KEY);

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
@@ -48,14 +48,12 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -51,14 +51,12 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(AccountRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -48,16 +48,14 @@ class DestroyController extends Controller
    {
        parent::__construct();
        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(AttachmentRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(AttachmentRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -55,16 +55,14 @@ class ShowController extends Controller
    {
        parent::__construct();
        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(AttachmentRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(AttachmentRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -123,11 +121,7 @@ class ShowController extends Controller
     */
    public function index(PaginationRequest $request): JsonResponse
    {
-        [
-            'limit'  => $limit,
-            'offset' => $offset,
-            'page'   => $page,
-        ]            = $request->attributes->all();
+        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();

        if (true === auth()->user()->hasRole('demo')) {
            Log::channel('audit')->warning(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
@@ -135,21 +129,21 @@ class ShowController extends Controller
            throw new NotFoundHttpException();
        }

-        $manager     = $this->getManager();
+        $manager                                                     = $this->getManager();

        // get list of attachments. Count it and split it.
-        $collection  = $this->repository->get();
-        $count       = $collection->count();
-        $attachments = $collection->slice($offset, $limit);
+        $collection                                                  = $this->repository->get();
+        $count                                                       = $collection->count();
+        $attachments                                                 = $collection->slice($offset, $limit);

        // make paginator:
-        $paginator   = new LengthAwarePaginator($attachments, $count, $limit, $page);
+        $paginator                                                   = new LengthAwarePaginator($attachments, $count, $limit, $page);
        $paginator->setPath(route('api.v1.attachments.index').$this->buildParams());

        /** @var AttachmentTransformer $transformer */
-        $transformer = app(AttachmentTransformer::class);
+        $transformer                                                 = app(AttachmentTransformer::class);

-        $resource    = new FractalCollection($attachments, $transformer, 'attachments');
+        $resource                                                    = new FractalCollection($attachments, $transformer, 'attachments');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -53,16 +53,14 @@ class StoreController extends Controller
    {
        parent::__construct();
        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(AttachmentRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(AttachmentRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -50,16 +50,14 @@ class UpdateController extends Controller
    {
        parent::__construct();
        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(AttachmentRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(AttachmentRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -50,16 +50,14 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
-                $this->abRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user               = auth()->user();
+            $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
+            $this->abRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -70,35 +68,29 @@ class ShowController extends Controller
     */
    public function index(PaginationDateRangeRequest $request): JsonResponse
    {
-        $manager          = $this->getManager();
-        [
-            'limit'  => $limit,
-            'offset' => $offset,
-            'page'   => $page,
-            'start'  => $start,
-            'end'    => $end,
-        ]                 = $request->attributes->all();
+        $manager                                                                                           = $this->getManager();
+        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page, 'start'  => $start, 'end'    => $end] = $request->attributes->all();

        // get list of available budgets. Count it and split it.
-        $collection       = $this->abRepository->getAvailableBudgetsByDate($start, $end);
-        $count            = $collection->count();
-        $availableBudgets = $collection->slice($offset, $limit);
+        $collection                                                                                        = $this->abRepository->getAvailableBudgetsByDate($start, $end);
+        $count                                                                                             = $collection->count();
+        $availableBudgets                                                                                  = $collection->slice($offset, $limit);

        // enrich
        /** @var User $admin */
-        $admin            = auth()->user();
-        $enrichment       = new AvailableBudgetEnrichment();
+        $admin                                                                                             = auth()->user();
+        $enrichment                                                                                        = new AvailableBudgetEnrichment();
        $enrichment->setUser($admin);
-        $availableBudgets = $enrichment->enrich($availableBudgets);
+        $availableBudgets                                                                                  = $enrichment->enrich($availableBudgets);

        // make paginator:
-        $paginator        = new LengthAwarePaginator($availableBudgets, $count, $limit, $page);
+        $paginator                                                                                         = new LengthAwarePaginator($availableBudgets, $count, $limit, $page);
        $paginator->setPath(route('api.v1.available-budgets.index').$this->buildParams());

        /** @var AvailableBudgetTransformer $transformer */
-        $transformer      = app(AvailableBudgetTransformer::class);
+        $transformer                                                                                       = app(AvailableBudgetTransformer::class);

-        $resource         = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
+        $resource                                                                                          = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -126,7 +118,6 @@ class ShowController extends Controller
        $enrichment->setUser($admin);
        $availableBudget = $enrichment->enrichSingle($availableBudget);

-
        $resource        = new Item($availableBudget, $transformer, 'available_budgets');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -43,14 +43,12 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BillRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -56,14 +56,12 @@ class ListController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BillRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -74,25 +72,21 @@ class ListController extends Controller
     */
    public function attachments(PaginationRequest $request, Bill $bill): JsonResponse
    {
-        [
-            'limit'  => $limit,
-            'offset' => $offset,
-            'page'   => $page,
-        ]            = $request->attributes->all();
-        $manager     = $this->getManager();
-        $collection  = $this->repository->getAttachments($bill);
+        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();
+        $manager                                                     = $this->getManager();
+        $collection                                                  = $this->repository->getAttachments($bill);

-        $count       = $collection->count();
-        $attachments = $collection->slice($offset, $limit);
+        $count                                                       = $collection->count();
+        $attachments                                                 = $collection->slice($offset, $limit);

        // make paginator:
-        $paginator   = new LengthAwarePaginator($attachments, $count, $limit, $page);
+        $paginator                                                   = new LengthAwarePaginator($attachments, $count, $limit, $page);
        $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]).$this->buildParams());

        /** @var AttachmentTransformer $transformer */
-        $transformer = app(AttachmentTransformer::class);
+        $transformer                                                 = app(AttachmentTransformer::class);

-        $resource    = new FractalCollection($attachments, $transformer, 'attachments');
+        $resource                                                    = new FractalCollection($attachments, $transformer, 'attachments');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -106,24 +100,20 @@ class ListController extends Controller
     */
    public function rules(PaginationRequest $request, Bill $bill): JsonResponse
    {
-        [
-            'limit'  => $limit,
-            'offset' => $offset,
-            'page'   => $page,
-        ]            = $request->attributes->all();
+        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();

-        $manager     = $this->getManager();
-        $collection  = $this->repository->getRulesForBill($bill);
-        $count       = $collection->count();
-        $rules       = $collection->slice($offset, $limit);
+        $manager                                                     = $this->getManager();
+        $collection                                                  = $this->repository->getRulesForBill($bill);
+        $count                                                       = $collection->count();
+        $rules                                                       = $collection->slice($offset, $limit);

        // make paginator:
-        $paginator   = new LengthAwarePaginator($rules, $count, $limit, $page);
+        $paginator                                                   = new LengthAwarePaginator($rules, $count, $limit, $page);
        $paginator->setPath(route('api.v1.bills.rules', [$bill->id]).$this->buildParams());

        /** @var RuleTransformer $transformer */
-        $transformer = app(RuleTransformer::class);
-        $resource    = new FractalCollection($rules, $transformer, 'rules');
+        $transformer                                                 = app(RuleTransformer::class);
+        $resource                                                    = new FractalCollection($rules, $transformer, 'rules');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -137,22 +127,16 @@ class ListController extends Controller
     */
    public function transactions(PaginationDateRangeRequest $request, Bill $bill): JsonResponse
    {
-        [
-            'limit'  => $limit,
-            'page'   => $page,
-            'types'  => $types,
-            'start'  => $start,
-            'end'    => $end,
-        ]             = $request->attributes->all();
+        ['limit' => $limit, 'page'  => $page, 'types' => $types, 'start' => $start, 'end'   => $end] = $request->attributes->all();

-        $manager      = $this->getManager();
+        $manager                                                                                     = $this->getManager();

        /** @var User $admin */
-        $admin        = auth()->user();
+        $admin                                                                                       = auth()->user();

        // use new group collector:
        /** @var GroupCollectorInterface $collector */
-        $collector    = app(GroupCollectorInterface::class);
+        $collector                                                                                   = app(GroupCollectorInterface::class);
        $collector
            ->setUser($admin)
            // include source + destination account name and type.
@@ -175,18 +159,18 @@ class ListController extends Controller
        }

        // get paginator.
-        $paginator    = $collector->getPaginatedGroups();
+        $paginator                                                                                   = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());

        // enrich
-        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment                                                                                  = new TransactionGroupEnrichment();
        $enrichment->setUser($admin);
-        $transactions = $enrichment->enrich($paginator->getCollection());
+        $transactions                                                                                = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
-        $transformer  = app(TransactionGroupTransformer::class);
+        $transformer                                                                                 = app(TransactionGroupTransformer::class);

-        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource                                                                                    = new FractalCollection($transactions, $transformer, 'transactions');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -51,14 +51,12 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BillRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -69,34 +67,28 @@ class ShowController extends Controller
     */
    public function index(PaginationDateRangeRequest $request): JsonResponse
    {
-        [
-            'limit'  => $limit,
-            'offset' => $offset,
-            'start'  => $start,
-            'end'    => $end,
-            'page'   => $page,
-        ]            = $request->attributes->all();
+        ['limit'  => $limit, 'offset' => $offset, 'start'  => $start, 'end'    => $end, 'page'   => $page] = $request->attributes->all();

        $this->repository->correctOrder();
-        $bills       = $this->repository->getBills();
-        $manager     = $this->getManager();
-        $count       = $bills->count();
-        $bills       = $bills->slice($offset, $limit);
-        $paginator   = new LengthAwarePaginator($bills, $count, $limit, $page);
+        $bills                                                                                             = $this->repository->getBills();
+        $manager                                                                                           = $this->getManager();
+        $count                                                                                             = $bills->count();
+        $bills                                                                                             = $bills->slice($offset, $limit);
+        $paginator                                                                                         = new LengthAwarePaginator($bills, $count, $limit, $page);

        // enrich
        /** @var User $admin */
-        $admin       = auth()->user();
-        $enrichment  = new SubscriptionEnrichment();
+        $admin                                                                                             = auth()->user();
+        $enrichment                                                                                        = new SubscriptionEnrichment();
        $enrichment->setUser($admin);
        $enrichment->setStart($start);
        $enrichment->setEnd($end);
-        $bills       = $enrichment->enrich($bills);
+        $bills                                                                                             = $enrichment->enrich($bills);

        /** @var BillTransformer $transformer */
-        $transformer = app(BillTransformer::class);
+        $transformer                                                                                       = app(BillTransformer::class);

-        $resource    = new FractalCollection($bills, $transformer, 'bills');
+        $resource                                                                                          = new FractalCollection($bills, $transformer, 'bills');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -110,26 +102,23 @@ class ShowController extends Controller
     */
    public function show(DateRangeRequest $request, Bill $bill): JsonResponse
    {
-        [
-            'start'  => $start,
-            'end'    => $end,
-        ]            = $request->attributes->all();
+        ['start' => $start, 'end'   => $end] = $request->attributes->all();

-        $manager     = $this->getManager();
+        $manager                             = $this->getManager();

        // enrich
        /** @var User $admin */
-        $admin       = auth()->user();
-        $enrichment  = new SubscriptionEnrichment();
+        $admin                               = auth()->user();
+        $enrichment                          = new SubscriptionEnrichment();
        $enrichment->setUser($admin);
        $enrichment->setStart($start);
        $enrichment->setEnd($end);
-        $bill        = $enrichment->enrichSingle($bill);
+        $bill                                = $enrichment->enrichSingle($bill);

        /** @var BillTransformer $transformer */
-        $transformer = app(BillTransformer::class);
+        $transformer                         = app(BillTransformer::class);

-        $resource    = new Item($bill, $transformer, 'bills');
+        $resource                            = new Item($bill, $transformer, 'bills');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
@@ -50,14 +50,12 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BillRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,14 +47,12 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BillRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -43,14 +43,12 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BudgetRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BudgetRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -49,7 +49,7 @@ class ListController extends Controller
    use TransactionFilter;

    private BudgetLimitRepositoryInterface $blRepository;
-    private BudgetRepositoryInterface      $repository;
+    private BudgetRepositoryInterface $repository;

    /**
     * ListController constructor.
@@ -57,16 +57,14 @@ class ListController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository   = app(BudgetRepositoryInterface::class);
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
-                $this->blRepository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository   = app(BudgetRepositoryInterface::class);
+            $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());
+            $this->blRepository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -120,7 +118,6 @@ class ListController extends Controller
        $enrichment->setUser($admin);
        $budgetLimits = $enrichment->enrich($budgetLimits);

-
        /** @var BudgetLimitTransformer $transformer */
        $transformer  = app(BudgetLimitTransformer::class);
        $transformer->setParameters($this->parameters);
@@ -43,7 +43,7 @@ use League\Fractal\Resource\Item;
 class ShowController extends Controller
 {
    private BudgetLimitRepositoryInterface $blRepository;
-    private BudgetRepositoryInterface      $repository;
+    private BudgetRepositoryInterface $repository;

    /**
     * ListController constructor.
@@ -51,16 +51,14 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository   = app(BudgetRepositoryInterface::class);
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
-                $this->blRepository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository   = app(BudgetRepositoryInterface::class);
+            $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());
+            $this->blRepository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,14 +47,12 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BudgetRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BudgetRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,14 +47,12 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(BudgetRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(BudgetRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function update(UpdateRequest $request, Budget $budget): JsonResponse
@@ -46,16 +46,14 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->blRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user               = auth()->user();
+            $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+            $this->blRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,7 +47,7 @@ use League\Fractal\Resource\Item;
 class ShowController extends Controller
 {
    private BudgetLimitRepositoryInterface $blRepository;
-    private BudgetRepositoryInterface      $repository;
+    private BudgetRepositoryInterface $repository;

    /**
     * BudgetLimitController constructor.
@@ -55,18 +55,16 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->repository   = app(BudgetRepositoryInterface::class);
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->repository->setUser($user);
-                $this->blRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user               = auth()->user();
+            $this->repository   = app(BudgetRepositoryInterface::class);
+            $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+            $this->repository->setUser($user);
+            $this->blRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -88,7 +86,6 @@ class ShowController extends Controller
        /** @var Budget $budget */
        $budget       = $enrichment->enrichSingle($budget);

-
        $manager      = $this->getManager();
        $manager->parseIncludes('budget');
        $pageSize     = $this->parameters->get('limit');
@@ -47,16 +47,14 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->blRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user               = auth()->user();
+            $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+            $this->blRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -52,16 +52,14 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->blRepository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user               = auth()->user();
+            $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+            $this->blRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -43,14 +43,12 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(CategoryRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -54,14 +54,12 @@ class ListController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(CategoryRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -49,14 +49,12 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(CategoryRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,14 +47,12 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(CategoryRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,14 +47,12 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(CategoryRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

-use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest;
@@ -35,26 +34,26 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 class DestroyController extends Controller
 {
    use ValidatesUserGroupTrait;

    public const string RESOURCE_KEY = 'exchange-rates';
+
    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
    private ExchangeRateRepositoryInterface $repository;

    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->repository = app(ExchangeRateRepositoryInterface::class);
-                $this->repository->setUserGroup($this->validateUserGroup($request));
+        $this->middleware(function (Request $request, $next) {
+            $this->repository = app(ExchangeRateRepositoryInterface::class);
+            $this->repository->setUserGroup($this->validateUserGroup($request));

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function destroy(DestroyRequest $request, TransactionCurrency $from, TransactionCurrency $to): JsonResponse
@@ -64,13 +63,6 @@ class DestroyController extends Controller
        return response()->json([], 204);
    }

-    public function destroySingleById(CurrencyExchangeRate $exchangeRate): JsonResponse
-    {
-        $this->repository->deleteRate($exchangeRate);
-
-        return response()->json([], 204);
-    }
-
    public function destroySingleByDate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): JsonResponse
    {
        $exchangeRate = $this->repository->getSpecificRateOnDate($from, $to, $date);
@@ -83,4 +75,11 @@ class DestroyController extends Controller

        return response()->json([], 204);
    }
+
+    public function destroySingleById(CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $this->repository->deleteRate($exchangeRate);
+
+        return response()->json([], 204);
+    }
 }
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;

 /**
@@ -41,20 +41,19 @@ class IndexController extends Controller
    use ValidatesUserGroupTrait;

    public const string RESOURCE_KEY = 'exchange-rates';
+
    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
    private ExchangeRateRepositoryInterface $repository;

    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->repository = app(ExchangeRateRepositoryInterface::class);
-                $this->repository->setUserGroup($this->validateUserGroup($request));
+        $this->middleware(function (Request $request, $next) {
+            $this->repository = app(ExchangeRateRepositoryInterface::class);
+            $this->repository->setUserGroup($this->validateUserGroup($request));

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function index(): JsonResponse
@@ -67,9 +66,6 @@ class IndexController extends Controller
        $transformer = new ExchangeRateTransformer();
        $transformer->setParameters($this->parameters); // give params to transformer

-        return response()
-            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
+        return response()->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))->header('Content-Type', self::CONTENT_TYPE);
    }
 }
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

-use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Enums\UserRoleEnum;
@@ -34,6 +33,7 @@ use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

@@ -45,20 +45,19 @@ class ShowController extends Controller
    use ValidatesUserGroupTrait;

    public const string RESOURCE_KEY = 'exchange-rates';
+
    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
    private ExchangeRateRepositoryInterface $repository;

    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->repository = app(ExchangeRateRepositoryInterface::class);
-                $this->repository->setUserGroup($this->validateUserGroup($request));
+        $this->middleware(function (Request $request, $next) {
+            $this->repository = app(ExchangeRateRepositoryInterface::class);
+            $this->repository->setUserGroup($this->validateUserGroup($request));

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function show(TransactionCurrency $from, TransactionCurrency $to): JsonResponse
@@ -73,21 +72,7 @@ class ShowController extends Controller
        $transformer = new ExchangeRateTransformer();
        $transformer->setParameters($this->parameters); // give params to transformer

-        return response()
-            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
-    }
-
-    public function showSingleById(CurrencyExchangeRate $exchangeRate): JsonResponse
-    {
-        $transformer = new ExchangeRateTransformer();
-        $transformer->setParameters($this->parameters);
-
-        return response()
-            ->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
+        return response()->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))->header('Content-Type', self::CONTENT_TYPE);
    }

    public function showSingleByDate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): JsonResponse
@@ -100,9 +85,14 @@ class ShowController extends Controller
            throw new NotFoundHttpException();
        }

-        return response()
-            ->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
+        return response()->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    public function showSingleById(CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))->header('Content-Type', self::CONTENT_TYPE);
    }
 }
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

-use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreByCurrenciesRequest;
@@ -38,6 +37,7 @@ use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;

@@ -45,83 +45,20 @@ class StoreController extends Controller
 {
    use ValidatesUserGroupTrait;

-    public const string RESOURCE_KEY                       = 'exchange-rates';
-    protected array                         $acceptedRoles = [UserRoleEnum::OWNER];
+    public const string RESOURCE_KEY = 'exchange-rates';
+
+    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
    private ExchangeRateRepositoryInterface $repository;

    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->repository = app(ExchangeRateRepositoryInterface::class);
-                $this->repository->setUserGroup($this->validateUserGroup($request));
+        $this->middleware(function (Request $request, $next) {
+            $this->repository = app(ExchangeRateRepositoryInterface::class);
+            $this->repository->setUserGroup($this->validateUserGroup($request));

-                return $next($request);
-            }
-        );
-    }
-
-    public function storeByCurrencies(StoreByCurrenciesRequest $request, TransactionCurrency $from, TransactionCurrency $to): JsonResponse
-    {
-
-        $data        = $request->getAll();
-        $collection  = new Collection();
-
-        foreach ($data as $date => $rate) {
-            $date     = Carbon::createFromFormat('Y-m-d', $date);
-            $existing = $this->repository->getSpecificRateOnDate($from, $to, $date);
-            if ($existing instanceof CurrencyExchangeRate) {
-                // update existing rate.
-                $existing = $this->repository->updateExchangeRate($existing, $rate);
-                $collection->push($existing);
-
-                continue;
-            }
-            $new      = $this->repository->storeExchangeRate($from, $to, $rate, $date);
-            $collection->push($new);
-        }
-
-        $count       = $collection->count();
-        $paginator   = new LengthAwarePaginator($collection, $count, $count, 1);
-        $transformer = new ExchangeRateTransformer();
-        $transformer->setParameters($this->parameters); // give params to transformer
-
-        return response()
-            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
-    }
-
-    public function storeByDate(StoreByDateRequest $request, Carbon $date): JsonResponse
-    {
-
-        $data        = $request->getAll();
-        $from        = $request->getFromCurrency();
-        $collection  = new Collection();
-        foreach ($data['rates'] as $key => $rate) {
-            $to       = Amount::getTransactionCurrencyByCode($key);
-            $existing = $this->repository->getSpecificRateOnDate($from, $to, $date);
-            if ($existing instanceof CurrencyExchangeRate) {
-                // update existing rate.
-                $existing = $this->repository->updateExchangeRate($existing, $rate);
-                $collection->push($existing);
-
-                continue;
-            }
-            $new      = $this->repository->storeExchangeRate($from, $to, $rate, $date);
-            $collection->push($new);
-        }
-
-        $count       = $collection->count();
-        $paginator   = new LengthAwarePaginator($collection, $count, $count, 1);
-        $transformer = new ExchangeRateTransformer();
-        $transformer->setParameters($this->parameters); // give params to transformer
-
-        return response()
-            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
+            return $next($request);
+        });
    }

    public function store(StoreRequest $request): JsonResponse
@@ -145,9 +82,60 @@ class StoreController extends Controller
        $transformer = new ExchangeRateTransformer();
        $transformer->setParameters($this->parameters);

-        return response()
-            ->api($this->jsonApiObject(self::RESOURCE_KEY, $rate, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
+        return response()->api($this->jsonApiObject(self::RESOURCE_KEY, $rate, $transformer))->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    public function storeByCurrencies(StoreByCurrenciesRequest $request, TransactionCurrency $from, TransactionCurrency $to): JsonResponse
+    {
+        $data        = $request->getAll();
+        $collection  = new Collection();
+
+        foreach ($data as $date => $rate) {
+            $date     = Carbon::createFromFormat('Y-m-d', $date);
+            $existing = $this->repository->getSpecificRateOnDate($from, $to, $date);
+            if ($existing instanceof CurrencyExchangeRate) {
+                // update existing rate.
+                $existing = $this->repository->updateExchangeRate($existing, $rate);
+                $collection->push($existing);
+
+                continue;
+            }
+            $new      = $this->repository->storeExchangeRate($from, $to, $rate, $date);
+            $collection->push($new);
+        }
+
+        $count       = $collection->count();
+        $paginator   = new LengthAwarePaginator($collection, $count, $count, 1);
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    public function storeByDate(StoreByDateRequest $request, Carbon $date): JsonResponse
+    {
+        $data        = $request->getAll();
+        $from        = $request->getFromCurrency();
+        $collection  = new Collection();
+        foreach ($data['rates'] as $key => $rate) {
+            $to       = Amount::getTransactionCurrencyByCode($key);
+            $existing = $this->repository->getSpecificRateOnDate($from, $to, $date);
+            if ($existing instanceof CurrencyExchangeRate) {
+                // update existing rate.
+                $existing = $this->repository->updateExchangeRate($existing, $rate);
+                $collection->push($existing);
+
+                continue;
+            }
+            $new      = $this->repository->storeExchangeRate($from, $to, $rate, $date);
+            $collection->push($new);
+        }
+
+        $count       = $collection->count();
+        $paginator   = new LengthAwarePaginator($collection, $count, $count, 1);
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))->header('Content-Type', self::CONTENT_TYPE);
    }
 }
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

-use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\UpdateRequest;
@@ -35,41 +34,27 @@ use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 class UpdateController extends Controller
 {
    use ValidatesUserGroupTrait;

-    public const string RESOURCE_KEY                       = 'exchange-rates';
-    protected array                         $acceptedRoles = [UserRoleEnum::OWNER];
+    public const string RESOURCE_KEY = 'exchange-rates';
+
+    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
    private ExchangeRateRepositoryInterface $repository;

    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function (Request $request, $next) {
-                $this->repository = app(ExchangeRateRepositoryInterface::class);
-                $this->repository->setUserGroup($this->validateUserGroup($request));
+        $this->middleware(function (Request $request, $next) {
+            $this->repository = app(ExchangeRateRepositoryInterface::class);
+            $this->repository->setUserGroup($this->validateUserGroup($request));

-                return $next($request);
-            }
-        );
-    }
-
-    public function updateById(UpdateRequest $request, CurrencyExchangeRate $exchangeRate): JsonResponse
-    {
-        $date         = $request->getDate();
-        $rate         = $request->getRate();
-        $exchangeRate = $this->repository->updateExchangeRate($exchangeRate, $rate, $date);
-        $transformer  = new ExchangeRateTransformer();
-        $transformer->setParameters($this->parameters);
-
-        return response()
-            ->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
+            return $next($request);
+        });
    }

    public function updateByDate(UpdateRequest $request, TransactionCurrency $from, TransactionCurrency $to, Carbon $date): JsonResponse
@@ -84,9 +69,17 @@ class UpdateController extends Controller

        $transformer  = new ExchangeRateTransformer();

-        return response()
-            ->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
+        return response()->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    public function updateById(UpdateRequest $request, CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $date         = $request->getDate();
+        $rate         = $request->getRate();
+        $exchangeRate = $this->repository->updateExchangeRate($exchangeRate, $rate, $date);
+        $transformer  = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))->header('Content-Type', self::CONTENT_TYPE);
    }
 }
@@ -44,16 +44,14 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(ObjectGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(ObjectGroupRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -50,16 +50,14 @@ class ListController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(ObjectGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(ObjectGroupRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -48,16 +48,14 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(ObjectGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(ObjectGroupRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -46,16 +46,14 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(ObjectGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user             = auth()->user();
+            $this->repository = app(ObjectGroupRepositoryInterface::class);
+            $this->repository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -43,14 +43,12 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(PiggyBankRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(PiggyBankRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -51,14 +51,12 @@ class ListController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(PiggyBankRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(PiggyBankRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -49,14 +49,12 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(PiggyBankRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(PiggyBankRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -114,7 +112,6 @@ class ShowController extends Controller
        $enrichment->setUser($admin);
        $piggyBank   = $enrichment->enrichSingle($piggyBank);

-
        /** @var PiggyBankTransformer $transformer */
        $transformer = app(PiggyBankTransformer::class);
        $transformer->setParameters($this->parameters);
@@ -47,14 +47,12 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(PiggyBankRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(PiggyBankRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,14 +47,12 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(PiggyBankRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(PiggyBankRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -43,14 +43,12 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(RecurringRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -52,14 +52,12 @@ class ListController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(RecurringRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -49,14 +49,12 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(RecurringRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -47,14 +47,12 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(RecurringRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -1,6 +1,7 @@
 <?php

 declare(strict_types=1);
+
 /*
 * TriggerController.php
 * Copyright (c) 2025 james@firefly-iii.org
@@ -50,44 +51,40 @@ class TriggerController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(RecurringRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    public function trigger(SingleDateRequest $request, Recurrence $recurrence): JsonResponse
    {
        // find recurrence occurrence for this date and trigger it.
        // grab the date from the last time the recurrence fired:
-        $backupDate                 = $recurrence->latest_date;
-        $date                       = $request->getDate();
+        $backupDate   = $recurrence->latest_date;
+        $date         = $request->getDate();

        // fire the recurring cron job on the given date, then post-date the created transaction.
        Log::info(sprintf('Trigger: will now fire recurring cron job task for date "%s".', $date->format('Y-m-d H:i:s')));

        /** @var CreateRecurringTransactions $job */
-        $job                        = app(CreateRecurringTransactions::class);
+        $job          = app(CreateRecurringTransactions::class);
        $job->setRecurrences(new Collection()->push($recurrence));
        $job->setDate($date);
        $job->setForce(false);
        $job->handle();
        Log::debug('Done with recurrence.');

-        $groups                     = $job->getGroups();
+        $groups       = $job->getGroups();
        $this->repository->markGroupsAsNow($groups);
-        $recurrence->latest_date    = $backupDate;
-        $recurrence->latest_date_tz = $backupDate?->format('e');
-        $recurrence->save();
+        $recurrence   = $this->repository->setLatestDate($recurrence, $backupDate);
        Preferences::mark();

        // enrich groups and return them:

-        $paginator                  = new LengthAwarePaginator(new Collection(), 0, 1);
+        $paginator    = new LengthAwarePaginator(new Collection(), 0, 1);
        if ($groups->count() > 0) {
            /** @var User $admin */
            $admin     = auth()->user();
@@ -95,28 +92,24 @@ class TriggerController extends Controller
            // use new group collector:
            /** @var GroupCollectorInterface $collector */
            $collector = app(GroupCollectorInterface::class);
-            $collector
-                ->setUser($admin)
-                ->setIds($groups->pluck('id')->toArray())
-                ->withAPIInformation()
-            ;
+            $collector->setUser($admin)->setIds($groups->pluck('id')->toArray())->withAPIInformation();
            $paginator = $collector->getPaginatedGroups();
        }

-        $manager                    = $this->getManager();
+        $manager      = $this->getManager();
        $paginator->setPath(route('api.v1.recurrences.trigger', [$recurrence->id]).$this->buildParams());

        // enrich
-        $admin                      = auth()->user();
-        $enrichment                 = new TransactionGroupEnrichment();
+        $admin        = auth()->user();
+        $enrichment   = new TransactionGroupEnrichment();
        $enrichment->setUser($admin);
-        $transactions               = $enrichment->enrich($paginator->getCollection());
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
-        $transformer                = app(TransactionGroupTransformer::class);
+        $transformer  = app(TransactionGroupTransformer::class);
        $transformer->setParameters($this->parameters);

-        $resource                   = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -47,14 +47,12 @@ class UpdateController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(RecurringRepositoryInterface::class);
+            $this->repository->setUser(auth()->user());

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -44,17 +44,15 @@ class DestroyController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user                 = auth()->user();
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user                 = auth()->user();

-                $this->ruleRepository = app(RuleRepositoryInterface::class);
-                $this->ruleRepository->setUser($user);
+            $this->ruleRepository = app(RuleRepositoryInterface::class);
+            $this->ruleRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -41,8 +41,6 @@ class ExpressionController extends Controller
     */
    public function validateExpression(ValidateExpressionRequest $request): JsonResponse
    {
-        return response()->json([
-            'valid' => true,
-        ]);
+        return response()->json(['valid' => true]);
    }
 }
@@ -48,17 +48,15 @@ class ShowController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user                 = auth()->user();
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user                 = auth()->user();

-                $this->ruleRepository = app(RuleRepositoryInterface::class);
-                $this->ruleRepository->setUser($user);
+            $this->ruleRepository = app(RuleRepositoryInterface::class);
+            $this->ruleRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -45,17 +45,15 @@ class StoreController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user                 = auth()->user();
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user                 = auth()->user();

-                $this->ruleRepository = app(RuleRepositoryInterface::class);
-                $this->ruleRepository->setUser($user);
+            $this->ruleRepository = app(RuleRepositoryInterface::class);
+            $this->ruleRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -52,17 +52,15 @@ class TriggerController extends Controller
    public function __construct()
    {
        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user                 = auth()->user();
+        $this->middleware(function ($request, $next) {
+            /** @var User $user */
+            $user                 = auth()->user();

-                $this->ruleRepository = app(RuleRepositoryInterface::class);
-                $this->ruleRepository->setUser($user);
+            $this->ruleRepository = app(RuleRepositoryInterface::class);
+            $this->ruleRepository->setUser($user);

-                return $next($request);
-            }
-        );
+            return $next($request);
+        });
    }

    /**
@@ -80,15 +78,15 @@ class TriggerController extends Controller
        // overrule the rule(s) if necessary.
        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
            // add a range:
-            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type'  => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
        }

        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
            // add a range:
-            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type'  => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
        }
        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
-            $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
+            $ruleEngine->addOperator(['type'  => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
        }

        // file the rule(s)
@@ -134,15 +132,15 @@ class TriggerController extends Controller
        // overrule the rule(s) if necessary.
        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
            // add a range:
-            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type'  => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
        }

        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
            // add a range:
-            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type'  => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
        }
        if (array_key_exists('accounts', $parameters) && is_array($parameters['accounts']) && count($parameters['accounts']) > 0) {
-            $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
+            $ruleEngine->addOperator(['type'  => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
        }

        // fire the rule(s)
--- a/Show More
+++ b/Show More