Merge branch 'release/v6.1.6'

Update meta files for new release.
Fix a very dumb bug.
2025-10-31 02:36:28 +00:00 · 2024-01-06 11:13:41 +01:00 · 2024-01-06 11:11:18 +01:00 · 2024-01-06 11:09:40 +01:00 · 2024-01-06 10:59:05 +01:00 · 2024-01-06 10:59:02 +01:00
1882 changed files with 103445 additions and 114824 deletions
--- a/.ci/all.sh
+++ b/.ci/all.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#
+# all.sh
+# Copyright (c) 2024 james@firefly-iii.org
+#
+# This file is part of Firefly III (https://github.com/firefly-iii).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+$SCRIPT_DIR/phpcs.sh
+$SCRIPT_DIR/phpstan.sh
+$SCRIPT_DIR/phpmd.sh
--- a/.ci/php-cs-fixer/.php-cs-fixer.php
+++ b/.ci/php-cs-fixer/.php-cs-fixer.php
@@ -36,9 +36,35 @@ $finder = PhpCsFixer\Finder::create()

 $config = new PhpCsFixer\Config();
 return $config->setRules([
-                             '@PSR12'               => true,
-                             'declare_strict_types' => true,
-                             'strict_param'         => true,
-                             'array_syntax'         => ['syntax' => 'short'],
+                             'no_unused_imports'             => true,
+                             '@PhpCsFixer'                   => true,
+                             '@PHP83Migration'               => true,
+                             '@PhpCsFixer:risky'             => true,
+                             '@PSR12:risky'                  => true,
+                             'declare_strict_types'          => true,
+                             'strict_param'                  => true,
+                             'comment_to_phpdoc'             => false, // breaks phpstan lines in combination with PHPStorm.
+                             'array_syntax'                  => ['syntax' => 'short'],
+                             'native_function_invocation'    => false, // annoying
+                             'php_unit_data_provider_name'   => false, // bloody annoying long test names
+                             'static_lambda'                 => false, // breaks the Response macro for API's.
+                             'phpdoc_summary'                => false, // annoying.
+                             'single_space_around_construct' => [
+                                 'constructs_followed_by_a_single_space' => [
+                                     'protected',
+                                 ],
+                             ],
+                             'statement_indentation'         => true,
+                             'type_declaration_spaces'       => false,
+                             'cast_spaces'                   => false,
+                             'binary_operator_spaces'        => [
+                                 'default' => 'at_least_single_space',
+                                 'operators' => [
+                                     '=>' => 'align_single_space_by_scope',
+                                     '='  => 'align_single_space_minimal_by_scope',
+                                     '??='  => 'align_single_space_minimal_by_scope',
+                                 ],
+                             ],
+                             'void_return'                   => true,
                         ])
              ->setFinder($finder);
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -226,50 +226,48 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.37.0",
+            "version": "v3.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "d5ccc3807fd496ac2b448e8e5e57aa0772f0d18b"
+                "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d5ccc3807fd496ac2b448e8e5e57aa0772f0d18b",
-                "reference": "d5ccc3807fd496ac2b448e8e5e57aa0772f0d18b",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/be6831c9af1740470d2a773119b9273f8ac1c3d2",
+                "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2",
                "shasum": ""
            },
            "require": {
-                "composer/semver": "^3.3",
+                "composer/semver": "^3.4",
                "composer/xdebug-handler": "^3.0.3",
+                "ext-filter": "*",
                "ext-json": "*",
                "ext-tokenizer": "*",
                "php": "^7.4 || ^8.0",
                "sebastian/diff": "^4.0 || ^5.0",
-                "symfony/console": "^5.4 || ^6.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0",
-                "symfony/filesystem": "^5.4 || ^6.0",
-                "symfony/finder": "^5.4 || ^6.0",
-                "symfony/options-resolver": "^5.4 || ^6.0",
-                "symfony/polyfill-mbstring": "^1.27",
-                "symfony/polyfill-php80": "^1.27",
-                "symfony/polyfill-php81": "^1.27",
-                "symfony/process": "^5.4 || ^6.0",
-                "symfony/stopwatch": "^5.4 || ^6.0"
+                "symfony/console": "^5.4 || ^6.0 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.28",
+                "symfony/polyfill-php80": "^1.28",
+                "symfony/polyfill-php81": "^1.28",
+                "symfony/process": "^5.4 || ^6.0 || ^7.0",
+                "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
            },
            "require-dev": {
                "facile-it/paraunit": "^1.3 || ^2.0",
                "justinrainbow/json-schema": "^5.2",
-                "keradus/cli-executor": "^2.0",
+                "keradus/cli-executor": "^2.1",
                "mikey179/vfsstream": "^1.6.11",
-                "php-coveralls/php-coveralls": "^2.5.3",
+                "php-coveralls/php-coveralls": "^2.7",
                "php-cs-fixer/accessible-object": "^1.1",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy": "^1.16",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "symfony/phpunit-bridge": "^6.2.3",
-                "symfony/yaml": "^5.4 || ^6.0"
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
+                "phpunit/phpunit": "^9.6 || ^10.5.5",
+                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
            },
            "suggest": {
                "ext-dom": "For handling output formats in XML",
@@ -307,7 +305,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.37.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.46.0"
            },
            "funding": [
                {
@@ -315,7 +313,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-10-28T14:49:50+00:00"
+            "time": "2024-01-03T21:38:46+00:00"
        },
        {
            "name": "psr/container",
@@ -472,16 +470,16 @@
        },
        {
            "name": "sebastian/diff",
-            "version": "5.0.3",
+            "version": "5.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b"
+                "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
-                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f",
+                "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f",
                "shasum": ""
            },
            "require": {
@@ -494,7 +492,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "5.1-dev"
                }
            },
            "autoload": {
@@ -527,7 +525,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
                "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0"
            },
            "funding": [
                {
@@ -535,47 +533,50 @@
                    "type": "github"
                }
            ],
-            "time": "2023-05-01T07:48:21+00:00"
+            "time": "2023-12-22T10:55:06+00:00"
        },
        {
            "name": "symfony/console",
-            "version": "v6.3.4",
+            "version": "v7.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
+                "reference": "f8587c4cdc5acad67af71c37db34ef03af91e59c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
-                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f8587c4cdc5acad67af71c37db34ef03af91e59c",
+                "reference": "f8587c4cdc5acad67af71c37db34ef03af91e59c",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                "symfony/polyfill-mbstring": "~1.0",
                "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/string": "^6.4|^7.0"
            },
            "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
            },
            "provide": {
                "psr/log-implementation": "1.0|2.0|3.0"
            },
            "require-dev": {
                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -609,7 +610,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.4"
+                "source": "https://github.com/symfony/console/tree/v7.0.2"
            },
            "funding": [
                {
@@ -625,11 +626,11 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-16T10:10:12+00:00"
+            "time": "2023-12-10T16:54:46+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.3.0",
+            "version": "v3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
@@ -676,7 +677,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
            },
            "funding": [
                {
@@ -696,24 +697,24 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v6.3.2",
+            "version": "v7.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e"
+                "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
-                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/098b62ae81fdd6cbf941f355059f617db28f4f9a",
+                "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/event-dispatcher-contracts": "^2.5|^3"
            },
            "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                "symfony/service-contracts": "<2.5"
            },
            "provide": {
@@ -722,13 +723,13 @@
            },
            "require-dev": {
                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
                "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^5.4|^6.0"
+                "symfony/stopwatch": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -756,7 +757,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/v6.3.2"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.2"
            },
            "funding": [
                {
@@ -772,11 +773,11 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-06T06:56:43+00:00"
+            "time": "2023-12-27T22:24:19+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.3.0",
+            "version": "v3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
@@ -832,7 +833,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
            },
            "funding": [
                {
@@ -852,20 +853,20 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v6.3.1",
+            "version": "v7.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
+                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7",
+                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/polyfill-ctype": "~1.8",
                "symfony/polyfill-mbstring": "~1.8"
            },
@@ -895,7 +896,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
+                "source": "https://github.com/symfony/filesystem/tree/v7.0.0"
            },
            "funding": [
                {
@@ -911,27 +912,27 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-01T08:30:39+00:00"
+            "time": "2023-07-27T06:33:22+00:00"
        },
        {
            "name": "symfony/finder",
-            "version": "v6.3.5",
+            "version": "v7.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
+                "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
-                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56",
+                "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
            },
            "require-dev": {
-                "symfony/filesystem": "^6.0"
+                "symfony/filesystem": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -959,7 +960,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.3.5"
+                "source": "https://github.com/symfony/finder/tree/v7.0.0"
            },
            "funding": [
                {
@@ -975,24 +976,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-26T12:56:25+00:00"
+            "time": "2023-10-31T17:59:56+00:00"
        },
        {
            "name": "symfony/options-resolver",
-            "version": "v6.3.0",
+            "version": "v7.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd"
+                "reference": "700ff4096e346f54cb628ea650767c8130f1001f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd",
-                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f",
+                "reference": "700ff4096e346f54cb628ea650767c8130f1001f",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/deprecation-contracts": "^2.5|^3"
            },
            "type": "library",
@@ -1026,7 +1027,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.3.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.0.0"
            },
            "funding": [
                {
@@ -1042,7 +1043,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-12T14:21:09+00:00"
+            "time": "2023-08-08T10:20:21+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -1538,20 +1539,20 @@
        },
        {
            "name": "symfony/process",
-            "version": "v6.3.4",
+            "version": "v7.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54"
+                "reference": "acd3eb5cb02382c1cb0287ba29b2908cc6ffa83a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54",
-                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54",
+                "url": "https://api.github.com/repos/symfony/process/zipball/acd3eb5cb02382c1cb0287ba29b2908cc6ffa83a",
+                "reference": "acd3eb5cb02382c1cb0287ba29b2908cc6ffa83a",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
            },
            "type": "library",
            "autoload": {
@@ -1579,7 +1580,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v6.3.4"
+                "source": "https://github.com/symfony/process/tree/v7.0.2"
            },
            "funding": [
                {
@@ -1595,25 +1596,25 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-07T10:39:22+00:00"
+            "time": "2023-12-24T09:15:37+00:00"
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.3.0",
+            "version": "v3.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "psr/container": "^2.0"
+                "psr/container": "^1.1|^2.0"
            },
            "conflict": {
                "ext-psr": "<1.1|>=2"
@@ -1661,7 +1662,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
            },
            "funding": [
                {
@@ -1677,24 +1678,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v6.3.0",
+            "version": "v7.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2"
+                "reference": "7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a",
+                "reference": "7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/service-contracts": "^2.5|^3"
            },
            "type": "library",
@@ -1723,7 +1724,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.3.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.0.0"
            },
            "funding": [
                {
@@ -1739,24 +1740,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-16T10:14:28+00:00"
+            "time": "2023-07-05T13:06:06+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v6.3.5",
+            "version": "v7.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
+                "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
-                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
+                "url": "https://api.github.com/repos/symfony/string/zipball/cc78f14f91f5e53b42044d0620961c48028ff9f5",
+                "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/polyfill-ctype": "~1.8",
                "symfony/polyfill-intl-grapheme": "~1.0",
                "symfony/polyfill-intl-normalizer": "~1.0",
@@ -1766,11 +1767,11 @@
                "symfony/translation-contracts": "<2.5"
            },
            "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/intl": "^6.2",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+                "symfony/var-exporter": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -1809,7 +1810,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.5"
+                "source": "https://github.com/symfony/string/tree/v7.0.2"
            },
            "funding": [
                {
@@ -1825,7 +1826,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-18T10:38:32+00:00"
+            "time": "2023-12-10T16:54:46+00:00"
        }
    ],
    "packages-dev": [],
@@ -1836,5 +1837,5 @@
    "prefer-lowest": false,
    "platform": [],
    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
--- a/.ci/phpcs.sh
+++ b/.ci/phpcs.sh
@@ -28,11 +28,29 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # enable test .env file.
 # cp .ci/.env.ci .env

+OUTPUT_FORMAT=txt
+EXTRA_PARAMS="-v"
+
+if [[ $GITHUB_ACTIONS = "true" ]]
+then
+    OUTPUT_FORMAT=gitlab
+    EXTRA_PARAMS="--diff --dry-run"
+fi
+
 # clean up php code
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
 rm -f .php-cs-fixer.cache
-PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
+PHP_CS_FIXER_IGNORE_ENV=true
+./vendor/bin/php-cs-fixer fix \
+    --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
+    --format=$OUTPUT_FORMAT \
+    --allow-risky=yes $EXTRA_PARAMS
+
+EXIT_CODE=$?
+
+echo "Exit code for CS fixer is $EXIT_CODE."
+
 cd $SCRIPT_DIR/..

-exit 0
+exit $EXIT_CODE
--- a/.ci/phpmd.sh
+++ b/.ci/phpmd.sh
@@ -22,16 +22,29 @@


 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+OUTPUT_FORMAT=text
+
+if [[ $GITHUB_ACTIONS = "true" ]]
+then
+    OUTPUT_FORMAT=github
+fi
+

 cd $SCRIPT_DIR/phpmd
 composer update --quiet
 ./vendor/bin/phpmd \
-  $SCRIPT_DIR/../app text phpmd.xml \
+  $SCRIPT_DIR/../app,$SCRIPT_DIR/../database,$SCRIPT_DIR/../routes,$SCRIPT_DIR/../config \
+   $OUTPUT_FORMAT phpmd.xml \
  --exclude $SCRIPT_DIR/../app/resources/** \
  --exclude $SCRIPT_DIR/../app/frontend/** \
  --exclude $SCRIPT_DIR/../app/public/** \
-  --exclude $SCRIPT_DIR/../app/vendor/** \
+  --exclude $SCRIPT_DIR/../app/vendor/**
+
+EXIT_CODE=$?

 cd $SCRIPT_DIR/..

-exit 0
+echo "Exit code is $EXIT_CODE."
+
+# for the time being, exit 0
+exit $EXIT_CODE
--- a/.ci/phpmd/composer.lock
+++ b/.ci/phpmd/composer.lock
@@ -9,16 +9,16 @@
    "packages-dev": [
        {
            "name": "composer/pcre",
-            "version": "3.1.0",
+            "version": "3.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/pcre.git",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
                "shasum": ""
            },
            "require": {
@@ -60,7 +60,7 @@
            ],
            "support": {
                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.0"
+                "source": "https://github.com/composer/pcre/tree/3.1.1"
            },
            "funding": [
                {
@@ -76,7 +76,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-17T09:50:14+00:00"
+            "time": "2023-10-11T07:11:09+00:00"
        },
        {
            "name": "composer/xdebug-handler",
@@ -146,28 +146,28 @@
        },
        {
            "name": "pdepend/pdepend",
-            "version": "2.14.0",
+            "version": "2.16.2",
            "source": {
                "type": "git",
                "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1"
+                "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58",
+                "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.7",
-                "symfony/config": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0"
+                "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/polyfill-mbstring": "^1.19"
            },
            "require-dev": {
                "easy-doc/easy-doc": "0.0.0|^1.2.3",
                "gregwar/rst": "^1.0",
-                "phpunit/phpunit": "^4.8.36|^5.7.27",
                "squizlabs/php_codesniffer": "^2.0.0"
            },
            "bin": [
@@ -197,7 +197,7 @@
            ],
            "support": {
                "issues": "https://github.com/pdepend/pdepend/issues",
-                "source": "https://github.com/pdepend/pdepend/tree/2.14.0"
+                "source": "https://github.com/pdepend/pdepend/tree/2.16.2"
            },
            "funding": [
                {
@@ -205,26 +205,26 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-26T13:15:18+00:00"
+            "time": "2023-12-17T18:09:59+00:00"
        },
        {
            "name": "phpmd/phpmd",
-            "version": "2.13.0",
+            "version": "2.15.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
+                "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0",
+                "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0",
                "shasum": ""
            },
            "require": {
                "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                "ext-xml": "*",
-                "pdepend/pdepend": "^2.12.1",
+                "pdepend/pdepend": "^2.16.1",
                "php": ">=5.3.9"
            },
            "require-dev": {
@@ -233,8 +233,7 @@
                "ext-simplexml": "*",
                "gregwar/rst": "^1.0",
                "mikey179/vfsstream": "^1.6.8",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27",
-                "squizlabs/php_codesniffer": "^2.0"
+                "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2"
            },
            "bin": [
                "src/bin/phpmd"
@@ -271,6 +270,7 @@
            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
            "homepage": "https://phpmd.org/",
            "keywords": [
+                "dev",
                "mess detection",
                "mess detector",
                "pdepend",
@@ -280,7 +280,7 @@
            "support": {
                "irc": "irc://irc.freenode.org/phpmd",
                "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+                "source": "https://github.com/phpmd/phpmd/tree/2.15.0"
            },
            "funding": [
                {
@@ -288,7 +288,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-09-10T08:44:15+00:00"
+            "time": "2023-12-11T08:22:20+00:00"
        },
        {
            "name": "psr/container",
@@ -395,34 +395,34 @@
        },
        {
            "name": "symfony/config",
-            "version": "v6.3.0",
+            "version": "v7.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/config.git",
-                "reference": "a5e00dec161b08c946a2c16eed02adbeedf827ae"
+                "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/a5e00dec161b08c946a2c16eed02adbeedf827ae",
-                "reference": "a5e00dec161b08c946a2c16eed02adbeedf827ae",
+                "url": "https://api.github.com/repos/symfony/config/zipball/8789646600f4e7e451dde9e1dc81cfa429f3857a",
+                "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/filesystem": "^5.4|^6.0",
+                "symfony/filesystem": "^6.4|^7.0",
                "symfony/polyfill-ctype": "~1.8"
            },
            "conflict": {
-                "symfony/finder": "<5.4",
+                "symfony/finder": "<6.4",
                "symfony/service-contracts": "<2.5"
            },
            "require-dev": {
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
-                "symfony/messenger": "^5.4|^6.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
                "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0"
+                "symfony/yaml": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -450,7 +450,7 @@
            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/config/tree/v6.3.0"
+                "source": "https://github.com/symfony/config/tree/v7.0.0"
            },
            "funding": [
                {
@@ -466,44 +466,43 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-04-25T10:46:17+00:00"
+            "time": "2023-11-09T08:30:23+00:00"
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v6.3.1",
+            "version": "v7.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "7abf242af21f196b65f20ab00ff251fdf3889b8d"
+                "reference": "bd25ef7c937b9da12510bdc4f1c66728f19620e3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/7abf242af21f196b65f20ab00ff251fdf3889b8d",
-                "reference": "7abf242af21f196b65f20ab00ff251fdf3889b8d",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bd25ef7c937b9da12510bdc4f1c66728f19620e3",
+                "reference": "bd25ef7c937b9da12510bdc4f1c66728f19620e3",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "psr/container": "^1.1|^2.0",
                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/service-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.2.10"
+                "symfony/service-contracts": "^3.3",
+                "symfony/var-exporter": "^6.4|^7.0"
            },
            "conflict": {
                "ext-psr": "<1.1|>=2",
-                "symfony/config": "<6.1",
-                "symfony/finder": "<5.4",
-                "symfony/proxy-manager-bridge": "<6.3",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/finder": "<6.4",
+                "symfony/yaml": "<6.4"
            },
            "provide": {
                "psr/container-implementation": "1.1|2.0",
                "symfony/service-implementation": "1.1|2.0|3.0"
            },
            "require-dev": {
-                "symfony/config": "^6.1",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/yaml": "^5.4|^6.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/yaml": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -531,7 +530,7 @@
            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v6.3.1"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.2"
            },
            "funding": [
                {
@@ -547,11 +546,11 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-24T11:51:27+00:00"
+            "time": "2023-12-28T19:18:20+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.3.0",
+            "version": "v3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
@@ -598,7 +597,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
            },
            "funding": [
                {
@@ -618,20 +617,20 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v6.3.1",
+            "version": "v7.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
+                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7",
+                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/polyfill-ctype": "~1.8",
                "symfony/polyfill-mbstring": "~1.8"
            },
@@ -661,7 +660,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
+                "source": "https://github.com/symfony/filesystem/tree/v7.0.0"
            },
            "funding": [
                {
@@ -677,20 +676,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-01T08:30:39+00:00"
+            "time": "2023-07-27T06:33:22+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
                "shasum": ""
            },
            "require": {
@@ -705,7 +704,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -743,7 +742,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
            },
            "funding": [
                {
@@ -759,20 +758,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+                "reference": "42292d99c55abe617799667f454222c54c60e229"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+                "reference": "42292d99c55abe617799667f454222c54c60e229",
                "shasum": ""
            },
            "require": {
@@ -787,7 +786,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -826,7 +825,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
            },
            "funding": [
                {
@@ -842,25 +841,25 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-07-28T09:04:16+00:00"
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.3.0",
+            "version": "v3.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "psr/container": "^2.0"
+                "psr/container": "^1.1|^2.0"
            },
            "conflict": {
                "ext-psr": "<1.1|>=2"
@@ -908,7 +907,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
            },
            "funding": [
                {
@@ -924,27 +923,27 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
        },
        {
            "name": "symfony/var-exporter",
-            "version": "v6.3.0",
+            "version": "v7.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "db5416d04269f2827d8c54331ba4cfa42620d350"
+                "reference": "345c62fefe92243c3a06fc0cc65f2ec1a47e0764"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db5416d04269f2827d8c54331ba4cfa42620d350",
-                "reference": "db5416d04269f2827d8c54331ba4cfa42620d350",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/345c62fefe92243c3a06fc0cc65f2ec1a47e0764",
+                "reference": "345c62fefe92243c3a06fc0cc65f2ec1a47e0764",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
            },
            "require-dev": {
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/var-dumper": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -982,7 +981,7 @@
                "serialize"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.3.0"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.0.2"
            },
            "funding": [
                {
@@ -998,7 +997,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-04-21T08:48:44+00:00"
+            "time": "2023-12-27T08:42:13+00:00"
        }
    ],
    "aliases": [],
@@ -1008,5 +1007,5 @@
    "prefer-lowest": false,
    "platform": [],
    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
--- a/.ci/phpmd/phpmd.xml
+++ b/.ci/phpmd/phpmd.xml
@@ -20,53 +20,75 @@
  -->

 <ruleset name="pcsg-generated-ruleset"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-	<description>Bla bla</description>
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>Firefly III ruleset.</description>
+    <!-- Import the entire controversial code rule set -->
+    <rule ref="rulesets/controversial.xml">
+        <exclude name="CamelCasePropertyName"/>
+    </rule>

-	<!--
-Commando vanuit firefly directory:
-phpmd database,app,tests html /gdrive-all/development/phpmd/phpmd.xml > public/report.html
-	-->
+    <!-- clean code -->
+    <!-- <rule ref="rulesets/codesize.xml" /> -->
+    <rule ref="rulesets/unusedcode.xml"/>

-	<!-- Import the entire controversial code rule set -->
-	<rule ref="rulesets/controversial.xml">
-		<exclude name="CamelCasePropertyName" />
-	</rule>

-	<!-- clean code -->
-	<rule ref="rulesets/codesize.xml" />
-	<rule ref="rulesets/design.xml" />
-	<rule ref="rulesets/naming.xml" />
-	<rule ref="rulesets/unusedcode.xml" />
+    <rule ref="rulesets/design.xml/NumberOfChildren">
+        <properties>
+            <!-- This is now at 32, which excludes the controllers but should prevent more monoliths. -->
+            <property name="minimum" value="32"/>
+        </properties>
+    </rule>
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects">
+        <properties>
+            <!-- Leaving this at 28 excuses most current code but it can't get worse than that. -->
+            <property name="maximum" value="28"/>
+        </properties>
+    </rule>

-	<rule ref="rulesets/codesize.xml/CyclomaticComplexity">
-		<properties>
-			<property name="reportLevel" value="5"/>
-		</properties>
-	</rule>
-	<rule ref="rulesets/codesize.xml/NPathComplexity">
-		<properties>
-			<property name="minimum" value="128"/>
-		</properties>
-	</rule>
-	<rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
-		<properties>
-			<property name="minimum" value="40"/>
-		</properties>
-	</rule>
-	<rule ref="rulesets/codesize.xml/ExcessiveParameterList">
-		<properties>
-			<property name="minimum" value="5"/>
-		</properties>
-	</rule>

-	<!-- include clean code manually -->
-	<rule ref="rulesets/cleancode.xml/BooleanArgumentFlag" />
-	<rule ref="rulesets/cleancode.xml/ElseExpression" />
+    <rule ref="rulesets/naming.xml/ShortMethodName">
+        <properties>
+            <property name="minimum" value="3"/>
+        </properties>
+    </rule>

-	<!-- no this one -->
-	<!--<rule ref="rulesets/cleancode.xml/StaticAccess" />-->
+    <!-- code size -->
+    <rule ref="rulesets/codesize.xml/CyclomaticComplexity">
+        <properties>
+            <!-- Leave at 20. This means methods will be pretty complex before the system starts complaining. -->
+            <property name="reportLevel" value="20"/>
+        </properties>
+    </rule>
+    <rule ref="rulesets/codesize.xml/NPathComplexity">
+        <properties>
+            <!-- 2000 results in some pretty complex methods, but it's OK. -->
+            <!-- They should not be much more complex than that though -->
+            <property name="minimum" value="2000"/>
+        </properties>
+    </rule>
+    <rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
+        <properties>
+            <!-- 75 seems like a nice number. Shorter isn't always feasible and there are a few exceptions already -->
+            <property name="minimum" value="75"/>
+            <property name="ignore-whitespace" value="true"/>
+        </properties>
+    </rule>
+    <rule ref="rulesets/codesize.xml/ExcessiveParameterList">
+        <properties>
+            <!-- 5 is fine. 6 is excessive, but I have just one of those. At the end of the day, I still need all params. -->
+            <property name="minimum" value="5"/>
+        </properties>
+    </rule>
+
+    <!-- include clean code manually -->
+    <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
+    <rule ref="rulesets/cleancode.xml/ElseExpression"/>
+    <rule ref="rulesets/cleancode.xml/MissingImport"/>
+    <rule ref="rulesets/cleancode.xml/UndefinedVariable"/>
+    <rule ref="rulesets/cleancode.xml/IfStatementAssignment"/>
+    <rule ref="rulesets/cleancode.xml/DuplicatedArrayKey"/>
+    <rule ref="rulesets/cleancode.xml/ErrorControlOperator"/>
 </ruleset>
--- a/.ci/phpstan.neon
+++ b/.ci/phpstan.neon
@@ -1,42 +1,33 @@
-includes:
-  - ../vendor/nunomaduro/larastan/extension.neon
-  - ../vendor/ergebnis/phpstan-rules/rules.neon
-  - ../vendor/phpstan/phpstan-deprecation-rules/rules.neon
-  - ../vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
-
 parameters:
+  universalObjectCratesClasses:
+    - Illuminate\Database\Eloquent\Model
+  # TODO: slowly remove these parameters and fix the issues found.
+  reportUnmatchedIgnoredErrors: false
+  checkGenericClassInNonGenericObjectType: false  # remove this rule when all other issues are solved.
  ignoreErrors:
+  # TODO: slowly remove these exceptions and fix the issues found.
+    - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
+    - '#Control structures using switch should not be used.#' # switch is fine in some cases.
+    - '#with no value type specified in iterable type array#' # remove this rule when all other issues are solved.
+    - '#has no value type specified in iterable type array#' # remove this rule when all other issues are solved.
    - '#is not allowed to extend#'
+    - '#switch is forbidden to use#'
    - '#is neither abstract nor final#'
-    - '#has a nullable return type declaration#'
-    - '#with a nullable type declaration#'
+    - '#on left side of \?\?\= always exists and is not nullable#'
+    - '#has a nullable return type declaration#' # perhaps throw errors instead?
+    - '#with a nullable type declaration#' # decide what action should be if param is null.
    - '#with null as default value#'
-    - '#is not covariant with PHPDoc type array#'
+    -
+        message: '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
+        paths:
+            - ../app/Exceptions/IntervalException.php
+            - ../app/Support/Navigation.php
    -
        message: '#but containers should not be injected#'
        paths:
            - ../app/Support/Authentication/RemoteUserGuard.php
    -
-        message: '#Control structures using switch should not be used.#'
-        paths:
-            - ../app/Api/V1/Controllers/Data/DestroyController.php
-            - ../app/Console/Commands/Correction/FixAccountTypes.php
-            - ../app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
-            - ../app/Exceptions/GracefulNotFoundHandler.php
-            - ../app/Generator/Webhook/StandardMessageGenerator.php
-            - ../app/Support/Amount.php
-            - ../app/Support/Navigation.php
-            - ../app/Support/ParseDateString.php
-            - ../app/Support/Search/AccountSearch.php
-            - ../app/Support/Search/OperatorQuerySearch.php
-            - ../app/Support/Twig/General.php
-            - ../app/Transformers/RecurrenceTransformer.php
-            - ../app/Validation/AccountValidator.php
-            - ../app/Validation/RecurrenceValidation.php
-            - ../app/Validation/TransactionValidation.php
-
-    -
-        message: '#Function compact\(\) should not be used#'
+        message: '#Function compact\(\) should not be used#' # too useful in template rendering.
        paths:
            - ../app/Generator/Report/Account/MonthReportGenerator.php
            - ../app/Generator/Report/Audit/MonthReportGenerator.php
@@ -57,7 +48,6 @@ parameters:
        message: '#Either catch a more specific exception#'
        paths:
            - ../app/Support/Form/FormSupport.php
-
  paths:
    - ../app
    - ../database
@@ -66,5 +56,6 @@ parameters:
    - ../bootstrap/app.php

  # The level 8 is the highest level. original was 5
-  level: 4
+  # 7 is more than enough, higher just leaves NULL things.
+  level: 7

--- a/.ci/phpstan.sh
+++ b/.ci/phpstan.sh
@@ -29,7 +29,20 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # cp .ci/.env.ci .env

 # Do static code analysis.
-# ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress
-./vendor/bin/phpstan analyse -c .ci/phpstan.neon --xdebug --error-format=table > phpstan-report.txt
+if [[ $GITHUB_ACTIONS = "" ]]
+then
+    ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --error-format=table > phpstan-report.txt
+    EXIT_CODE=$?
+    echo "The PHPstan report can be found in phpstan-report.txt. Exit code is $EXIT_CODE."
+fi

-echo 'The PHPstan report can be found in phpstan-report.txt'
+if [[ $GITHUB_ACTIONS = "true" ]]
+then
+    ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress --error-format=github
+    EXIT_CODE=$?
+
+    # temporary exit code 0
+    # EXIT_CODE=0
+fi
+
+exit $EXIT_CODE
--- a/.ci/phpunit.sh
+++ b/.ci/phpunit.sh
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# phpunit.sh
-# Copyright (c) 2021 james@firefly-iii.org
-#
-# This file is part of Firefly III (https://github.com/firefly-iii).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-# enable test .env file.
-cp $SCRIPT_DIR/../.env $SCRIPT_DIR/../.env.backup
-cp $SCRIPT_DIR/.env.ci $SCRIPT_DIR/../.env
-
-COVERAGE=false
-RESET=false
-FILE=storage/database/database.sqlite
-
-while getopts "cr" o; do
-    case "${o}" in
-        c) COVERAGE=true;;
-        r) RESET=true;;
-    esac
-done
-
-# reset if necessary.
-if [ $RESET = "true" ] ; then
-    rm -f $FILE
-fi
-
-# download test database
-if [ -f "$FILE" ]; then
-  echo 'DB exists, will use it'
-else
-  echo 'Download new DB'
-  wget --quiet https://github.com/firefly-iii/test-fixtures/raw/main/test-database.sqlite -O $FILE
-fi
-
-# run phpunit
-if [ $COVERAGE = "true" ] ; then
-  echo 'Run with coverage'
-  XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration phpunit.xml --coverage-html $SCRIPT_DIR/coverage
-else
-  echo 'Run without coverage'
-  ./vendor/bin/phpunit --configuration phpunit.xml
-fi
-
-# restore .env file
-mv $SCRIPT_DIR/../.env.backup $SCRIPT_DIR/../.env
-
-cd $SCRIPT_DIR/..
--- a/.env.example
+++ b/.env.example
@@ -78,7 +78,7 @@ PAPERTRAIL_HOST=
 PAPERTRAIL_PORT=

 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: https://docs.firefly-iii.org/firefly-iii/faq/self-hosted/#i-want-to-use-sqlite
+# For other database types, please see the FAQ: https://docs.firefly-iii.org/references/faq/install/#i-want-to-use-sqlite
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 # Use "pgsql" for PostgreSQL
 # Use "mysql" for MySQL and MariaDB.
@@ -150,7 +150,7 @@ COOKIE_SECURE=false
 COOKIE_SAMESITE=lax

 # If you want Firefly III to email you, update these settings
-# For instructions, see: https://docs.firefly-iii.org/firefly-iii/advanced-installation/email/#email
+# For instructions, see: https://docs.firefly-iii.org/how-to/firefly-iii/advanced/notifications/#email
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAIL_MAILER=log
 MAIL_HOST=null
@@ -214,7 +214,7 @@ VALID_URL_PROTOCOLS=
 # - 'web' (default, uses built in DB)
 # - 'remote_user_guard' for Authelia etc
 # Read more about these settings in the documentation.
-# https://docs.firefly-iii.org/firefly-iii/advanced-installation/authentication
+# https://docs.firefly-iii.org/how-to/firefly-iii/advanced/authentication/
 #
 # LDAP is no longer supported :(
 #
@@ -269,7 +269,7 @@ ALLOW_WEBHOOKS=false
 # 1. Set this token to any 32-character value (this is important!).
 # 2. Use this token in the cron URL instead of a user's command line token that you can find in /profile
 #
-# For more info: https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/
+# For more info: https://docs.firefly-iii.org/how-to/firefly-iii/advanced/cron/
 #
 # You can set this variable from a file by appending it with _FILE
 #
--- a/.env.testing
+++ b/.env.testing
@@ -0,0 +1,26 @@
+APP_ENV=testing
+APP_DEBUG=true
+SITE_OWNER=mail@example.com
+APP_KEY=TestTestTestTestTestTestTestTest
+DEFAULT_LANGUAGE=en_US
+DEFAULT_LOCALE=equal
+TZ=Europe/Amsterdam
+LOG_CHANNEL=stdout
+APP_LOG_LEVEL=debug
+AUDIT_LOG_LEVEL=info
+AUDIT_LOG_CHANNEL=audit_stdout
+DB_CONNECTION=sqlite
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+MAIL_MAILER=log
+SEND_ERROR_MESSAGE=true
+ENABLE_EXTERNAL_MAP=false
+ENABLE_EXTERNAL_RATES=true
+AUTHENTICATION_GUARD=web
+ALLOW_WEBHOOKS=true
+APP_NAME=FireflyIII
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
+CACHE_PREFIX=firefly
+FIREFLY_III_LAYOUT=v1
+APP_URL=http://localhost
--- a/.github/ISSUE_TEMPLATE/fr.yml
+++ b/.github/ISSUE_TEMPLATE/fr.yml
@@ -8,7 +8,7 @@ body:
      options:
        - label: I've read the [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
          required: true
-        - label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/firefly-iii/more-information/what-its-not/)
+        - label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/explanation/more-information/what-its-not/)
          required: true
        - label: I've used [the search](https://github.com/firefly-iii/firefly-iii/issues?q=is%3Aissue) and this has not been requested before.
          required: true
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -1,3 +1,3 @@
-# [Contributing guidelines](https://docs.firefly-iii.org/firefly-iii/support/#contributing-code)
+# [Contributing guidelines](https://docs.firefly-iii.org/explanation/support/#contributing-code)

-[Contributing guidelines](https://docs.firefly-iii.org/firefly-iii/support/#contributing-code)
+[Contributing guidelines](https://docs.firefly-iii.org/explanation/support/#contributing-code)
--- a/.github/support.md
+++ b/.github/support.md
@@ -27,7 +27,7 @@ Only then [create a new issue](https://github.com/firefly-iii/firefly-iii/issues

 - Issues can be converted into discussions if it's not a bug or feature request.
 - Features that won't be implemented will be labelled "
-  wontfix". [This isn't personal](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/).
+  wontfix". [This isn't personal](https://docs.firefly-iii.org/explanation/more-information/what-its-not/).
 - Issues can be closed if they're duplicates of other issues.
 - Issues can be closed if the answer is in the FAQ.
 - Issues will be closed automatically after 14 days.
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -1,6 +1,6 @@
 # This workflow prunes old workflow runs for an entire repository.

-name: "Chore - prune old builds"
+name: "Chore - Prune old builds"

 on:
  schedule:
@@ -57,10 +57,9 @@ jobs:
            const workflows = [
              'cleanup.yml',
              'closed-issues.yml',
-              'depsreview.yaml',
-              'laravel.yml',
+              'depsreview.yml',
+              'label-actions.yml',
              'lock.yml',
-              'qodana.yml',
              'sonarcloud.yml',
              'stale.yml'
            ]
--- a/.github/workflows/closed-issues.yml
+++ b/.github/workflows/closed-issues.yml
@@ -1,10 +1,11 @@
-name: "Issues - reply to closed issue"
+---
+name: Issues - Reply to closed issue
 on:
  issues:
    types:
      - closed
 jobs:
-  auto_comment:
+  command_and_close:
    runs-on: ubuntu-latest
    steps:
      - uses: aws-actions/closed-issue-message@v1
@@ -21,4 +22,7 @@ jobs:
            If there is more to discuss, please open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose) or [discussion](https://github.com/firefly-iii/firefly-iii/discussions/).

            Thank you for your contributions.
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: OSDKDev/lock-issues@v1.1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/depsreview.yaml
+++ b/.github/workflows/depsreview.yaml
@@ -1,4 +1,4 @@
-name: 'Code - dependency review'
+name: 'Code - Dependency review'
 on: [ pull_request ]

 permissions:
@@ -8,7 +8,9 @@ jobs:
  dependency-review:
    runs-on: ubuntu-latest
    steps:
-      - name: 'Checkout Repository'
+      - name: 'Checkout repository'
        uses: actions/checkout@v3
-      - name: 'Dependency Review'
+        with:
+          fetch-depth: 0
+      - name: 'Dependency review'
        uses: actions/dependency-review-action@v3
--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@@ -1,4 +1,4 @@
-name: 'Issues - reply to specific labels'
+name: 'Issues - Reply to specific labels'

 on:
  issues:
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -7,46 +7,19 @@ on:
      - main
      - develop
 env:
-  DB_CONNECTION: mysql
-  DB_HOST: "127.0.0.1"
-  DB_DATABASE: firefly
-  DB_USER: firefly
-  DB_PASSWORD: secret_firefly_password
-
+  DB_CONNECTION: sqlite
+  APP_KEY: UfpBqqeXx7zpNodsC6yjYQcRfDdm4Bxh
 jobs:
  sonarcloud:
    name: SonarCloud
    runs-on: ubuntu-latest
-    services:
-      mariadb:
-        image: mariadb:latest
-        ports:
-          - 3306:3306
-        env:
-          MYSQL_ROOT_PASSWORD: yes
-          MYSQL_USER: ${{ env.DB_USER }}
-          MYSQL_PASSWORD: ${{ env.DB_PASSWORD }}
-          MYSQL_DATABASE: ${{ env.DB_DATABASE }}
-        options: >-
-          --health-cmd="healthcheck.sh --connect --innodb_initialized"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
-
    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
+        uses: actions/checkout@v4
      - name: Setup PHP with Xdebug
        uses: shivammathur/setup-php@v2
        with:
-          php-version: '8.2'
+          php-version: '8.3'
          coverage: xdebug
          extensions: >-
            bcmath
@@ -55,6 +28,7 @@ jobs:
            iconv
            intl
            json
+            sqlite3
            mbstring
            openssl
            pdo
@@ -65,25 +39,23 @@ jobs:
            xml
            xmlwriter

+      - name: Copy standard configuration
+        run: cp .env.testing .env
+
      - name: Install Composer dependencies
        run: composer install --prefer-dist --no-interaction --no-progress --no-scripts

-      - name: Verify Database connection
-        env:
-          PORT: ${{ job.services.mariadb.ports[3306] }}
-        run: |
-          while ! mysqladmin ping -h"${{env.DB_HOST}}" -P"${PORT}" --silent; do
-            sleep 1
-          done
+      - name: PHPStan
+        run: .ci/phpstan.sh

-      - name: Copy environment file
-        run: sed 's@DB_HOST=.*@DB_HOST=${{env.DB_HOST}}@g' .env.example > .env
+      - name: PHPMD
+        run: .ci/phpmd.sh

-      - name: Generate app key
-        run: php artisan key:generate
+      - name: PHP CS Fixer
+        run: .ci/phpcs.sh

-      - name: "Create the database"
-        run: php artisan firefly-iii:create-database
+      - name: "Create database file"
+        run: touch storage/database/database.sqlite

      - name: "Upgrades the database to the latest version"
        run: php artisan firefly-iii:upgrade-database
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,4 +1,4 @@
-name: "Issues - close stale issues"
+name: "Issues - Close stale issues"
 on:
  schedule:
    - cron: "30 1 * * *"
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /node_modules
 /storage/*.key
 /vendor
+public/hot
 npm-debug.log
 yarn-error.log
 .env
--- a/app/Api/V1/Controllers/Autocomplete/AccountController.php
+++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php
@@ -32,7 +32,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use JsonException;

 /**
 * Class AccountController
@@ -41,6 +40,7 @@ class AccountController extends Controller
 {
    use AccountFilter;

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

@@ -60,30 +60,25 @@ class AccountController extends Controller
                return $next($request);
            }
        );
-        $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE,];
+        $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
    }

    /**
     * Documentation for this endpoint:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getAccountsAC
     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
-     * @throws JsonException
     * @throws FireflyException
     * @throws FireflyException
     */
    public function accounts(AutocompleteRequest $request): JsonResponse
    {
-        $data  = $request->getData();
-        $types = $data['types'];
-        $query = $data['query'];
-        $date  = $data['date'] ?? today(config('app.timezone'));
+        $data            = $request->getData();
+        $types           = $data['types'];
+        $query           = $data['query'];
+        $date            = $data['date'] ?? today(config('app.timezone'));
+        $return          = [];
+        $result          = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));

-        $return = [];
-
-        $result = $this->repository->searchAccount((string)$query, $types, $this->parameters->get('limit'));
        // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
        $defaultCurrency = app('amount')->getDefaultCurrency();

@@ -101,12 +96,12 @@ class AccountController extends Controller
                );
            }

-            $return[] = [
-                'id'                      => (string)$account->id,
+            $return[]        = [
+                'id'                      => (string) $account->id,
                'name'                    => $account->name,
                'name_with_balance'       => $nameWithBalance,
                'type'                    => $account->accountType->type,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                'currency_name'           => $currency->name,
                'currency_code'           => $currency->code,
                'currency_symbol'         => $currency->symbol,
@@ -117,10 +112,10 @@ class AccountController extends Controller
        // custom order.
        usort(
            $return,
-            function ($a, $b) {
+            static function (array $left, array $right) {
                $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
-                $posA  = array_search($a['type'], $order, true);
-                $posB  = array_search($b['type'], $order, true);
+                $posA  = (int) array_search($left['type'], $order, true);
+                $posB  = (int) array_search($right['type'], $order, true);

                return $posA - $posB;
            }
--- a/app/Api/V1/Controllers/Autocomplete/BillController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BillController.php
@@ -58,10 +58,6 @@ class BillController extends Controller
    /**
     * Documentation for this endpoint is at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBillsAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function bills(AutocompleteRequest $request): JsonResponse
    {
@@ -70,7 +66,7 @@ class BillController extends Controller
        $filtered = $result->map(
            static function (Bill $item) {
                return [
-                    'id'     => (string)$item->id,
+                    'id'     => (string) $item->id,
                    'name'   => $item->name,
                    'active' => $item->active,
                ];
--- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php
@@ -58,10 +58,6 @@ class BudgetController extends Controller
    /**
     * Documentation for this endpoint is at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBudgetsAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function budgets(AutocompleteRequest $request): JsonResponse
    {
@@ -70,7 +66,7 @@ class BudgetController extends Controller
        $filtered = $result->map(
            static function (Budget $item) {
                return [
-                    'id'   => (string)$item->id,
+                    'id'   => (string) $item->id,
                    'name' => $item->name,
                ];
            }
--- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php
@@ -58,10 +58,6 @@ class CategoryController extends Controller
    /**
     * Documentation for this endpoint is at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCategoriesAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function categories(AutocompleteRequest $request): JsonResponse
    {
@@ -70,7 +66,7 @@ class CategoryController extends Controller
        $filtered = $result->map(
            static function (Category $item) {
                return [
-                    'id'   => (string)$item->id,
+                    'id'   => (string) $item->id,
                    'name' => $item->name,
                ];
            }
--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
@@ -58,10 +58,6 @@ class CurrencyController extends Controller
    /**
     * Documentation for this endpoint is at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function currencies(AutocompleteRequest $request): JsonResponse
    {
@@ -72,7 +68,7 @@ class CurrencyController extends Controller
        /** @var TransactionCurrency $currency */
        foreach ($collection as $currency) {
            $result[] = [
-                'id'             => (string)$currency->id,
+                'id'             => (string) $currency->id,
                'name'           => $currency->name,
                'code'           => $currency->code,
                'symbol'         => $currency->symbol,
@@ -87,9 +83,6 @@ class CurrencyController extends Controller
     * Documentation for this endpoint is at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesCodeAC
     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     * @deprecated
     */
    public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
@@ -101,7 +94,7 @@ class CurrencyController extends Controller
        /** @var TransactionCurrency $currency */
        foreach ($collection as $currency) {
            $result[] = [
-                'id'             => (string)$currency->id,
+                'id'             => (string) $currency->id,
                'name'           => sprintf('%s (%s)', $currency->name, $currency->code),
                'code'           => $currency->code,
                'symbol'         => $currency->symbol,
--- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
+++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
@@ -58,10 +58,6 @@ class ObjectGroupController extends Controller
    /**
     * Documentation for this endpoint is at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getObjectGroupsAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function objectGroups(AutocompleteRequest $request): JsonResponse
    {
@@ -72,7 +68,7 @@ class ObjectGroupController extends Controller
        /** @var ObjectGroup $objectGroup */
        foreach ($result as $objectGroup) {
            $return[] = [
-                'id'    => (string)$objectGroup->id,
+                'id'    => (string) $objectGroup->id,
                'name'  => $objectGroup->title,
                'title' => $objectGroup->title,
            ];
--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
@@ -62,10 +62,6 @@ class PiggyBankController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function piggyBanks(AutocompleteRequest $request): JsonResponse
    {
@@ -79,14 +75,14 @@ class PiggyBankController extends Controller
            $currency    = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
            $objectGroup = $piggy->objectGroups()->first();
            $response[]  = [
-                'id'                      => (string)$piggy->id,
+                'id'                      => (string) $piggy->id,
                'name'                    => $piggy->name,
-                '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,
-                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id,
                'object_group_title'      => $objectGroup?->title,
            ];
        }
@@ -97,10 +93,6 @@ class PiggyBankController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesBalanceAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
    {
@@ -108,13 +100,14 @@ class PiggyBankController extends Controller
        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
        $defaultCurrency = app('amount')->getDefaultCurrency();
        $response        = [];
+
        /** @var PiggyBank $piggy */
        foreach ($piggies as $piggy) {
            $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
            $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
            $objectGroup   = $piggy->objectGroups()->first();
            $response[]    = [
-                'id'                      => (string)$piggy->id,
+                'id'                      => (string) $piggy->id,
                'name'                    => $piggy->name,
                'name_with_balance'       => sprintf(
                    '%s (%s / %s)',
@@ -122,12 +115,12 @@ class PiggyBankController extends Controller
                    app('amount')->formatAnything($currency, $currentAmount, false),
                    app('amount')->formatAnything($currency, $piggy->targetamount, false),
                ),
-                '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,
-                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id,
                'object_group_title'      => $objectGroup?->title,
            ];
        }
--- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
@@ -56,10 +56,6 @@ class RecurrenceController extends Controller
    /**
     * This endpoint is documented at:
     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRecurringAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function recurring(AutocompleteRequest $request): JsonResponse
    {
@@ -70,7 +66,7 @@ class RecurrenceController extends Controller
        /** @var Recurrence $recurrence */
        foreach ($recurrences as $recurrence) {
            $response[] = [
-                'id'          => (string)$recurrence->id,
+                'id'          => (string) $recurrence->id,
                'name'        => $recurrence->title,
                'description' => $recurrence->description,
            ];
--- a/app/Api/V1/Controllers/Autocomplete/RuleController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php
@@ -55,10 +55,6 @@ class RuleController extends Controller
    /**
     * This endpoint is documented at:
     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRulesAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function rules(AutocompleteRequest $request): JsonResponse
    {
@@ -69,7 +65,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,
            ];
--- a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
@@ -55,10 +55,6 @@ class RuleGroupController extends Controller
    /**
     * This endpoint is documented at:
     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRuleGroupsAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function ruleGroups(AutocompleteRequest $request): JsonResponse
    {
@@ -69,7 +65,7 @@ class RuleGroupController extends Controller
        /** @var RuleGroup $group */
        foreach ($groups as $group) {
            $response[] = [
-                'id'          => (string)$group->id,
+                'id'          => (string) $group->id,
                'name'        => $group->title,
                'description' => $group->description,
            ];
--- a/app/Api/V1/Controllers/Autocomplete/TagController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TagController.php
@@ -58,21 +58,17 @@ class TagController extends Controller
    /**
     * This endpoint is documented at:
     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTagAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function tags(AutocompleteRequest $request): JsonResponse
    {
-        $data = $request->getData();
-
+        $data   = $request->getData();
        $result = $this->repository->searchTags($data['query'], $this->parameters->get('limit'));
        $array  = [];
+
        /** @var Tag $tag */
        foreach ($result as $tag) {
            $array[] = [
-                'id'   => (string)$tag->id,
+                'id'   => (string) $tag->id,
                'name' => $tag->tag,
                'tag'  => $tag->tag,
            ];
--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php
@@ -63,15 +63,11 @@ class TransactionController extends Controller
    /**
     * This endpoint is documented at:
     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function transactions(AutocompleteRequest $request): JsonResponse
    {
-        $data   = $request->getData();
-        $result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit'));
+        $data     = $request->getData();
+        $result   = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit'));

        // limit and unique
        $filtered = $result->unique('description');
@@ -80,8 +76,8 @@ class TransactionController extends Controller
        /** @var TransactionJournal $journal */
        foreach ($filtered as $journal) {
            $array[] = [
-                'id'                   => (string)$journal->id,
-                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'id'                   => (string) $journal->id,
+                'transaction_group_id' => (string) $journal->transaction_group_id,
                'name'                 => $journal->description,
                'description'          => $journal->description,
            ];
@@ -93,10 +89,6 @@ class TransactionController extends Controller
    /**
     * This endpoint is documented at:
     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsIDAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function transactionsWithID(AutocompleteRequest $request): JsonResponse
    {
@@ -104,7 +96,7 @@ class TransactionController extends Controller
        $result = new Collection();
        if (is_numeric($data['query'])) {
            // search for group, not journal.
-            $firstResult = $this->groupRepository->find((int)$data['query']);
+            $firstResult = $this->groupRepository->find((int) $data['query']);
            if (null !== $firstResult) {
                // group may contain multiple journals, each a result:
                foreach ($firstResult->transactionJournals as $journal) {
@@ -117,13 +109,13 @@ class TransactionController extends Controller
        }

        // limit and unique
-        $array = [];
+        $array  = [];

        /** @var TransactionJournal $journal */
        foreach ($result as $journal) {
            $array[] = [
-                'id'                   => (string)$journal->id,
-                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'id'                   => (string) $journal->id,
+                'transaction_group_id' => (string) $journal->transaction_group_id,
                'name'                 => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
                'description'          => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
            ];
--- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
@@ -54,10 +54,6 @@ class TransactionTypeController extends Controller
    /**
     * This endpoint is documented at
     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionTypesAC
-     *
-     * @param AutocompleteRequest $request
-     *
-     * @return JsonResponse
     */
    public function transactionTypes(AutocompleteRequest $request): JsonResponse
    {
@@ -69,7 +65,7 @@ class TransactionTypeController extends Controller
        foreach ($types as $type) {
            // different key for consistency.
            $array[] = [
-                'id'   => (string)$type->id,
+                'id'   => (string) $type->id,
                'name' => $type->type,
                'type' => $type->type,
            ];
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -30,13 +30,11 @@ use FireflyIII\Api\V1\Requests\Data\DateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use JsonException;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class AccountController
@@ -49,8 +47,6 @@ class AccountController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -71,25 +67,23 @@ class AccountController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/charts/getChartAccountOverview
     *
-     * @param DateRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
-     * @throws JsonException
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
     */
    public function overview(DateRequest $request): JsonResponse
    {
        // parameters for chart:
-        $dates = $request->getAll();
+        $dates      = $request->getAll();
+
        /** @var Carbon $start */
-        $start = $dates['start'];
+        $start      = $dates['start'];
+
        /** @var Carbon $end */
-        $end = $dates['end'];
+        $end        = $dates['end'];

        // user's preferences
        $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray();
+
+        /** @var Preference $frontPage */
        $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
        $default    = app('amount')->getDefaultCurrency();

@@ -98,19 +92,19 @@ class AccountController extends Controller
            $frontPage->save();
        }

-
        // get accounts:
-        $accounts  = $this->repository->getAccountsById($frontPage->data);
-        $chartData = [];
+        $accounts   = $this->repository->getAccountsById($frontPage->data);
+        $chartData  = [];
+
        /** @var Account $account */
        foreach ($accounts as $account) {
-            $currency = $this->repository->getAccountCurrency($account);
+            $currency     = $this->repository->getAccountCurrency($account);
            if (null === $currency) {
                $currency = $default;
            }
-            $currentSet = [
+            $currentSet   = [
                'label'                   => $account->name,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                'currency_code'           => $currency->code,
                'currency_symbol'         => $currency->symbol,
                'currency_decimal_places' => $currency->decimal_places,
@@ -124,16 +118,16 @@ class AccountController extends Controller
            $currentStart = clone $start;
            $range        = app('steam')->balanceInRange($account, $start, clone $end);
            // 2022-10-11 this method no longer converts to float.
-            $previous = array_values($range)[0];
+            $previous     = array_values($range)[0];
            while ($currentStart <= $end) {
-                $format   = $currentStart->format('Y-m-d');
-                $label    = $currentStart->toAtomString();
-                $balance  = array_key_exists($format, $range) ? $range[$format] : $previous;
-                $previous = $balance;
+                $format                        = $currentStart->format('Y-m-d');
+                $label                         = $currentStart->toAtomString();
+                $balance                       = array_key_exists($format, $range) ? $range[$format] : $previous;
+                $previous                      = $balance;
                $currentStart->addDay();
                $currentSet['entries'][$label] = $balance;
            }
-            $chartData[] = $currentSet;
+            $chartData[]  = $currentSet;
        }

        return response()->json($chartData);
--- a/app/Api/V1/Controllers/Controller.php
+++ b/app/Api/V1/Controllers/Controller.php
@@ -27,22 +27,22 @@ namespace FireflyIII\Api\V1\Controllers;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
+use FireflyIII\Models\Preference;
+use FireflyIII\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\Log;
 use League\Fractal\Manager;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\ParameterBag;

 /**
 * Class Controller.
 *
-
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
 */
 abstract class Controller extends BaseController
 {
@@ -50,7 +50,9 @@ abstract class Controller extends BaseController
    use DispatchesJobs;
    use ValidatesRequests;

-    protected const CONTENT_TYPE = 'application/vnd.api+json';
+    protected const string CONTENT_TYPE = 'application/vnd.api+json';
+
+    /** @var array<int, string> */
    protected array        $allowedSort;
    protected ParameterBag $parameters;

@@ -74,47 +76,76 @@ abstract class Controller extends BaseController
        );
    }

+    /**
+     * Method to help build URL's.
+     */
+    final protected function buildParams(): string
+    {
+        $return = '?';
+        $params = [];
+        foreach ($this->parameters as $key => $value) {
+            if ('page' === $key) {
+                continue;
+            }
+            if ($value instanceof Carbon) {
+                $params[$key] = $value->format('Y-m-d');
+
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        return $return.http_build_query($params);
+    }
+
+    final protected function getManager(): Manager
+    {
+        // create some objects:
+        $manager = new Manager();
+        $baseUrl = request()->getSchemeAndHttpHost().'/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        return $manager;
+    }
+
    /**
     * Method to grab all parameters from the URL.
-     *
-     * @return ParameterBag
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
     */
    private function getParameters(): ParameterBag
    {
-        $bag  = new ParameterBag();
-        $page = (int)request()->get('page');
+        $bag      = new ParameterBag();
+        $page     = (int)request()->get('page');
        if ($page < 1) {
            $page = 1;
        }
-        if ($page > pow(2, 16)) {
-            $page = pow(2, 16);
+        if ($page > 2 ** 16) {
+            $page = 2 ** 16;
        }
        $bag->set('page', $page);

        // some date fields:
-        $dates = ['start', 'end', 'date'];
+        $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());
+                app('log')->error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
                $value = null;
            }
-            $obj = null;
+            $obj  = null;
            if (null !== $date) {
                try {
-                    $obj = Carbon::parse($date);
-                } catch (InvalidDateException | InvalidFormatException $e) {
+                    $obj = Carbon::parse((string)$date);
+                } catch (InvalidDateException|InvalidFormatException $e) {
                    // don't care
                    app('log')->warning(
                        sprintf(
                            'Ignored invalid date "%s" in API controller parameter check: %s',
-                            substr($date, 0, 20),
+                            substr((string)$date, 0, 20),
                            $e->getMessage()
                        )
                    );
@@ -129,17 +160,23 @@ abstract class Controller extends BaseController
            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());
+                app('log')->error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
                $value = null;
            }
            if (null !== $value) {
                $bag->set($integer, (int)$value);
            }
-            if (null === $value && 'limit' === $integer && auth()->check()) {
+            if (null === $value
+                && 'limit' === $integer // @phpstan-ignore-line
+                && auth()->check()) {
                // set default for user:
-                $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+                /** @var User $user */
+                $user     = auth()->user();
+
+                /** @var Preference $pageSize */
+                $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data;
                $bag->set($integer, $pageSize);
            }
        }
@@ -148,26 +185,22 @@ abstract class Controller extends BaseController
        return $this->getSortParameters($bag);
    }

-    /**
-     * @param ParameterBag $bag
-     *
-     * @return ParameterBag
-     */
    private function getSortParameters(ParameterBag $bag): ParameterBag
    {
        $sortParameters = [];
+
        try {
            $param = (string)request()->query->get('sort');
        } catch (BadRequestException $e) {
-            Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
-            Log::error($e->getMessage());
-            Log::error($e->getTraceAsString());
+            app('log')->error('Request field "sort" contains a non-scalar value. Value set to NULL.');
+            app('log')->error($e->getMessage());
+            app('log')->error($e->getTraceAsString());
            $param = '';
        }
        if ('' === $param) {
            return $bag;
        }
-        $parts = explode(',', $param);
+        $parts          = explode(',', $param);
        foreach ($parts as $part) {
            $part      = trim($part);
            $direction = 'asc';
@@ -183,40 +216,4 @@ abstract class Controller extends BaseController

        return $bag;
    }
-
-    /**
-     * Method to help build URL's.
-     *
-     * @return string
-     */
-    final protected function buildParams(): string
-    {
-        $return = '?';
-        $params = [];
-        foreach ($this->parameters as $key => $value) {
-            if ('page' === $key) {
-                continue;
-            }
-            if ($value instanceof Carbon) {
-                $params[$key] = $value->format('Y-m-d');
-                continue;
-            }
-            $params[$key] = $value;
-        }
-
-        return $return . http_build_query($params);
-    }
-
-    /**
-     * @return Manager
-     */
-    final protected function getManager(): Manager
-    {
-        // create some objects:
-        $manager = new Manager();
-        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        return $manager;
-    }
 }
--- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php
+++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php
@@ -44,9 +44,6 @@ class TransactionController extends Controller
 {
    private AccountRepositoryInterface $repository;

-    /**
-     *
-     */
    public function __construct()
    {
        parent::__construct();
@@ -63,10 +60,6 @@ class TransactionController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/bulkUpdateTransactions
-     *
-     * @param TransactionRequest $request
-     *
-     * @return JsonResponse
     */
    public function update(TransactionRequest $request): JsonResponse
    {
@@ -76,12 +69,12 @@ class TransactionController extends Controller
        // this deserves better code, but for now a loop of basic if-statements
        // to respond to what is in the $query.
        // this is OK because only one thing can be in the query at the moment.
-        if ($this->updatesTransactionAccount($params)) {
-            $original    = $this->repository->find((int)$params['where']['account_id']);
-            $destination = $this->repository->find((int)$params['update']['account_id']);
+        if ($this->isUpdateTransactionAccount($params)) {
+            $original    = $this->repository->find((int) $params['where']['account_id']);
+            $destination = $this->repository->find((int) $params['update']['account_id']);

            /** @var AccountDestroyService $service */
-            $service = app(AccountDestroyService::class);
+            $service     = app(AccountDestroyService::class);
            $service->moveTransactions($original, $destination);
        }

@@ -89,11 +82,9 @@ class TransactionController extends Controller
    }

    /**
-     * @param array $params
-     *
-     * @return bool
+     * @param array<string, array<string, string>> $params
     */
-    private function updatesTransactionAccount(array $params): bool
+    private function isUpdateTransactionAccount(array $params): bool
    {
        return array_key_exists('account_id', $params['where']) && array_key_exists('account_id', $params['update']);
    }
--- a/app/Api/V1/Controllers/Data/DestroyController.php
+++ b/app/Api/V1/Controllers/Data/DestroyController.php
@@ -58,160 +58,53 @@ class DestroyController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/destroyData
     *
-     * @param DestroyRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function destroy(DestroyRequest $request): JsonResponse
    {
-        $objects      = $request->getObjects();
-        $this->unused = $request->boolean('unused', false);
-        switch ($objects) {
-            default:
-                throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects));
-            case 'budgets':
-                $this->destroyBudgets();
-                break;
-            case 'bills':
-                $this->destroyBills();
-                break;
-            case 'piggy_banks':
-                $this->destroyPiggyBanks();
-                break;
-            case 'rules':
-                $this->destroyRules();
-                break;
-            case 'recurring':
-                $this->destroyRecurringTransactions();
-                break;
-            case 'categories':
-                $this->destroyCategories();
-                break;
-            case 'tags':
-                $this->destroyTags();
-                break;
-            case 'object_groups':
-                $this->destroyObjectGroups();
-                break;
-            case 'not_assets_liabilities':
-                $this->destroyAccounts(
-                    [
-                        AccountType::BENEFICIARY,
-                        AccountType::CASH,
-                        AccountType::CREDITCARD,
-                        AccountType::DEFAULT,
-                        AccountType::EXPENSE,
-                        AccountType::IMPORT,
-                        AccountType::INITIAL_BALANCE,
-                        AccountType::LIABILITY_CREDIT,
-                        AccountType::RECONCILIATION,
-                        AccountType::REVENUE,
-                    ]
-                );
-                break;
-            case 'accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::ASSET,
-                        AccountType::BENEFICIARY,
-                        AccountType::CASH,
-                        AccountType::CREDITCARD,
-                        AccountType::DEBT,
-                        AccountType::DEFAULT,
-                        AccountType::EXPENSE,
-                        AccountType::IMPORT,
-                        AccountType::INITIAL_BALANCE,
-                        AccountType::LIABILITY_CREDIT,
-                        AccountType::LOAN,
-                        AccountType::MORTGAGE,
-                        AccountType::RECONCILIATION,
-                        AccountType::REVENUE,
-                    ]
-                );
-                break;
-            case 'asset_accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::ASSET,
-                        AccountType::DEFAULT,
-                    ]
-                );
-                break;
-            case 'expense_accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::BENEFICIARY,
-                        AccountType::EXPENSE,
-                    ]
-                );
-                break;
-            case 'revenue_accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::REVENUE,
-                    ]
-                );
-                break;
-            case 'liabilities':
-                $this->destroyAccounts(
-                    [
-                        AccountType::DEBT,
-                        AccountType::LOAN,
-                        AccountType::MORTGAGE,
-                        AccountType::CREDITCARD,
-                    ]
-                );
-                break;
-            case 'transactions':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::WITHDRAWAL,
-                        TransactionType::DEPOSIT,
-                        TransactionType::TRANSFER,
-                        TransactionType::RECONCILIATION,
-                        TransactionType::OPENING_BALANCE,
-                    ]
-                );
-                break;
-            case 'withdrawals':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::WITHDRAWAL,
-                    ]
-                );
-                break;
-            case 'deposits':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::DEPOSIT,
-                    ]
-                );
-                break;
-            case 'transfers':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::TRANSFER,
-                    ]
-                );
-                break;
-        }
+        $objects         = $request->getObjects();
+        $this->unused    = $request->boolean('unused', false);
+
+        $allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE];
+        $all             = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION];
+        $liabilities     = [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
+        $transactions    = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::RECONCILIATION, TransactionType::OPENING_BALANCE];
+
+        match ($objects) {
+            'budgets'                => $this->destroyBudgets(),
+            'bills'                  => $this->destroyBills(),
+            'piggy_banks'            => $this->destroyPiggyBanks(),
+            'rules'                  => $this->destroyRules(),
+            'recurring'              => $this->destroyRecurringTransactions(),
+            'categories'             => $this->destroyCategories(),
+            'tags'                   => $this->destroyTags(),
+            'object_groups'          => $this->destroyObjectGroups(),
+            'not_assets_liabilities' => $this->destroyAccounts($allExceptAssets),
+            'accounts'               => $this->destroyAccounts($all),
+            'asset_accounts'         => $this->destroyAccounts([AccountType::ASSET, AccountType::DEFAULT]),
+            'expense_accounts'       => $this->destroyAccounts([AccountType::BENEFICIARY, AccountType::EXPENSE]),
+            'revenue_accounts'       => $this->destroyAccounts([AccountType::REVENUE]),
+            'liabilities'            => $this->destroyAccounts($liabilities),
+            'transactions'           => $this->destroyTransactions($transactions),
+            'withdrawals'            => $this->destroyTransactions([TransactionType::WITHDRAWAL]),
+            'deposits'               => $this->destroyTransactions([TransactionType::DEPOSIT]),
+            'transfers'              => $this->destroyTransactions([TransactionType::TRANSFER]),
+            default                  => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)),
+        };
+
        app('preferences')->mark();

        return response()->json([], 204);
    }

-    /**
-     *
-     */
    private function destroyBudgets(): void
    {
        /** @var AvailableBudgetRepositoryInterface $abRepository */
-        $abRepository = app(AvailableBudgetRepositoryInterface::class);
+        $abRepository     = app(AvailableBudgetRepositoryInterface::class);
        $abRepository->destroyAll();

        /** @var BudgetLimitRepositoryInterface $blRepository */
-        $blRepository = app(BudgetLimitRepositoryInterface::class);
+        $blRepository     = app(BudgetLimitRepositoryInterface::class);
        $blRepository->destroyAll();

        /** @var BudgetRepositoryInterface $budgetRepository */
@@ -219,9 +112,6 @@ class DestroyController extends Controller
        $budgetRepository->destroyAll();
    }

-    /**
-     *
-     */
    private function destroyBills(): void
    {
        /** @var BillRepositoryInterface $repository */
@@ -229,9 +119,6 @@ class DestroyController extends Controller
        $repository->destroyAll();
    }

-    /**
-     *
-     */
    private function destroyPiggyBanks(): void
    {
        /** @var PiggyBankRepositoryInterface $repository */
@@ -239,9 +126,6 @@ class DestroyController extends Controller
        $repository->destroyAll();
    }

-    /**
-     *
-     */
    private function destroyRules(): void
    {
        /** @var RuleGroupRepositoryInterface $repository */
@@ -249,9 +133,6 @@ class DestroyController extends Controller
        $repository->destroyAll();
    }

-    /**
-     *
-     */
    private function destroyRecurringTransactions(): void
    {
        /** @var RecurringRepositoryInterface $repository */
@@ -259,9 +140,6 @@ class DestroyController extends Controller
        $repository->destroyAll();
    }

-    /**
-     *
-     */
    private function destroyCategories(): void
    {
        /** @var CategoryRepositoryInterface $categoryRepos */
@@ -269,9 +147,6 @@ class DestroyController extends Controller
        $categoryRepos->destroyAll();
    }

-    /**
-     *
-     */
    private function destroyTags(): void
    {
        /** @var TagRepositoryInterface $tagRepository */
@@ -279,9 +154,6 @@ class DestroyController extends Controller
        $tagRepository->destroyAll();
    }

-    /**
-     * @return void
-     */
    private function destroyObjectGroups(): void
    {
        /** @var ObjectGroupRepositoryInterface $repository */
@@ -290,7 +162,7 @@ class DestroyController extends Controller
    }

    /**
-     * @param array $types
+     * @param array<int, string> $types
     */
    private function destroyAccounts(array $types): void
    {
@@ -303,19 +175,22 @@ class DestroyController extends Controller
        foreach ($collection as $account) {
            $count = $account->transactions()->count();
            if (true === $this->unused && 0 === $count) {
-                Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
+                app('log')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
+                Log::channel('audit')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
                $service->destroy($account, null);
+
                continue;
            }
            if (false === $this->unused) {
-                Log::info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
+                app('log')->info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
+                Log::channel('audit')->info(sprintf('Deleted account #%d "%s"', $account->id, $account->name));
                $service->destroy($account, null);
            }
        }
    }

    /**
-     * @param array $types
+     * @param array<int, string> $types
     */
    private function destroyTransactions(array $types): void
    {
@@ -323,6 +198,7 @@ class DestroyController extends Controller
        $repository = app(JournalRepositoryInterface::class);
        $journals   = $repository->findByType($types);
        $service    = app(JournalDestroyService::class);
+
        /** @var TransactionJournal $journal */
        foreach ($journals as $journal) {
            $service->destroy($journal);
--- a/app/Api/V1/Controllers/Data/Export/ExportController.php
+++ b/app/Api/V1/Controllers/Data/Export/ExportController.php
@@ -29,8 +29,6 @@ use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class ExportController
@@ -59,10 +57,9 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportAccounts
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function accounts(ExportRequest $request): LaravelResponse
    {
@@ -71,44 +68,13 @@ class ExportController extends Controller
        return $this->returnExport('accounts');
    }

-    /**
-     * @param string $key
-     *
-     * @return LaravelResponse
-     * @throws FireflyException
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
-     */
-    private function returnExport(string $key): LaravelResponse
-    {
-        $date     = date('Y-m-d-H-i-s');
-        $fileName = sprintf('%s-export-%s.csv', $date, $key);
-        $data     = $this->exporter->export();
-
-        /** @var LaravelResponse $response */
-        $response = response($data[$key]);
-        $response
-            ->header('Content-Description', 'File Transfer')
-            ->header('Content-Type', 'application/octet-stream')
-            ->header('Content-Disposition', 'attachment; filename=' . $fileName)
-            ->header('Content-Transfer-Encoding', 'binary')
-            ->header('Connection', 'Keep-Alive')
-            ->header('Expires', '0')
-            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
-            ->header('Pragma', 'public')
-            ->header('Content-Length', (string)strlen($data[$key]));
-
-        return $response;
-    }
-
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function bills(ExportRequest $request): LaravelResponse
    {
@@ -121,10 +87,9 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBudgets
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function budgets(ExportRequest $request): LaravelResponse
    {
@@ -137,10 +102,9 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportCategories
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function categories(ExportRequest $request): LaravelResponse
    {
@@ -153,10 +117,9 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportPiggies
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function piggyBanks(ExportRequest $request): LaravelResponse
    {
@@ -169,10 +132,9 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRecurring
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function recurring(ExportRequest $request): LaravelResponse
    {
@@ -185,10 +147,9 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRules
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function rules(ExportRequest $request): LaravelResponse
    {
@@ -201,10 +162,9 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTags
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function tags(ExportRequest $request): LaravelResponse
    {
@@ -217,9 +177,6 @@ class ExportController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTransactions
     *
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
     * @throws FireflyException
     */
    public function transactions(ExportRequest $request): LaravelResponse
@@ -232,4 +189,30 @@ class ExportController extends Controller

        return $this->returnExport('transactions');
    }
+
+    /**
+     * @throws FireflyException
+     */
+    private function returnExport(string $key): LaravelResponse
+    {
+        $date     = date('Y-m-d-H-i-s');
+        $fileName = sprintf('%s-export-%s.csv', $date, $key);
+        $data     = $this->exporter->export();
+
+        /** @var LaravelResponse $response */
+        $response = response($data[$key]);
+        $response
+            ->header('Content-Description', 'File Transfer')
+            ->header('Content-Type', 'application/octet-stream')
+            ->header('Content-Disposition', 'attachment; filename='.$fileName)
+            ->header('Content-Transfer-Encoding', 'binary')
+            ->header('Connection', 'Keep-Alive')
+            ->header('Expires', '0')
+            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+            ->header('Pragma', 'public')
+            ->header('Content-Length', (string) strlen($data[$key]))
+        ;
+
+        return $response;
+    }
 }
--- a/app/Api/V1/Controllers/Data/PurgeController.php
+++ b/app/Api/V1/Controllers/Data/PurgeController.php
@@ -35,6 +35,7 @@ use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;

 /**
@@ -46,11 +47,10 @@ class PurgeController extends Controller
     * TODO cleanup and use repositories.
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/purgeData
-     *
-     * @return JsonResponse
     */
    public function purge(): JsonResponse
    {
+        /** @var User $user */
        $user = auth()->user();

        // some manual code, too lazy to call all repositories.
@@ -62,8 +62,10 @@ class PurgeController extends Controller
        Bill::whereUserId($user->id)->onlyTrashed()->forceDelete();

        // piggies
-        $set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
-                        ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
+        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
+            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
+        ;
+
        /** @var PiggyBank $piggy */
        foreach ($set as $piggy) {
            $piggy->forceDelete();
@@ -84,7 +86,6 @@ class PurgeController extends Controller
        // tags
        Tag::whereUserId($user->id)->onlyTrashed()->forceDelete();

-
        // accounts
        Account::whereUserId($user->id)->onlyTrashed()->forceDelete();

--- a/app/Api/V1/Controllers/Insight/Expense/AccountController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/AccountController.php
@@ -32,7 +32,6 @@ use FireflyIII\Support\Http\Api\ApiSupport;
 use Illuminate\Http\JsonResponse;

 /**
- *
 * Class AccountController
 *
 * Shows expense information grouped or limited by date.
@@ -47,16 +46,14 @@ class AccountController extends Controller

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

                $this->opsRepository = app(OperationsRepositoryInterface::class);
@@ -70,10 +67,6 @@ class AccountController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseAsset
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function asset(GenericRequest $request): JsonResponse
    {
@@ -101,10 +94,6 @@ class AccountController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseExpense
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function expense(GenericRequest $request): JsonResponse
    {
--- a/app/Api/V1/Controllers/Insight/Expense/BillController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/BillController.php
@@ -60,18 +60,14 @@ class BillController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBill
     *
     * Expenses per bill, possibly filtered by bill and account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function bill(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $bills    = $request->getBills();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $bills      = $request->getBills();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // get all bills:
        if (0 === $bills->count()) {
@@ -79,7 +75,7 @@ class BillController extends Controller
        }

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
        $collector->setBills($bills);

@@ -92,7 +88,7 @@ class BillController extends Controller
            $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId);

            if (0 !== $currencyId) {
-                $response[$key]                     = $response[$key] ?? [
+                $response[$key] ??= [
                    'id'               => (string)$billId,
                    'name'             => $journal['bill_name'],
                    'difference'       => '0',
@@ -104,7 +100,7 @@ class BillController extends Controller
                $response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignKey]                     = $response[$foreignKey] ?? [
+                $response[$foreignKey] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$foreignCurrencyId,
@@ -123,20 +119,16 @@ class BillController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBill
     *
     * Expenses for no bill filtered by account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noBill(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
        $collector->withoutBill();

@@ -147,7 +139,7 @@ class BillController extends Controller
            $foreignCurrencyId = (int)$journal['foreign_currency_id'];

            if (0 !== $currencyId) {
-                $response[$currencyId]                     = $response[$currencyId] ?? [
+                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$currencyId,
@@ -157,7 +149,7 @@ class BillController extends Controller
                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                $response[$foreignCurrencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$foreignCurrencyId,
--- a/app/Api/V1/Controllers/Insight/Expense/BudgetController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/BudgetController.php
@@ -43,8 +43,6 @@ class BudgetController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -67,10 +65,6 @@ class BudgetController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBudget
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function budget(GenericRequest $request): JsonResponse
    {
@@ -82,9 +76,11 @@ class BudgetController extends Controller
        if (0 === $budgets->count()) {
            $budgets = $this->repository->getActiveBudgets();
        }
+
        /** @var Budget $budget */
        foreach ($budgets as $budget) {
            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$budget]));
+
            /** @var array $expense */
            foreach ($expenses as $expense) {
                $result[] = [
@@ -104,10 +100,6 @@ class BudgetController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBudget
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noBudget(GenericRequest $request): JsonResponse
    {
@@ -116,6 +108,7 @@ class BudgetController extends Controller
        $assetAccounts = $request->getAssetAccounts();
        $result        = [];
        $expenses      = $this->noRepository->sumExpenses($start, $end, $assetAccounts);
+
        /** @var array $expense */
        foreach ($expenses as $expense) {
            $result[] = [
--- a/app/Api/V1/Controllers/Insight/Expense/CategoryController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/CategoryController.php
@@ -44,8 +44,6 @@ class CategoryController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -68,10 +66,6 @@ class CategoryController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function category(GenericRequest $request): JsonResponse
    {
@@ -83,9 +77,11 @@ class CategoryController extends Controller
        if (0 === $categories->count()) {
            $categories = $this->repository->getCategories();
        }
+
        /** @var Category $category */
        foreach ($categories as $category) {
            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$category]));
+
            /** @var array $expense */
            foreach ($expenses as $expense) {
                $result[] = [
@@ -105,10 +101,6 @@ class CategoryController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noCategory(GenericRequest $request): JsonResponse
    {
@@ -117,6 +109,7 @@ class CategoryController extends Controller
        $assetAccounts = $request->getAssetAccounts();
        $result        = [];
        $expenses      = $this->noRepository->sumExpenses($start, $end, $assetAccounts);
+
        /** @var array $expense */
        foreach ($expenses as $expense) {
            $result[] = [
--- a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
@@ -37,20 +37,16 @@ class PeriodController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTotal
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function total(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // collect all expenses in this period (regardless of type)
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
        $genericSet = $collector->getExtractedJournals();
        foreach ($genericSet as $journal) {
@@ -58,7 +54,7 @@ class PeriodController extends Controller
            $foreignCurrencyId = (int)$journal['foreign_currency_id'];

            if (0 !== $currencyId) {
-                $response[$currencyId]                     = $response[$currencyId] ?? [
+                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$currencyId,
@@ -68,7 +64,7 @@ class PeriodController extends Controller
                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                $response[$foreignCurrencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$foreignCurrencyId,
--- a/app/Api/V1/Controllers/Insight/Expense/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/TagController.php
@@ -59,48 +59,44 @@ class TagController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoTag
     *
     * Expenses for no tag filtered by account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noTag(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
        $collector->withoutTags();

        $genericSet = $collector->getExtractedJournals();

        foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];

            if (0 !== $currencyId) {
-                $response[$currencyId]                     = $response[$currencyId] ?? [
+                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                    'currency_code'    => $journal['currency_code'],
                ];
                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                $response[$foreignCurrencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                    'currency_code'    => $journal['foreign_currency_code'],
                ];
                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
            }
        }

@@ -112,18 +108,14 @@ class TagController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTag
     *
     * Expenses per tag, possibly filtered by tag and account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function tag(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $tags     = $request->getTags();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $tags       = $request->getTags();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // get all tags:
        if (0 === $tags->count()) {
@@ -131,14 +123,15 @@ class TagController extends Controller
        }

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
        $collector->setTags($tags);
        $genericSet = $collector->getExtractedJournals();
+
        /** @var array $journal */
        foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];

            /** @var array $tag */
            foreach ($journal['tags'] as $tag) {
@@ -148,16 +141,16 @@ class TagController extends Controller

                // on currency ID
                if (0 !== $currencyId) {
-                    $response[$key]                     = $response[$key] ?? [
-                        'id'               => (string)$tagId,
+                    $response[$key] ??= [
+                        'id'               => (string) $tagId,
                        'name'             => $tag['name'],
                        'difference'       => '0',
                        'difference_float' => 0,
-                        'currency_id'      => (string)$currencyId,
+                        'currency_id'      => (string) $currencyId,
                        'currency_code'    => $journal['currency_code'],
                    ];
                    $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
-                    $response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose.
+                    $response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose.
                }

                // on foreign ID
@@ -165,11 +158,11 @@ class TagController extends Controller
                    $response[$foreignKey]                     = $journal[$foreignKey] ?? [
                        'difference'       => '0',
                        'difference_float' => 0,
-                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_id'      => (string) $foreignCurrencyId,
                        'currency_code'    => $journal['foreign_currency_code'],
                    ];
                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose.
+                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose.
                }
            }
        }
--- a/app/Api/V1/Controllers/Insight/Income/AccountController.php
+++ b/app/Api/V1/Controllers/Insight/Income/AccountController.php
@@ -32,7 +32,6 @@ use FireflyIII\Support\Http\Api\ApiSupport;
 use Illuminate\Http\JsonResponse;

 /**
- *
 * Class AccountController
 *
 * Shows income information grouped or limited by date.
@@ -47,16 +46,14 @@ class AccountController extends Controller

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

                $this->opsRepository = app(OperationsRepositoryInterface::class);
@@ -70,10 +67,6 @@ class AccountController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeAsset
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function asset(GenericRequest $request): JsonResponse
    {
@@ -82,6 +75,7 @@ class AccountController extends Controller
        $assetAccounts = $request->getAssetAccounts();
        $income        = $this->opsRepository->sumIncomeByDestination($start, $end, $assetAccounts);
        $result        = [];
+
        /** @var array $entry */
        foreach ($income as $entry) {
            $result[] = [
@@ -100,10 +94,6 @@ class AccountController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeRevenue
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function revenue(GenericRequest $request): JsonResponse
    {
--- a/app/Api/V1/Controllers/Insight/Income/CategoryController.php
+++ b/app/Api/V1/Controllers/Insight/Income/CategoryController.php
@@ -44,8 +44,6 @@ class CategoryController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -68,10 +66,6 @@ class CategoryController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeCategory
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function category(GenericRequest $request): JsonResponse
    {
@@ -83,9 +77,11 @@ class CategoryController extends Controller
        if (0 === $categories->count()) {
            $categories = $this->repository->getCategories();
        }
+
        /** @var Category $category */
        foreach ($categories as $category) {
            $expenses = $this->opsRepository->sumIncome($start, $end, $assetAccounts, new Collection([$category]));
+
            /** @var array $expense */
            foreach ($expenses as $expense) {
                $result[] = [
@@ -105,10 +101,6 @@ class CategoryController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoCategory
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noCategory(GenericRequest $request): JsonResponse
    {
@@ -117,6 +109,7 @@ class CategoryController extends Controller
        $assetAccounts = $request->getAssetAccounts();
        $result        = [];
        $expenses      = $this->noRepository->sumIncome($start, $end, $assetAccounts);
+
        /** @var array $expense */
        foreach ($expenses as $expense) {
            $result[] = [
--- a/app/Api/V1/Controllers/Insight/Income/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Income/PeriodController.php
@@ -37,20 +37,16 @@ class PeriodController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTotal
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function total(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // collect all expenses in this period (regardless of type)
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
        $genericSet = $collector->getExtractedJournals();
        foreach ($genericSet as $journal) {
@@ -58,7 +54,7 @@ class PeriodController extends Controller
            $foreignCurrencyId = (int)$journal['foreign_currency_id'];

            if (0 !== $currencyId) {
-                $response[$currencyId]                     = $response[$currencyId] ?? [
+                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$currencyId,
@@ -68,7 +64,7 @@ class PeriodController extends Controller
                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                $response[$foreignCurrencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$foreignCurrencyId,
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -60,20 +60,16 @@ class TagController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTag
     *
     * Expenses for no tag filtered by account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noTag(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
        $collector->withoutTags();

@@ -84,7 +80,7 @@ class TagController extends Controller
            $foreignCurrencyId = (int)$journal['foreign_currency_id'];

            if (0 !== $currencyId) {
-                $response[$currencyId]                     = $response[$currencyId] ?? [
+                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$currencyId,
@@ -94,7 +90,7 @@ class TagController extends Controller
                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                $response[$foreignCurrencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$foreignCurrencyId,
@@ -116,18 +112,14 @@ class TagController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoTag
     *
     * Expenses per tag, possibly filtered by tag and account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function tag(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $tags     = $request->getTags();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $tags       = $request->getTags();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // get all tags:
        if (0 === $tags->count()) {
@@ -135,10 +127,11 @@ class TagController extends Controller
        }

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
        $collector->setTags($tags);
        $genericSet = $collector->getExtractedJournals();
+
        /** @var array $journal */
        foreach ($genericSet as $journal) {
            $currencyId        = (int)$journal['currency_id'];
@@ -152,7 +145,7 @@ class TagController extends Controller

                // on currency ID
                if (0 !== $currencyId) {
-                    $response[$key]                     = $response[$key] ?? [
+                    $response[$key] ??= [
                        'id'               => (string)$tagId,
                        'name'             => $tag['name'],
                        'difference'       => '0',
--- a/app/Api/V1/Controllers/Insight/Transfer/AccountController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/AccountController.php
@@ -40,8 +40,6 @@ class AccountController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -60,10 +58,6 @@ class AccountController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransfers
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function asset(GenericRequest $request): JsonResponse
    {
--- a/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php
@@ -43,8 +43,6 @@ class CategoryController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -67,10 +65,6 @@ class CategoryController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function category(GenericRequest $request): JsonResponse
    {
@@ -82,9 +76,11 @@ class CategoryController extends Controller
        if (0 === $categories->count()) {
            $categories = $this->repository->getCategories();
        }
+
        /** @var Category $category */
        foreach ($categories as $category) {
            $expenses = $this->opsRepository->sumTransfers($start, $end, $assetAccounts, new Collection([$category]));
+
            /** @var array $expense */
            foreach ($expenses as $expense) {
                $result[] = [
@@ -104,10 +100,6 @@ class CategoryController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noCategory(GenericRequest $request): JsonResponse
    {
@@ -116,6 +108,7 @@ class CategoryController extends Controller
        $assetAccounts = $request->getAssetAccounts();
        $result        = [];
        $expenses      = $this->noRepository->sumTransfers($start, $end, $assetAccounts);
+
        /** @var array $expense */
        foreach ($expenses as $expense) {
            $result[] = [
--- a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php
@@ -37,20 +37,16 @@ class PeriodController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTotal
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function total(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // collect all expenses in this period (regardless of type)
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
        $genericSet = $collector->getExtractedJournals();
        foreach ($genericSet as $journal) {
@@ -58,7 +54,7 @@ class PeriodController extends Controller
            $foreignCurrencyId = (int)$journal['foreign_currency_id'];

            if (0 !== $currencyId) {
-                $response[$currencyId]                     = $response[$currencyId] ?? [
+                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$currencyId,
@@ -68,7 +64,7 @@ class PeriodController extends Controller
                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                $response[$foreignCurrencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$foreignCurrencyId,
--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
@@ -57,20 +57,16 @@ class TagController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoTag
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noTag(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
        $collector->withoutTags();

@@ -81,7 +77,7 @@ class TagController extends Controller
            $foreignCurrencyId = (int)$journal['foreign_currency_id'];

            if (0 !== $currencyId) {
-                $response[$currencyId]                     = $response[$currencyId] ?? [
+                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$currencyId,
@@ -91,7 +87,7 @@ class TagController extends Controller
                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
            }
            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                $response[$foreignCurrencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string)$foreignCurrencyId,
@@ -113,18 +109,14 @@ class TagController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTag
     *
     * Transfers per tag, possibly filtered by tag and account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function tag(GenericRequest $request): JsonResponse
    {
-        $accounts = $request->getAssetAccounts();
-        $tags     = $request->getTags();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
+        $accounts   = $request->getAssetAccounts();
+        $tags       = $request->getTags();
+        $start      = $request->getStart();
+        $end        = $request->getEnd();
+        $response   = [];

        // get all tags:
        if (0 === $tags->count()) {
@@ -132,10 +124,11 @@ class TagController extends Controller
        }

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
+        $collector  = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
        $collector->setTags($tags);
        $genericSet = $collector->getExtractedJournals();
+
        /** @var array $journal */
        foreach ($genericSet as $journal) {
            $currencyId        = (int)$journal['currency_id'];
@@ -149,7 +142,7 @@ class TagController extends Controller

                // on currency ID
                if (0 !== $currencyId) {
-                    $response[$key]                     = $response[$key] ?? [
+                    $response[$key] ??= [
                        'id'               => (string)$tagId,
                        'name'             => $tag['name'],
                        'difference'       => '0',
--- a/app/Api/V1/Controllers/Models/Account/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Account/DestroyController.php
@@ -33,14 +33,12 @@ use Illuminate\Http\JsonResponse;
 */
 class DestroyController extends Controller
 {
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';

    private AccountRepositoryInterface $repository;

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -60,10 +58,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/deleteAccount
     *
     * Remove the specified resource from storage.
-     *
-     * @param Account $account
-     *
-     * @return JsonResponse
     */
    public function destroy(Account $account): JsonResponse
    {
--- a/app/Api/V1/Controllers/Models/Account/ListController.php
+++ b/app/Api/V1/Controllers/Models/Account/ListController.php
@@ -47,14 +47,12 @@ class ListController extends Controller
 {
    use TransactionFilter;

-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';

    private AccountRepositoryInterface $repository;

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -73,29 +71,26 @@ class ListController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAttachmentByAccount
     *
-     * @param Account $account
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function attachments(Account $account): JsonResponse
    {
-        $manager    = $this->getManager();
-        $pageSize   = $this->parameters->get('limit');
-        $collection = $this->repository->getAttachments($account);
+        $manager     = $this->getManager();
+        $pageSize    = $this->parameters->get('limit');
+        $collection  = $this->repository->getAttachments($account);

        $count       = $collection->count();
        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

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

-        $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);
@@ -105,33 +100,30 @@ class ListController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listPiggyBankByAccount
     *
-     * @param Account $account
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function piggyBanks(Account $account): JsonResponse
    {
        // create some objects:
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of budgets. Count it and split it.
-        $collection = $this->repository->getPiggyBanks($account);
-        $count      = $collection->count();
-        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getPiggyBanks($account);
+        $count       = $collection->count();
+        $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

        /** @var PiggyBankTransformer $transformer */
        $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);
@@ -143,28 +135,25 @@ class ListController extends Controller
     *
     * Show all transaction groups related to the account.
     *
-     *
-     * @param Request $request
-     * @param Account $account
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function transactions(Request $request, Account $account): JsonResponse
    {
-        $pageSize = $this->parameters->get('limit');
-        $type     = $request->get('type') ?? 'default';
+        $pageSize    = $this->parameters->get('limit');
+        $type        = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);
-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
+        $types       = $this->mapTransactionTypes($this->parameters->get('type'));
+        $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)->setAccounts(new Collection([$account]))
-                  ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types);
+            ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types)
+        ;

        if (null !== $this->parameters->get('start')) {
            $collector->setStart($this->parameters->get('start'));
@@ -173,15 +162,15 @@ class ListController extends Controller
            $collector->setEnd($this->parameters->get('end'));
        }

-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]) . $this->buildParams());
-        $groups = $paginator->getCollection();
+        $paginator   = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
+        $groups      = $paginator->getCollection();

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -43,14 +43,12 @@ class ShowController extends Controller
 {
    use AccountFilter;

-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';

    private AccountRepositoryInterface $repository;

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -71,40 +69,36 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @param Request $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(Request $request): JsonResponse
    {
-        $manager = $this->getManager();
-        $type    = $request->get('type') ?? 'all';
+        $manager     = $this->getManager();
+        $type        = $request->get('type') ?? 'all';
        $this->parameters->set('type', $type);

        // types to get, page size:
-        $types    = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize = $this->parameters->get('limit');
+        $types       = $this->mapAccountTypes($this->parameters->get('type'));
+        $pageSize    = $this->parameters->get('limit');

        // get list of accounts. Count it and split it.
        $this->repository->resetAccountOrder();
-        $collection = $this->repository->getAccountsByType($types, $this->parameters->get('sort') ?? []);
-        $count      = $collection->count();
+        $collection  = $this->repository->getAccountsByType($types, $this->parameters->get('sort') ?? []);
+        $count       = $collection->count();

        // continue sort:

-
-        $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

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

-        $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);
+        $resource    = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -115,22 +109,18 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/getAccount
     *
     * Show single instance.
-     *
-     * @param Account $account
-     *
-     * @return JsonResponse
     */
    public function show(Account $account): JsonResponse
    {
        // get list of accounts. Count it and split it.
        $this->repository->resetAccountOrder();
        $account->refresh();
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Account/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Account/StoreController.php
@@ -35,14 +35,12 @@ use League\Fractal\Resource\Item;
 */
 class StoreController extends Controller
 {
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';

    private AccountRepositoryInterface $repository;

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -62,23 +60,19 @@ class StoreController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/storeAccount
     *
     * Store a new instance.
-     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     */
    public function store(StoreRequest $request): JsonResponse
    {
-        $data = $request->getAllAccountData();
+        $data        = $request->getAllAccountData();
        $this->repository->resetAccountOrder();
-        $account = $this->repository->store($data);
-        $manager = $this->getManager();
+        $account     = $this->repository->store($data);
+        $manager     = $this->getManager();

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

-        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
+        $resource    = new Item($account, $transformer, self::RESOURCE_KEY);

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Account/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php
@@ -29,23 +29,19 @@ use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\AccountTransformer;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
-use Preferences;

 /**
 * Class UpdateController
 */
 class UpdateController extends Controller
 {
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';

    private AccountRepositoryInterface $repository;

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -65,26 +61,21 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/updateAccount
     *
     * Update account.
-     *
-     * @param UpdateRequest $request
-     * @param Account       $account
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, Account $account): JsonResponse
    {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
        $data         = $request->getUpdateData();
-        $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type);
        $account      = $this->repository->update($account, $data);
        $manager      = $this->getManager();
        $account->refresh();
-        Preferences::mark();
+        app('preferences')->mark();

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Attachment/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/DestroyController.php
@@ -29,6 +29,8 @@ use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
 * Class DestroyController
@@ -39,8 +41,6 @@ class DestroyController extends Controller

    /**
     * DestroyController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -63,14 +63,15 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/deleteAttachment
     *
     * Remove the specified resource from storage.
-     *
-     *
-     * @param Attachment $attachment
-     *
-     * @return JsonResponse
     */
    public function destroy(Attachment $attachment): JsonResponse
    {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
        $this->repository->destroy($attachment);
        app('preferences')->mark();

--- a/app/Api/V1/Controllers/Models/Attachment/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/ShowController.php
@@ -33,9 +33,11 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response as LaravelResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
 * Class ShowController
@@ -46,8 +48,6 @@ class ShowController extends Controller

    /**
     * ShowController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -71,13 +71,15 @@ class ShowController extends Controller
     *
     * Download an attachment.
     *
-     * @param Attachment $attachment
-     *
-     * @return LaravelResponse
-     * @throws   FireflyException
+     * @throws FireflyException
     */
    public function download(Attachment $attachment): LaravelResponse
    {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
        if (false === $attachment->uploaded) {
            throw new FireflyException('200000: File has not been uploaded (yet).');
        }
@@ -85,27 +87,29 @@ class ShowController extends Controller
            throw new FireflyException('200000: File has not been uploaded (yet).');
        }
        if ($this->repository->exists($attachment)) {
-            $content = $this->repository->getContent($attachment);
+            $content  = $this->repository->getContent($attachment);
            if ('' === $content) {
                throw new FireflyException('200002: File is empty (zero bytes).');
            }
-            $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
+            $quoted   = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));

            /** @var LaravelResponse $response */
            $response = response($content);
            $response
                ->header('Content-Description', 'File Transfer')
                ->header('Content-Type', 'application/octet-stream')
-                ->header('Content-Disposition', 'attachment; filename=' . $quoted)
+                ->header('Content-Disposition', 'attachment; filename='.$quoted)
                ->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($content));
+                ->header('Content-Length', (string)strlen($content))
+            ;

            return $response;
        }
+
        throw new FireflyException('200003: File does not exist.');
    }

@@ -115,15 +119,20 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
-        $manager = $this->getManager();
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
+        $manager     = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of attachments. Count it and split it.
        $collection  = $this->repository->get();
@@ -131,14 +140,14 @@ class ShowController extends Controller
        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

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

-        $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);
@@ -149,19 +158,21 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/getAttachment
     *
     * Display the specified resource.
-     *
-     * @param Attachment $attachment
-     *
-     * @return JsonResponse
     */
    public function show(Attachment $attachment): JsonResponse
    {
-        $manager = $this->getManager();
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+        $manager     = $this->getManager();
+
        /** @var AttachmentTransformer $transformer */
        $transformer = app(AttachmentTransformer::class);
        $transformer->setParameters($this->parameters);

-        $resource = new Item($attachment, $transformer, 'attachments');
+        $resource    = new Item($attachment, $transformer, 'attachments');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Attachment/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/StoreController.php
@@ -36,6 +36,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
 * Class StoreController
@@ -46,8 +47,6 @@ class StoreController extends Controller

    /**
     * StoreController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -71,43 +70,45 @@ class StoreController extends Controller
     *
     * Store a newly created resource in storage.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
    {
-        Log::debug(sprintf('Now in %s', __METHOD__));
-        $data       = $request->getAll();
-        $attachment = $this->repository->store($data);
-        $manager    = $this->getManager();
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $data        = $request->getAll();
+        $attachment  = $this->repository->store($data);
+        $manager     = $this->getManager();

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

-        $resource = new Item($attachment, $transformer, 'attachments');
+        $resource    = new Item($attachment, $transformer, 'attachments');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }

    /**
     * Upload an attachment.
-     *
-     *
-     * @param Request    $request
-     * @param Attachment $attachment
-     *
-     * @return JsonResponse
     */
    public function upload(Request $request, Attachment $attachment): JsonResponse
    {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
        /** @var AttachmentHelperInterface $helper */
        $helper = app(AttachmentHelperInterface::class);
        $body   = $request->getContent();
        if ('' === $body) {
-            Log::error('Body of attachment is empty.');
+            app('log')->error('Body of attachment is empty.');

            return response()->json([], 422);
        }
--- a/app/Api/V1/Controllers/Models/Attachment/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/UpdateController.php
@@ -31,7 +31,9 @@ use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
 * Class UpdateController
@@ -42,8 +44,6 @@ class UpdateController extends Controller

    /**
     * UpdateController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -66,23 +66,23 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/updateAttachment
     *
     * Update the specified resource in storage.
-     *
-     * @param UpdateRequest $request
-     * @param Attachment    $attachment
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, Attachment $attachment): JsonResponse
    {
-        $data = $request->getAll();
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+        $data        = $request->getAll();
        $this->repository->update($attachment, $data);
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

-        $resource = new Item($attachment, $transformer, 'attachments');
+        $resource    = new Item($attachment, $transformer, 'attachments');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
+++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
@@ -44,8 +44,6 @@ class ShowController extends Controller

    /**
     * AvailableBudgetController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -68,18 +66,17 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager          = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize         = $this->parameters->get('limit');

-        $start = $this->parameters->get('start');
-        $end   = $this->parameters->get('end');
+        $start            = $this->parameters->get('start');
+        $end              = $this->parameters->get('end');

        // get list of available budgets. Count it and split it.
        $collection       = $this->abRepository->getAvailableBudgetsByDate($start, $end);
@@ -87,14 +84,14 @@ class ShowController extends Controller
        $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

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

-        $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);
@@ -105,20 +102,16 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/available_budgets/getAvailableBudget
     *
     * Display the specified resource.
-     *
-     * @param AvailableBudget $availableBudget
-     *
-     * @return JsonResponse
     */
    public function show(AvailableBudget $availableBudget): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Bill/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Bill/DestroyController.php
@@ -37,8 +37,6 @@ class DestroyController extends Controller

    /**
     * BillController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -58,10 +56,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/deleteBill
     *
     * Remove the specified resource from storage.
-     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
     */
    public function destroy(Bill $bill): JsonResponse
    {
--- a/app/Api/V1/Controllers/Models/Bill/ListController.php
+++ b/app/Api/V1/Controllers/Models/Bill/ListController.php
@@ -50,8 +50,6 @@ class ListController extends Controller

    /**
     * BillController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -72,29 +70,26 @@ class ListController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function attachments(Bill $bill): JsonResponse
    {
-        $manager    = $this->getManager();
-        $pageSize   = $this->parameters->get('limit');
-        $collection = $this->repository->getAttachments($bill);
+        $manager     = $this->getManager();
+        $pageSize    = $this->parameters->get('limit');
+        $collection  = $this->repository->getAttachments($bill);

        $count       = $collection->count();
        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

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

-        $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,31 +101,28 @@ class ListController extends Controller
     *
     * List all of them.
     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function rules(Bill $bill): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of budgets. Count it and split it.
-        $collection = $this->repository->getRulesForBill($bill);
-        $count      = $collection->count();
-        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getRulesForBill($bill);
+        $count       = $collection->count();
+        $rules       = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -142,28 +134,23 @@ class ListController extends Controller
     *
     * Show all transactions.
     *
-     * @param Request $request
-     *
-     * @param Bill    $bill
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function transactions(Request $request, Bill $bill): JsonResponse
    {
-        $pageSize = $this->parameters->get('limit');
-        $type     = $request->get('type') ?? 'default';
+        $pageSize     = $this->parameters->get('limit');
+        $type         = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);

-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $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,7 +162,8 @@ class ListController extends Controller
            // set page to retrieve
            ->setPage($this->parameters->get('page'))
            // set types of transactions to return.
-            ->setTypes($types);
+            ->setTypes($types)
+        ;

        if (null !== $this->parameters->get('start')) {
            $collector->setStart($this->parameters->get('start'));
@@ -185,15 +173,15 @@ class ListController extends Controller
        }

        // get paginator.
-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]) . $this->buildParams());
+        $paginator    = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());
        $transactions = $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);
--- a/app/Api/V1/Controllers/Models/Bill/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php
@@ -43,8 +43,6 @@ class ShowController extends Controller

    /**
     * BillController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -65,24 +63,23 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
        $this->repository->correctOrder();
-        $bills     = $this->repository->getBills();
-        $manager   = $this->getManager();
-        $pageSize  = $this->parameters->get('limit');
-        $count     = $bills->count();
-        $bills     = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
+        $bills       = $this->repository->getBills();
+        $manager     = $this->getManager();
+        $pageSize    = $this->parameters->get('limit');
+        $count       = $bills->count();
+        $bills       = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator   = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));

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

-        $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);
@@ -93,19 +90,16 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/getBill
     *
     * Show the specified bill.
-     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
     */
    public function show(Bill $bill): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();
+
        /** @var BillTransformer $transformer */
        $transformer = app(BillTransformer::class);
        $transformer->setParameters($this->parameters);

-        $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);
    }
--- a/app/Api/V1/Controllers/Models/Bill/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Bill/StoreController.php
@@ -43,8 +43,6 @@ class StoreController extends Controller

    /**
     * BillController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -65,22 +63,19 @@ class StoreController extends Controller
     *
     * Store a bill.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
    {
-        $data    = $request->getAll();
-        $bill    = $this->repository->store($data);
-        $manager = $this->getManager();
+        $data        = $request->getAll();
+        $bill        = $this->repository->store($data);
+        $manager     = $this->getManager();

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

-        $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);
    }
--- a/app/Api/V1/Controllers/Models/Bill/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Bill/UpdateController.php
@@ -40,8 +40,6 @@ class UpdateController extends Controller

    /**
     * BillController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -61,23 +59,18 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/updateBill
     *
     * Update a bill.
-     *
-     * @param UpdateRequest $request
-     * @param Bill          $bill
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, Bill $bill): JsonResponse
    {
-        $data    = $request->getAll();
-        $bill    = $this->repository->update($bill, $data);
-        $manager = $this->getManager();
+        $data        = $request->getAll();
+        $bill        = $this->repository->update($bill, $data);
+        $manager     = $this->getManager();

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

-        $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);
    }
--- a/app/Api/V1/Controllers/Models/Budget/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Budget/DestroyController.php
@@ -37,8 +37,6 @@ class DestroyController extends Controller

    /**
     * DestroyController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -58,10 +56,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/deleteBudget
     *
     * Remove the specified resource from storage.
-     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
     */
    public function destroy(Budget $budget): JsonResponse
    {
--- a/app/Api/V1/Controllers/Models/Budget/ListController.php
+++ b/app/Api/V1/Controllers/Models/Budget/ListController.php
@@ -40,9 +40,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;

-/***
- * Class ListController
- */
+// Class ListController
 class ListController extends Controller
 {
    use TransactionFilter;
@@ -52,8 +50,6 @@ class ListController extends Controller

    /**
     * ListController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -74,29 +70,26 @@ class ListController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listAttachmentByBudget
     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function attachments(Budget $budget): JsonResponse
    {
-        $manager    = $this->getManager();
-        $pageSize   = $this->parameters->get('limit');
-        $collection = $this->repository->getAttachments($budget);
+        $manager     = $this->getManager();
+        $pageSize    = $this->parameters->get('limit');
+        $collection  = $this->repository->getAttachments($budget);

        $count       = $collection->count();
        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]) . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]).$this->buildParams());

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

-        $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);
@@ -108,26 +101,23 @@ class ListController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function budgetLimits(Budget $budget): JsonResponse
    {
-        $manager  = $this->getManager();
-        $pageSize = $this->parameters->get('limit');
+        $manager      = $this->getManager();
+        $pageSize     = $this->parameters->get('limit');
        $this->parameters->set('budget_id', $budget->id);
        $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
        $count        = $collection->count();
        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.budget-limits', [$budget->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.budget-limits', [$budget->id]).$this->buildParams());

        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
+        $transformer  = app(BudgetLimitTransformer::class);
        $transformer->setParameters($this->parameters);
-        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
+        $resource     = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -139,29 +129,24 @@ class ListController extends Controller
     *
     * Show all transactions.
     *
-     * @param Request $request
-     *
-     * @param Budget  $budget
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function transactions(Request $request, Budget $budget): JsonResponse
    {
-        $pageSize = $this->parameters->get('limit');
+        $pageSize     = $this->parameters->get('limit');

-        $type = $request->get('type') ?? 'default';
+        $type         = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);

-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $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)
            // filter on budget.
@@ -173,7 +158,8 @@ class ListController extends Controller
            // set page to retrieve
            ->setPage($this->parameters->get('page'))
            // set types of transactions to return.
-            ->setTypes($types);
+            ->setTypes($types)
+        ;

        if (null !== $this->parameters->get('start')) {
            $collector->setStart($this->parameters->get('start'));
@@ -182,14 +168,14 @@ class ListController extends Controller
            $collector->setEnd($this->parameters->get('end'));
        }

-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]) . $this->buildParams());
+        $paginator    = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]).$this->buildParams());
        $transactions = $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);
@@ -201,27 +187,24 @@ class ListController extends Controller
     *
     * Show all transactions.
     *
-     * @param Request $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function withoutBudget(Request $request): JsonResponse
    {
-        $pageSize = $this->parameters->get('limit');
+        $pageSize     = $this->parameters->get('limit');

-        $type = $request->get('type') ?? 'default';
+        $type         = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);

-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $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)
            // filter on budget.
@@ -233,7 +216,8 @@ class ListController extends Controller
            // set page to retrieve
            ->setPage($this->parameters->get('page'))
            // set types of transactions to return.
-            ->setTypes($types);
+            ->setTypes($types)
+        ;

        if (null !== $this->parameters->get('start')) {
            $collector->setStart($this->parameters->get('start'));
@@ -242,14 +226,14 @@ class ListController extends Controller
            $collector->setEnd($this->parameters->get('end'));
        }

-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budgets.without-budget') . $this->buildParams());
+        $paginator    = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams());
        $transactions = $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);
--- a/app/Api/V1/Controllers/Models/Budget/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Budget/ShowController.php
@@ -45,8 +45,6 @@ class ShowController extends Controller

    /**
     * ListController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -69,30 +67,29 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of budgets. Count it and split it.
-        $collection = $this->repository->getBudgets();
-        $count      = $collection->count();
-        $budgets    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getBudgets();
+        $count       = $collection->count();
+        $budgets     = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -100,20 +97,16 @@ class ShowController extends Controller

    /**
     * Show a budget.
-     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
     */
    public function show(Budget $budget): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

-        $resource = new Item($budget, $transformer, 'budgets');
+        $resource    = new Item($budget, $transformer, 'budgets');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Budget/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Budget/StoreController.php
@@ -40,8 +40,6 @@ class StoreController extends Controller

    /**
     * StoreController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -62,23 +60,19 @@ class StoreController extends Controller
     *
     * Store a budget.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
-     *
     */
    public function store(StoreRequest $request): JsonResponse
    {
-        $budget = $this->repository->store($request->getAll());
+        $budget      = $this->repository->store($request->getAll());
        $budget->refresh();
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

-        $resource = new Item($budget, $transformer, 'budgets');
+        $resource    = new Item($budget, $transformer, 'budgets');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Budget/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Budget/UpdateController.php
@@ -40,8 +40,6 @@ class UpdateController extends Controller

    /**
     * UpdateController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -61,23 +59,18 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudget
     *
     * Update a budget.
-     *
-     * @param UpdateRequest $request
-     * @param Budget        $budget
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, Budget $budget): JsonResponse
    {
-        $data    = $request->getAll();
-        $budget  = $this->repository->update($budget, $data);
-        $manager = $this->getManager();
+        $data        = $request->getAll();
+        $budget      = $this->repository->update($budget, $data);
+        $manager     = $this->getManager();

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

-        $resource = new Item($budget, $transformer, 'budgets');
+        $resource    = new Item($budget, $transformer, 'budgets');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
@@ -40,8 +40,6 @@ class DestroyController extends Controller

    /**
     * BudgetLimitController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -64,10 +62,6 @@ class DestroyController extends Controller
     *
     * Remove the specified resource from storage.
     *
-     * @param Budget      $budget
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
--- a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
@@ -28,7 +28,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -44,55 +43,28 @@ class ListController extends Controller
 {
    use TransactionFilter;

-    private BudgetLimitRepositoryInterface $blRepository;
-
-    /**
-     * BudgetLimitController constructor.
-     *
-
-     */
-    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);
-
-                return $next($request);
-            }
-        );
-    }
-
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionByBudgetLimit
     * Show all transactions.
     *
-     * @param Request     $request
-     * @param Budget      $budget
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
    {
-        $pageSize = $this->parameters->get('limit');
-        $type     = $request->get('type') ?? 'default';
+        $pageSize     = $this->parameters->get('limit');
+        $type         = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);

-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $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)
            // filter on budget.
@@ -104,19 +76,20 @@ class ListController extends Controller
            // set page to retrieve
            ->setPage($this->parameters->get('page'))
            // set types of transactions to return.
-            ->setTypes($types);
+            ->setTypes($types)
+        ;

        $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
        $collector->setTypes($types);
-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]) . $this->buildParams());
+        $paginator    = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams());
        $transactions = $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);
--- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
@@ -33,7 +33,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -49,8 +48,6 @@ class ShowController extends Controller

    /**
     * BudgetLimitController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -74,29 +71,23 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudgetLimitByBudget
     *
     * Display a listing of the budget limits for this budget.
-     *
-     * @param Request $request
-     * @param Budget  $budget
-     *
-     * @return JsonResponse
-     * @throws FireflyException
     */
-    public function index(Request $request, Budget $budget): JsonResponse
+    public function index(Budget $budget): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager      = $this->getManager();
        $manager->parseIncludes('budget');
        $pageSize     = $this->parameters->get('limit');
        $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
        $count        = $collection->count();
        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]).$this->buildParams());

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -108,27 +99,24 @@ class ShowController extends Controller
     *
     * Display a listing of the budget limits for this budget.
     *
-     * @param SameDateRequest $request
-     *
-     * @return JsonResponse
-     * @throws FireflyException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function indexAll(SameDateRequest $request): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager      = $this->getManager();
        $manager->parseIncludes('budget');
        $pageSize     = $this->parameters->get('limit');
        $collection   = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
        $count        = $collection->count();
        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budget-limits.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.budget-limits.index').$this->buildParams());

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -138,26 +126,21 @@ class ShowController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/getBudgetLimit
     *
-     * @param Request     $request
-     * @param Budget      $budget
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
-    public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
+    public function show(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
    {
-        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
+        if ($budget->id !== $budgetLimit->budget_id) {
            throw new FireflyException('20028: The budget limit does not belong to the budget.');
        }
        // continue!
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+        $resource    = new Item($budgetLimit, $transformer, 'budget_limits');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
@@ -41,8 +41,6 @@ class StoreController extends Controller

    /**
     * BudgetLimitController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -64,11 +62,6 @@ class StoreController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/storeBudgetLimit
     *
     * Store a newly created resource in storage.
-     *
-     * @param StoreRequest $request
-     * @param Budget       $budget
-     *
-     * @return JsonResponse
     */
    public function store(StoreRequest $request, Budget $budget): JsonResponse
    {
@@ -77,13 +70,14 @@ class StoreController extends Controller
        $data['end_date']   = $data['end'];
        $data['budget_id']  = $budget->id;

-        $budgetLimit = $this->blRepository->store($data);
-        $manager     = $this->getManager();
+        $budgetLimit        = $this->blRepository->store($data);
+        $manager            = $this->getManager();
+
        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
+        $transformer        = app(BudgetLimitTransformer::class);
        $transformer->setParameters($this->parameters);

-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+        $resource           = new Item($budgetLimit, $transformer, 'budget_limits');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php
@@ -46,8 +46,6 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudgetLimit
     *
     * BudgetLimitController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -69,16 +67,11 @@ class UpdateController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudgetLimit
     *
-     * @param UpdateRequest $request
-     * @param Budget        $budget
-     * @param BudgetLimit   $budgetLimit
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
    {
-        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
+        if ($budget->id !== $budgetLimit->budget_id) {
            throw new FireflyException('20028: The budget limit does not belong to the budget.');
        }
        $data              = $request->getAll();
@@ -87,10 +80,10 @@ class UpdateController extends Controller
        $manager           = $this->getManager();

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

-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+        $resource          = new Item($budgetLimit, $transformer, 'budget_limits');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Category/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Category/DestroyController.php
@@ -37,8 +37,6 @@ class DestroyController extends Controller

    /**
     * CategoryController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -58,10 +56,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/deleteCategory
     *
     * Remove the specified resource from storage.
-     *
-     * @param Category $category
-     *
-     * @return JsonResponse
     */
    public function destroy(Category $category): JsonResponse
    {
--- a/app/Api/V1/Controllers/Models/Category/ListController.php
+++ b/app/Api/V1/Controllers/Models/Category/ListController.php
@@ -49,8 +49,6 @@ class ListController extends Controller

    /**
     * CategoryController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -69,29 +67,26 @@ class ListController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/listAttachmentByCategory
     *
-     * @param Category $category
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function attachments(Category $category): JsonResponse
    {
-        $manager    = $this->getManager();
-        $pageSize   = $this->parameters->get('limit');
-        $collection = $this->repository->getAttachments($category);
+        $manager     = $this->getManager();
+        $pageSize    = $this->parameters->get('limit');
+        $collection  = $this->repository->getAttachments($category);

        $count       = $collection->count();
        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.categories.attachments', [$category->id]) . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.categories.attachments', [$category->id]).$this->buildParams());

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

-        $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);
@@ -103,28 +98,23 @@ class ListController extends Controller
     *
     * Show all transactions.
     *
-     * @param Request  $request
-     *
-     * @param Category $category
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function transactions(Request $request, Category $category): JsonResponse
    {
-        $pageSize = $this->parameters->get('limit');
-        $type     = $request->get('type') ?? 'default';
+        $pageSize     = $this->parameters->get('limit');
+        $type         = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);

-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $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)
            // filter on category.
@@ -136,7 +126,8 @@ class ListController extends Controller
            // set page to retrieve
            ->setPage($this->parameters->get('page'))
            // set types of transactions to return.
-            ->setTypes($types);
+            ->setTypes($types)
+        ;

        if (null !== $this->parameters->get('start')) {
            $collector->setStart($this->parameters->get('start'));
@@ -145,15 +136,15 @@ class ListController extends Controller
            $collector->setEnd($this->parameters->get('end'));
        }

-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.categories.transactions', [$category->id]) . $this->buildParams());
+        $paginator    = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.categories.transactions', [$category->id]).$this->buildParams());
        $transactions = $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);
--- a/app/Api/V1/Controllers/Models/Category/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Category/ShowController.php
@@ -43,8 +43,6 @@ class ShowController extends Controller

    /**
     * CategoryController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -65,29 +63,28 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of budgets. Count it and split it.
-        $collection = $this->repository->getCategories();
-        $count      = $collection->count();
-        $categories = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getCategories();
+        $count       = $collection->count();
+        $categories  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

        /** @var CategoryTransformer $transformer */
        $transformer = app(CategoryTransformer::class);
        $transformer->setParameters($this->parameters);
-        $resource = new FractalCollection($categories, $transformer, 'categories');
+        $resource    = new FractalCollection($categories, $transformer, 'categories');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -98,20 +95,16 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/getCategory
     *
     * Show the category.
-     *
-     * @param Category $category
-     *
-     * @return JsonResponse
     */
    public function show(Category $category): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

-        $resource = new Item($category, $transformer, 'categories');
+        $resource    = new Item($category, $transformer, 'categories');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Category/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Category/StoreController.php
@@ -40,8 +40,6 @@ class StoreController extends Controller

    /**
     * CategoryController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -62,21 +60,18 @@ class StoreController extends Controller
     *
     * Store new category.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
    {
-        $category = $this->repository->store($request->getAll());
-        $manager  = $this->getManager();
+        $category    = $this->repository->store($request->getAll());
+        $manager     = $this->getManager();

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

-        $resource = new Item($category, $transformer, 'categories');
+        $resource    = new Item($category, $transformer, 'categories');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Category/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Category/UpdateController.php
@@ -40,8 +40,6 @@ class UpdateController extends Controller

    /**
     * CategoryController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -61,23 +59,18 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/updateCategory
     *
     * Update the category.
-     *
-     * @param UpdateRequest $request
-     * @param Category      $category
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, Category $category): JsonResponse
    {
-        $data     = $request->getAll();
-        $category = $this->repository->update($category, $data);
-        $manager  = $this->getManager();
+        $data        = $request->getAll();
+        $category    = $this->repository->update($category, $data);
+        $manager     = $this->getManager();

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

-        $resource = new Item($category, $transformer, 'categories');
+        $resource    = new Item($category, $transformer, 'categories');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php
@@ -38,8 +38,6 @@ class DestroyController extends Controller

    /**
     * ObjectGroupController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -61,10 +59,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/deleteObjectGroup
     *
     * Remove the specified resource from storage.
-     *
-     * @param ObjectGroup $objectGroup
-     *
-     * @return JsonResponse
     */
    public function destroy(ObjectGroup $objectGroup): JsonResponse
    {
--- a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php
@@ -44,8 +44,6 @@ class ListController extends Controller

    /**
     * ObjectGroupController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -68,30 +66,27 @@ class ListController extends Controller
     *
     * List all bills in this object group
     *
-     * @param ObjectGroup $objectGroup
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function bills(ObjectGroup $objectGroup): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');
        // get list of piggy banks. Count it and split it.
-        $collection = $this->repository->getBills($objectGroup);
-        $count      = $collection->count();
-        $bills      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getBills($objectGroup);
+        $count       = $collection->count();
+        $bills       = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]) . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]).$this->buildParams());

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

-        $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);
@@ -103,33 +98,30 @@ class ListController extends Controller
     *
     * List all piggies under the object group.
     *
-     * @param ObjectGroup $objectGroup
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
    {
        // create some objects:
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of piggy banks. Count it and split it.
-        $collection = $this->repository->getPiggyBanks($objectGroup);
-        $count      = $collection->count();
-        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getPiggyBanks($objectGroup);
+        $count       = $collection->count();
+        $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.object-groups.piggy-banks', [$objectGroup->id]) . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.object-groups.piggy-banks', [$objectGroup->id]).$this->buildParams());

        /** @var PiggyBankTransformer $transformer */
        $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);
--- a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
@@ -24,13 +24,11 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;

 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
 use FireflyIII\Transformers\ObjectGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -45,8 +43,6 @@ class ShowController extends Controller

    /**
     * ObjectGroupController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -68,18 +64,13 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/listObjectGroups
     *
     * Display a listing of the resource.
-     *
-     * @param Request $request
-     *
-     * @return JsonResponse
-     * @throws FireflyException
     */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager      = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize     = $this->parameters->get('limit');

        $this->repository->resetOrder();
        $collection   = $this->repository->get();
@@ -87,14 +78,14 @@ class ShowController extends Controller
        $objectGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.object-groups.index') . $this->buildParams());
+        $paginator    = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.object-groups.index').$this->buildParams());

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -105,21 +96,17 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/getObjectGroup
     *
     * Show single instance.
-     *
-     * @param ObjectGroup $objectGroup
-     *
-     * @return JsonResponse
     */
    public function show(ObjectGroup $objectGroup): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();
        $this->repository->resetOrder();
        $objectGroup->refresh();

        /** @var ObjectGroupTransformer $transformer */
        $transformer = app(ObjectGroupTransformer::class);
        $transformer->setParameters($this->parameters);
-        $resource = new Item($objectGroup, $transformer, 'object_groups');
+        $resource    = new Item($objectGroup, $transformer, 'object_groups');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php
@@ -41,8 +41,6 @@ class UpdateController extends Controller

    /**
     * ObjectGroupController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -62,23 +60,18 @@ class UpdateController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/updateObjectGroup
-     *
-     * @param UpdateRequest $request
-     * @param ObjectGroup   $objectGroup
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, ObjectGroup $objectGroup): JsonResponse
    {
-        $data = $request->getUpdateData();
+        $data        = $request->getUpdateData();
        $this->repository->update($objectGroup, $data);
        $this->repository->resetOrder();
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

        /** @var ObjectGroupTransformer $transformer */
        $transformer = app(ObjectGroupTransformer::class);
        $transformer->setParameters($this->parameters);
-        $resource = new Item($objectGroup, $transformer, 'object_groups');
+        $resource    = new Item($objectGroup, $transformer, 'object_groups');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php
@@ -37,8 +37,6 @@ class DestroyController extends Controller

    /**
     * Constructor.
-     *
-
     */
    public function __construct()
    {
@@ -58,10 +56,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/deletePiggyBank
     *
     * Delete the resource.
-     *
-     * @param PiggyBank $piggyBank
-     *
-     * @return JsonResponse
     */
    public function destroy(PiggyBank $piggyBank): JsonResponse
    {
--- a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php
@@ -43,8 +43,6 @@ class ListController extends Controller

    /**
     * Constructor.
-     *
-
     */
    public function __construct()
    {
@@ -63,29 +61,26 @@ class ListController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAttachmentByPiggyBank
     *
-     * @param PiggyBank $piggyBank
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function attachments(PiggyBank $piggyBank): JsonResponse
    {
-        $manager    = $this->getManager();
-        $pageSize   = $this->parameters->get('limit');
-        $collection = $this->repository->getAttachments($piggyBank);
+        $manager     = $this->getManager();
+        $pageSize    = $this->parameters->get('limit');
+        $collection  = $this->repository->getAttachments($piggyBank);

        $count       = $collection->count();
        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy-banks.attachments', [$piggyBank->id]) . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy-banks.attachments', [$piggyBank->id]).$this->buildParams());

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

-        $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);
@@ -97,30 +92,27 @@ class ListController extends Controller
     *
     * List single resource.
     *
-     * @param PiggyBank $piggyBank
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
    {
        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
-        $manager  = $this->getManager();
+        $pageSize    = $this->parameters->get('limit');
+        $manager     = $this->getManager();

-        $collection = $this->repository->getEvents($piggyBank);
-        $count      = $collection->count();
-        $events     = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getEvents($piggyBank);
+        $count       = $collection->count();
+        $events      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy-banks.events', [$piggyBank->id]) . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy-banks.events', [$piggyBank->id]).$this->buildParams());

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
--- a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php
@@ -43,8 +43,6 @@ class ShowController extends Controller

    /**
     * Constructor.
-     *
-
     */
    public function __construct()
    {
@@ -65,29 +63,28 @@ class ShowController extends Controller
     *
     * List all of them.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();
        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of budgets. Count it and split it.
-        $collection = $this->repository->getPiggyBanks();
-        $count      = $collection->count();
-        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->getPiggyBanks();
+        $count       = $collection->count();
+        $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy-banks.index') . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy-banks.index').$this->buildParams());

        /** @var PiggyBankTransformer $transformer */
        $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);
@@ -98,20 +95,16 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/getPiggyBank
     *
     * List single resource.
-     *
-     * @param PiggyBank $piggyBank
-     *
-     * @return JsonResponse
     */
    public function show(PiggyBank $piggyBank): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

-        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
+        $resource    = new Item($piggyBank, $transformer, 'piggy_banks');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php
@@ -40,8 +40,6 @@ class StoreController extends Controller

    /**
     * Constructor.
-     *
-
     */
    public function __construct()
    {
@@ -62,21 +60,18 @@ class StoreController extends Controller
     *
     * Store new object.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
    {
-        $piggyBank = $this->repository->store($request->getAll());
-        $manager   = $this->getManager();
+        $piggyBank   = $this->repository->store($request->getAll());
+        $manager     = $this->getManager();

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

-        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
+        $resource    = new Item($piggyBank, $transformer, 'piggy_banks');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
@@ -40,8 +40,6 @@ class UpdateController extends Controller

    /**
     * Constructor.
-     *
-
     */
    public function __construct()
    {
@@ -61,27 +59,23 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/updatePiggyBank
     *
     * Update piggy bank.
-     *
-     * @param UpdateRequest $request
-     * @param PiggyBank     $piggyBank
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, PiggyBank $piggyBank): JsonResponse
    {
-        $data      = $request->getAll();
-        $piggyBank = $this->repository->update($piggyBank, $data);
+        $data        = $request->getAll();
+        $piggyBank   = $this->repository->update($piggyBank, $data);

        if (array_key_exists('current_amount', $data) && '' !== $data['current_amount']) {
            $this->repository->setCurrentAmount($piggyBank, $data['current_amount']);
        }

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

-        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
+        $resource    = new Item($piggyBank, $transformer, 'piggy_banks');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php
@@ -37,8 +37,6 @@ class DestroyController extends Controller

    /**
     * RecurrenceController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -58,10 +56,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/deleteRecurrence
     *
     * Delete the resource.
-     *
-     * @param Recurrence $recurrence
-     *
-     * @return JsonResponse
     */
    public function destroy(Recurrence $recurrence): JsonResponse
    {
--- a/app/Api/V1/Controllers/Models/Recurrence/ListController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/ListController.php
@@ -47,8 +47,6 @@ class ListController extends Controller

    /**
     * RecurrenceController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -69,29 +67,25 @@ class ListController extends Controller
     *
     * Show transactions for this recurrence.
     *
-     * @param Request    $request
-     * @param Recurrence $recurrence
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function transactions(Request $request, Recurrence $recurrence): JsonResponse
    {
-        $pageSize = $this->parameters->get('limit');
-        $type     = $request->get('type') ?? 'default';
+        $pageSize     = $this->parameters->get('limit');
+        $type         = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);

-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager      = $this->getManager();
        // whatever is returned by the query, it must be part of these journals:
-        $journalIds = $this->repository->getJournalIds($recurrence);
+        $journalIds   = $this->repository->getJournalIds($recurrence);

        /** @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)
            // filter on journal IDs.
@@ -103,7 +97,8 @@ class ListController extends Controller
            // set page to retrieve
            ->setPage($this->parameters->get('page'))
            // set types of transactions to return.
-            ->setTypes($types);
+            ->setTypes($types)
+        ;

        if (null !== $this->parameters->get('start')) {
            $collector->setStart($this->parameters->get('start'));
@@ -112,15 +107,15 @@ class ListController extends Controller
            $collector->setEnd($this->parameters->get('end'));
        }

-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
+        $paginator    = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
        $transactions = $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);
--- a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php
@@ -43,8 +43,6 @@ class ShowController extends Controller

    /**
     * RecurrenceController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -65,30 +63,29 @@ class ShowController extends Controller
     *
     * List all of them.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

        // types to get, page size:
-        $pageSize = $this->parameters->get('limit');
+        $pageSize    = $this->parameters->get('limit');

        // get list of budgets. Count it and split it.
-        $collection = $this->repository->get();
-        $count      = $collection->count();
-        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $collection  = $this->repository->get();
+        $count       = $collection->count();
+        $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // make paginator:
-        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams());
+        $paginator   = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.recurrences.index').$this->buildParams());

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

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

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -99,20 +96,16 @@ class ShowController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/getRecurrence
     *
     * List single resource.
-     *
-     * @param Recurrence $recurrence
-     *
-     * @return JsonResponse
     */
    public function show(Recurrence $recurrence): JsonResponse
    {
-        $manager = $this->getManager();
+        $manager     = $this->getManager();

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

-        $resource = new Item($recurrence, $transformer, 'recurrences');
+        $resource    = new Item($recurrence, $transformer, 'recurrences');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Recurrence/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/StoreController.php
@@ -40,8 +40,6 @@ class StoreController extends Controller

    /**
     * RecurrenceController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -62,22 +60,19 @@ class StoreController extends Controller
     *
     * Store new object.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
    {
-        $data       = $request->getAll();
-        $recurrence = $this->repository->store($data);
-        $manager    = $this->getManager();
+        $data        = $request->getAll();
+        $recurrence  = $this->repository->store($data);
+        $manager     = $this->getManager();

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

-        $resource = new Item($recurrence, $transformer, 'recurrences');
+        $resource    = new Item($recurrence, $transformer, 'recurrences');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php
@@ -40,8 +40,6 @@ class UpdateController extends Controller

    /**
     * RecurrenceController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -61,23 +59,18 @@ class UpdateController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/updateRecurrence
     *
     * Update single recurrence.
-     *
-     * @param UpdateRequest $request
-     * @param Recurrence    $recurrence
-     *
-     * @return JsonResponse
     */
    public function update(UpdateRequest $request, Recurrence $recurrence): JsonResponse
    {
-        $data       = $request->getAll();
-        $recurrence = $this->repository->update($recurrence, $data);
-        $manager    = $this->getManager();
+        $data        = $request->getAll();
+        $recurrence  = $this->repository->update($recurrence, $data);
+        $manager     = $this->getManager();

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

-        $resource = new Item($recurrence, $transformer, 'recurrences');
+        $resource    = new Item($recurrence, $transformer, 'recurrences');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
--- a/app/Api/V1/Controllers/Models/Rule/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Rule/DestroyController.php
@@ -38,8 +38,6 @@ class DestroyController extends Controller

    /**
     * RuleController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -47,7 +45,7 @@ class DestroyController extends Controller
        $this->middleware(
            function ($request, $next) {
                /** @var User $user */
-                $user = auth()->user();
+                $user                 = auth()->user();

                $this->ruleRepository = app(RuleRepositoryInterface::class);
                $this->ruleRepository->setUser($user);
@@ -62,10 +60,6 @@ class DestroyController extends Controller
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/deleteRule
     *
     * Delete the resource.
-     *
-     * @param Rule $rule
-     *
-     * @return JsonResponse
     */
    public function destroy(Rule $rule): JsonResponse
    {
--- a/Show More
+++ b/Show More