Auto commit for release 'v6.1.16' on 2024-05-19

Update changelog.
Add final API changes
2025-08-17 11:16:39 +00:00 · 2024-05-19 10:26:25 +02:00 · 2024-05-19 10:21:03 +02:00 · 2024-05-19 10:17:21 +02:00 · 2024-05-19 06:36:31 +02:00 · 2024-05-18 06:57:38 +02:00
2221 changed files with 127896 additions and 182696 deletions
--- a/.ci/all.sh
+++ b/.ci/all.sh
@@ -0,0 +1,30 @@
+#!/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 )"
+
+echo "Running PHP CS Fixer"
+$SCRIPT_DIR/phpcs.sh
+echo "Running PHPStan"
+$SCRIPT_DIR/phpstan.sh
+echo "Running PHPMD"
+$SCRIPT_DIR/phpmd.sh
--- a/.ci/php-cs-fixer/.php-cs-fixer.php
+++ b/.ci/php-cs-fixer/.php-cs-fixer.php
@@ -19,6 +19,8 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
 $current = __DIR__;

 $paths = [
@@ -35,16 +37,40 @@ $finder = PhpCsFixer\Finder::create()


 $config = new PhpCsFixer\Config();
-return $config->setRules([
+$config->setParallelConfig(ParallelConfigFactory::detect());
+return $config->setRules(
+    [
+        // rule sets
        '@PHP83Migration'               => true,
+        '@PhpCsFixer'                   => true,
        '@PhpCsFixer:risky'             => true,
+        '@PSR12'                        => 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'],
+        'no_unused_imports'             => true,
+        'single_space_around_construct' => true,
+        'statement_indentation'         => true,
+        'void_return'                   => true,
+
+        // disabled rules
        '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.
+        'comment_to_phpdoc'             => false, // breaks phpstan lines in combination with PHPStorm.
+        'type_declaration_spaces'       => false,
+        'cast_spaces'                   => false,
+
+        // complex rules
+        'array_syntax'                  => ['syntax' => 'short'],
+        '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',
+            ],
+        ],
    ])
              ->setFinder($finder);
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
--- a/.ci/phpcs.sh
+++ b/.ci/phpcs.sh
@@ -20,23 +20,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #

-# Install composer packages
-#composer install --no-scripts --no-ansi
-
 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
@@ -44,8 +29,8 @@ 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 \
-    --format=$OUTPUT_FORMAT \
-    --allow-risky=yes $EXTRA_PARAMS
+    --format=txt \
+    --allow-risky=yes

 EXIT_CODE=$?

--- a/.ci/phpmd.sh
+++ b/.ci/phpmd.sh
@@ -44,8 +44,7 @@ EXIT_CODE=$?

 cd $SCRIPT_DIR/..

-echo "Exit code is $EXIT_CODE, but we ignore this for the time being."
+echo "Exit code is $EXIT_CODE."

 # for the time being, exit 0
-#exit $EXIT_CODE
-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.1",
+            "version": "3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/pcre.git",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
                "shasum": ""
            },
            "require": {
@@ -60,7 +60,7 @@
            ],
            "support": {
                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.1"
+                "source": "https://github.com/composer/pcre/tree/3.1.3"
            },
            "funding": [
                {
@@ -76,20 +76,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-10-11T07:11:09+00:00"
+            "time": "2024-03-19T10:26:25+00:00"
        },
        {
            "name": "composer/xdebug-handler",
-            "version": "3.0.3",
+            "version": "3.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
+                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
                "shasum": ""
            },
            "require": {
@@ -100,7 +100,7 @@
            "require-dev": {
                "phpstan/phpstan": "^1.0",
                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
            },
            "type": "library",
            "autoload": {
@@ -124,9 +124,9 @@
                "performance"
            ],
            "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.4"
            },
            "funding": [
                {
@@ -142,20 +142,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-02-25T21:32:43+00:00"
+            "time": "2024-03-26T18:29:49+00:00"
        },
        {
            "name": "pdepend/pdepend",
-            "version": "2.16.1",
+            "version": "2.16.2",
            "source": {
                "type": "git",
                "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "66ceb05eaa8bf358574143c974b04463911bc700"
+                "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/66ceb05eaa8bf358574143c974b04463911bc700",
-                "reference": "66ceb05eaa8bf358574143c974b04463911bc700",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58",
+                "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58",
                "shasum": ""
            },
            "require": {
@@ -197,7 +197,7 @@
            ],
            "support": {
                "issues": "https://github.com/pdepend/pdepend/issues",
-                "source": "https://github.com/pdepend/pdepend/tree/2.16.1"
+                "source": "https://github.com/pdepend/pdepend/tree/2.16.2"
            },
            "funding": [
                {
@@ -205,7 +205,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-10T18:38:19+00:00"
+            "time": "2023-12-17T18:09:59+00:00"
        },
        {
            "name": "phpmd/phpmd",
@@ -395,16 +395,16 @@
        },
        {
            "name": "symfony/config",
-            "version": "v7.0.0",
+            "version": "v7.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/config.git",
-                "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a"
+                "reference": "44deeba7233f08f383185ffa37dace3b3bc87364"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/8789646600f4e7e451dde9e1dc81cfa429f3857a",
-                "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a",
+                "url": "https://api.github.com/repos/symfony/config/zipball/44deeba7233f08f383185ffa37dace3b3bc87364",
+                "reference": "44deeba7233f08f383185ffa37dace3b3bc87364",
                "shasum": ""
            },
            "require": {
@@ -450,7 +450,7 @@
            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/config/tree/v7.0.0"
+                "source": "https://github.com/symfony/config/tree/v7.0.4"
            },
            "funding": [
                {
@@ -466,20 +466,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-09T08:30:23+00:00"
+            "time": "2024-02-26T07:52:39+00:00"
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v7.0.1",
+            "version": "v7.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "f6667642954bce638733f254c39e5b5700b47ba4"
+                "reference": "47f37af245df8457ea63409fc242b3cc825ce5eb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6667642954bce638733f254c39e5b5700b47ba4",
-                "reference": "f6667642954bce638733f254c39e5b5700b47ba4",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/47f37af245df8457ea63409fc242b3cc825ce5eb",
+                "reference": "47f37af245df8457ea63409fc242b3cc825ce5eb",
                "shasum": ""
            },
            "require": {
@@ -530,7 +530,7 @@
            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.1"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.4"
            },
            "funding": [
                {
@@ -546,7 +546,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-01T15:10:06+00:00"
+            "time": "2024-02-22T20:27:20+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -617,16 +617,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v7.0.0",
+            "version": "v7.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7"
+                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7",
-                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12",
+                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12",
                "shasum": ""
            },
            "require": {
@@ -660,7 +660,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.0.0"
+                "source": "https://github.com/symfony/filesystem/tree/v7.0.3"
            },
            "funding": [
                {
@@ -676,20 +676,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-27T06:33:22+00:00"
+            "time": "2024-01-23T15:02:46+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                "shasum": ""
            },
            "require": {
@@ -703,9 +703,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -742,7 +739,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
            },
            "funding": [
                {
@@ -758,20 +755,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                "shasum": ""
            },
            "require": {
@@ -785,9 +782,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -825,7 +819,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
            },
            "funding": [
                {
@@ -841,25 +835,25 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838"
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
-                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
+                "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"
@@ -907,7 +901,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
            },
            "funding": [
                {
@@ -923,20 +917,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-30T20:28:31+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
        },
        {
            "name": "symfony/var-exporter",
-            "version": "v7.0.1",
+            "version": "v7.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3"
+                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
-                "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
+                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
                "shasum": ""
            },
            "require": {
@@ -981,7 +975,7 @@
                "serialize"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.0.1"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.0.4"
            },
            "funding": [
                {
@@ -997,7 +991,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-30T11:38:21+00:00"
+            "time": "2024-02-26T10:35:24+00:00"
        }
    ],
    "aliases": [],
--- a/.ci/phpmd/phpmd.xml
+++ b/.ci/phpmd/phpmd.xml
@@ -19,9 +19,9 @@
  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
  -->

-<ruleset name="pcsg-generated-ruleset"
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>Firefly III ruleset.</description>
@@ -37,14 +37,14 @@

    <rule ref="rulesets/design.xml/NumberOfChildren">
        <properties>
-            <!-- TODO we want to be at minimum 15. But we start high, and drop the bar slowly. -->
-            <property name="minimum" value="256"/>
+            <!-- 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>
-            <!-- TODO we want to be at maximum 13. But we start high, and drop the bar slowly. -->
-            <property name="maximum" value="256"/>
+            <!-- Leaving this at 28 excuses most current code but it can't get worse than that. -->
+            <property name="maximum" value="28"/>
        </properties>
    </rule>

@@ -58,20 +58,21 @@
    <!-- code size -->
    <rule ref="rulesets/codesize.xml/CyclomaticComplexity">
        <properties>
-            <!-- TODO we want to be at report level 5. But we start high, and drop the bar slowly. -->
-            <property name="reportLevel" value="500"/>
+            <!-- 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>
-            <!-- TODO we want to be at a value of 128. But we start high, and drop the bar slowly. -->
-            <property name="minimum" value="24062500"/>
+            <!-- 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>
-            <!-- TODO we want to be at a value of 40. But we start high, and drop the bar slowly. -->
-            <property name="minimum" value="100"/>
+            <!-- 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>
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,6 @@
 # You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
 # Never set it to "testing".
-APP_ENV=local
+APP_ENV=production

 # Set to true if you want to see debug information in error screens.
 APP_DEBUG=false
@@ -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.
@@ -111,7 +111,10 @@ PGSQL_SSL_CERT=null
 PGSQL_SSL_KEY=null
 PGSQL_SSL_CRL_FILE=null

-# more PostgreSQL settings
+# For postgresql 15 and up, setting this to public will no longer work as expected, becasuse the
+# 'public' schema is without grants. This can be worked around by having a super user grant those
+# necessary privileges, but in security conscious setups that's not viable.
+# You will need to set this to the schema you want to use.
 PGSQL_SCHEMA=public

 # If you're looking for performance improvements, you could install memcached or redis
@@ -122,7 +125,7 @@ SESSION_DRIVER=file
 # If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
 # REDIS_PORT_FILE to set the value from a file instead of from an environment variable

-# can be tcp, unix or http
+# can be tcp or unix. http is not supported
 REDIS_SCHEME=tcp

 # use only when using 'unix' for REDIS_SCHEME. Leave empty otherwise.
@@ -150,7 +153,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
@@ -184,6 +187,11 @@ SEND_REPORT_JOURNALS=true
 # Since this involves an external service, it's optional and disabled by default.
 ENABLE_EXTERNAL_MAP=false

+#
+# Enable or disable exchange rate conversion. This function isn't used yet by Firefly III
+#
+ENABLE_EXCHANGE_RATES=false
+
 # Set this value to true if you want Firefly III to download currency exchange rates
 # from the internet. These rates are hosted by the creator of Firefly III inside
 # an Azure Storage Container.
@@ -214,7 +222,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 +277,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
 #
@@ -291,27 +299,6 @@ DKR_BUILD_LOCALE=false
 # Won't significantly speed up things.
 DKR_CHECK_SQLITE=true

-# Run database creation and migration commands. Disable this only if you're 100% sure the DB exists
-# and is up to date.
-DKR_RUN_MIGRATION=true
-
-# Run database upgrade commands. Disable this only when you're 100% sure your DB is up-to-date
-# with the latest fixes (outside of migrations!)
-DKR_RUN_UPGRADE=true
-
-# Verify database integrity. Includes all data checks and verifications.
-# Disabling this makes Firefly III assume your DB is intact.
-DKR_RUN_VERIFY=true
-
-# Run database reporting commands. When disabled, Firefly III won't go over your data to report current state.
-# Disabling this should have no impact on data integrity or safety but it won't warn you of possible issues.
-DKR_RUN_REPORT=true
-
-# Generate OAuth2 keys.
-# When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
-# you had previously generated keys already and they're stored in your database for restoration.
-DKR_RUN_PASSPORT_INSTALL=true
-
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII
@@ -324,18 +311,15 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
+
+#
+# The v2 layout is very experimental. If it breaks you get to keep both parts.
+# Be wary of data loss.
+#
 FIREFLY_III_LAYOUT=v1

 #
-# If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.
-# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
-# This configuration value WILL NOT HELP.
-#
-# Notable exception to this rule is Synology, which, according to some users, will use APP_URL to rewrite stuff.
-#
-# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
-# So when configuring anything WEB related this variable doesn't do anything. Nothing
-#
-# If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
+# Please make sure this URL matches the external URL of your Firefly III installation.
+# It is used to validate specific requests and to generate URLs in emails.
 #
 APP_URL=http://localhost
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# code owners for this Firefly III related repository
+* @JC5 @SDx3
--- 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/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,11 +1,16 @@
 version: 2
 updates:

+  # Check for updates to GitHub Actions every week
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
  # composer updates
  - package-ecosystem: "composer"
    directory: "/" # Location of package manifests
    target-branch: develop
-    labels: [ "bug" ]
    versioning-strategy: increase
    schedule:
      interval: "weekly"
@@ -14,15 +19,6 @@ updates:
  - package-ecosystem: "npm"
    directory: "/"
    target-branch: develop
-    labels: [ "bug" ]
-    versioning-strategy: increase
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: develop
-    labels: [ "bug" ]
    versioning-strategy: increase
    schedule:
      interval: "weekly"
--- a/.github/funding.yml
+++ b/.github/funding.yml
@@ -1,4 +1,6 @@
-# These are supported funding model platforms
+# Firefly III sponsor options

 github: jc5
 patreon: JC5
+ko_fi: jamesc5
+liberapay: JC5
--- a/.github/label-actions.yml
+++ b/.github/label-actions.yml
@@ -5,7 +5,9 @@ feature:
  issues:
    # Post a comment, `{issue-author}` is an optional placeholder
    comment: |
-      Hi there! This is an automatic reply. `Share and enjoy`
+      Hi there! 
+
+      This is an automatic reply. `Share and enjoy`

      This issue has been marked as a feature request. The requested (new) feature will become a part of Firefly III or the data importer in due course.

@@ -13,11 +15,29 @@ feature:

      Thank you for your contributions.

+epic:
+  issues:
+    # Post a comment, `{issue-author}` is an optional placeholder
+    comment: |
+      Hi there! 
+
+      This is an automatic reply. `Share and enjoy`
+
+      This issue has been marked as an epic. In epics, large amounts of works are collected that will be part of a major new feature. If you have more ideas that could be a part of this epic, feel free to reply.
+
+      *However*, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. 
+
+      If you are merely interested in this epic's progress, you can subscribe to this issue to get updates.
+
+      Thank you for your contributions.
+
 enhancement:
  issues:
    # Post a comment, `{issue-author}` is an optional placeholder
    comment: |
-      Hi there! This is an automatic reply. `Share and enjoy`
+      Hi there! 
+
+      This is an automatic reply. `Share and enjoy`

      This issue has been marked as an enhancement. The requested enhancement to an existing feature will become a part of Firefly III or the data importer in due course.

@@ -25,13 +45,67 @@ enhancement:

      Thank you for your contributions.

-# The `solved` label is added to discussions
 triage:
  issues:
    # Post a comment, `{issue-author}` is an optional placeholder
    comment: |
-      Hi there! This is an automatic reply. `Share and enjoy`
+      Hi there! 
+
+      This is an automatic reply. `Share and enjoy`

      This issue has been marked as being in triage. The root cause is not known yet, or the issue needs more investigation. You can help by sharing debug information (from `/debug`) if you also have this issue or when you haven't already done so.

      Thank you for your contributions.
+
+needs-moar-debug:
+  issues:
+    comment: |
+      Hi there! 
+
+      This is an automatic reply. `Share and enjoy`
+
+      To learn more about this issue, please make sure you share at least:
+
+      1. The table you can find on the `/debug` page
+      2. Firefly III version
+      2. Docker, self-hosted, or hosted by a third party?
+      3. Operating system and browser
+
+      Thank you for your contributions.
+    unlabel: needs-moar-debug
+
+
+needs-moar-logs:
+  issues:
+    comment: |
+      Hi there! 
+
+      This is an automatic reply. `Share and enjoy`
+
+      To learn more about this issue, please share the relevant log files from your Firefly III or data importer installation.
+
+      The relevant instructions can be found in the documentation: [How to debug Firefly III?](https://docs.firefly-iii.org/how-to/general/debug/) Once debug mode is activated per these instructions, you can repeat your action and find the logs, depending on your method of installation. All is explained on the page.
+
+      Please share the relevant log lines in your issue, either inline or as an attachment. If you feel the logs contain sensitive information, you may also send them to [james@firefly-iii.org](mailto:james@firefly-iii.org). Without these logs, it may not be possible to properly investigate this issue.
+
+      Thank you for your contributions.
+    unlabel: needs-moar-logs
+
+v2-layout-issue:
+  issues:
+    comment: |
+      Hi there! 
+
+      This is an automatic reply. `Share and enjoy`
+
+      It seems your issue is about the new v2-layout that is currently in development for Firefly III.
+
+      These issues are collected in [a GitHub discussion](https://github.com/firefly-iii/firefly-iii/issues/8361).
+
+      Please note that the v2 layout is still very much in development.
+
+      Thank you for your contributions.
+    close: true
+    close-reason: completed
+    lock: false
+    unlabel: v2-layout-issue
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,13 +1,19 @@
 <!--
-Before you create a new PR, please consider:
+Thank you for submitting new code to Firefly III, or any of the related projects. Please read the following rules carefully.

-1) Pull requests for the MAIN branch will be closed.
-2) DO NOT include translations in your PR. Only English US sentences.
+- Please do not submit solutions for problems that are not already reported in an issue.
+- Unfortunately, Firefly III can't be your learning experience. If you're new to all of this, please open an issue first.
+- Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
+- Pull requests for the MAIN branch will be closed.
+- DO NOT include translated strings in your PR.
+
+If it feels necessary to open an issue first, please do so, before you open a PR.
+
+See also: https://docs.firefly-iii.org/explanation/support/#contributing-code

-Thanks.
 -->
    
-Fixes issue # (if relevant)
+This PR fixes issue # (if relevant).

 Changes in this pull request:

--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,58 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 14
-
-# Number of days of inactivity before a stale Issue or Pull Request is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 14
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-# - "[Status] Maybe Later"
-exemptLabels:
-  - enhancement
-  - feature
-  - bug
-  - announcement
-  - "layout-v3"
-
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: false
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: false
-
-# Label to use when marking as stale
-staleLabel: stale
-
-# Comment to post when marking as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when removing the stale label.
-# unmarkComment: >
-#   Your comment here.
-
-# Comment to post when closing a stale Issue or Pull Request.
-# closeComment: >
-#   Your comment here.
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
-# pulls:
-#   daysUntilStale: 30
-#   markComment: >
-#     This pull request has been automatically marked as stale because it has not had
-#     recent activity. It will be closed if no further activity occurs. Thank you
-#     for your contributions.
-
-# issues:
-#   exemptLabels:
-#     - confirmed
--- 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
@@ -2,9 +2,12 @@

 name: "Chore - Prune old builds"

+permissions:
+  actions: write
+
 on:
  schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 1 * * *'
  workflow_dispatch:
 jobs:
  prune:
@@ -12,9 +15,9 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Prune cancelled/skipped runs
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
        with:
-          github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
            const cancelled = await github.rest.actions.listWorkflowRunsForRepo({
              owner: context.repo.owner,
@@ -42,9 +45,9 @@ jobs:
            }

      - name: Prune runs older than 3 days
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
        with:
-          github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
            const days_to_expiration = 3;
            const ms_in_day = 86400000;
@@ -56,10 +59,13 @@ jobs:

            const workflows = [
              'cleanup.yml',
+              'close-duplicates.yml',
              'closed-issues.yml',
+              'debug-info-actions.yml',
              'depsreview.yml',
              'label-actions.yml',
              'lock.yml',
+              'release.yml',
              'sonarcloud.yml',
              'stale.yml'
            ]
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -0,0 +1,39 @@
+name: "Issues - Command to close duplicate issues"
+
+# the workflow to execute on is comments that are newly created
+on:
+  issue_comment:
+    types: [ created ]
+
+permissions:
+  issues: write
+  checks: read
+
+jobs:
+  close_duplicates:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: github/command@v1.2.0
+        id: command
+        with:
+          allowed_contexts: "issue"
+          command: ".duplicate"
+      - name: reply
+        if: ${{ steps.command.outputs.continue == 'true' }}
+        run: |
+
+          ISSUE_TITLE=$(gh issue view ${{ steps.command.outputs.params }} --json title --jq '.title')
+
+          gh issue comment "$NUMBER" --body "Hi there!
+
+          This is an automatic reply. \`Share and enjoy\`.
+
+          Your issue is probably a duplicate of issue <span>#</span>${{ steps.command.outputs.params }}: [$ISSUE_TITLE](https://github.com/firefly-iii/firefly-iii/issues/${{ steps.command.outputs.params }}). Please refer to issue #${{ steps.command.outputs.params }} for support.
+
+          You can close this issue now. If you believe this is not in fact a duplicate, please reply and let us know. Otherwise, this issue will be automatically closed in a few days time.
+
+          Thank you for your contributions."
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
--- a/.github/workflows/closed-issues.yml
+++ b/.github/workflows/closed-issues.yml
@@ -23,6 +23,3 @@ jobs:

            Thank you for your contributions.
          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: OSDKDev/lock-issues@v1.1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/debug-info-actions.yml
+++ b/.github/workflows/debug-info-actions.yml
@@ -0,0 +1,32 @@
+name: 'Issues - Respond to hidden commands'
+
+# the workflow to execute on is comments that are newly created
+on:
+  issues:
+    types: [ opened, edited ]
+  issue_comment:
+    types: [ created ]
+
+# permissions needed for reacting to IssueOps commands on issues and PRs
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+  checks: read
+
+jobs:
+  respond:
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          ISSUE_BODY=$(gh issue view $NUMBER --json body)
+          if [[ $ISSUE_BODY == *".eOxNZAmyGz6CXMyf"* ]]; then
+            gh issue comment "$NUMBER" --body "$V2_ISSUE_REPLY_BODY"
+            gh issue close "$NUMBER" --reason completed
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          V2_ISSUE_REPLY_BODY: ${{ secrets.V2_ISSUE_REPLY_BODY }}
+          LABELS: v2-layout-issue
--- a/.github/workflows/depsreview.yml
+++ b/.github/workflows/depsreview.yml
@@ -9,8 +9,8 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: 'Checkout repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: 'Dependency review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@@ -2,11 +2,11 @@ name: 'Issues - Reply to specific labels'

 on:
  issues:
-    types: [labeled, unlabeled]
+    types: [ labeled, unlabeled ]
  pull_request_target:
-    types: [labeled, unlabeled]
+    types: [ labeled, unlabeled ]
  discussion:
-    types: [labeled, unlabeled]
+    types: [ labeled, unlabeled ]

 permissions:
  contents: read
@@ -18,4 +18,4 @@ jobs:
  action:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/label-actions@v3
+      - uses: dessant/label-actions@v4
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -3,17 +3,27 @@ name: 'Issues - Lock old issues'
 on:
  workflow_dispatch:
  schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 2 * * *'
+
+concurrency:
+  group: lock-threads
+
+permissions:
+  issues: write
+  pull-requests: write
+  discussions: write

 jobs:
  lock:
    permissions:
      issues: write
      pull-requests: write
+      discussions: write
    runs-on: ubuntu-latest
    steps:
-      - uses: JC5/lock-threads@main
+      - uses: dessant/lock-threads@v5
        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: 90
-          pr-inactive-days: 90
+          issue-inactive-days: 21
+          pr-inactive-days: 21
+          discussion-inactive-days: 21
+          log-output: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,296 @@
+name: 'Code - Create new release'
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release "v1.2.3" or "develop"'
+        required: true
+        default: 'develop'
+  schedule:
+    - cron: '0 3 * * MON,THU'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Switch branch
+        run: |
+          if [[ "develop" == "$version" ]]; then
+            git checkout --track origin/develop
+            git pull
+          else
+            git config user.name github-actions
+            git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+            git checkout --track origin/develop
+            git pull
+            git checkout main
+            git merge develop
+          fi
+        env:
+          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          extensions: mbstring, intl, zip, bcmath
+      - name: crowdin action
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          download_translations: true
+          push_translations: false
+          push_sources: false
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          CROWDIN_PROJECT_NR: ${{ secrets.CROWDIN_PROJECT_NR }}
+          CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
+      - name: Cleanup translations
+        id: cleanup-transactions
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:crowdin-warning'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ''
+      - name: Cleanup changelog
+        id: cleanup-changelog
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:changelog'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
+      - name: "Create THANKS.md"
+        id: thank-you
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:thank-you'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ''
+      - name: Extract changelog
+        id: extract-changelog
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:extract-changelog'
+          output: 'output'
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ""
+      - name: Replace version
+        id: replace-version
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:version'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ""
+          FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
+      - name: Generate JSON v1
+        id: json-v1
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:json-translations v1'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ''
+      - name: Generate JSON v2
+        id: json-v2
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:json-translations v2'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ''
+      - name: Code cleanup
+        id: code-cleanup
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:code'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ''
+      - name: Build JS
+        run: |
+          npm install
+          npm update
+          npm run prod  --workspace=v1
+          npm run build --workspace=v2
+      - name: Run CI
+        run: |
+          rm -rf vendor composer.lock
+          composer update --no-dev --no-scripts --no-plugins -q
+          sudo chown -R runner:docker resources/lang
+          .ci/phpcs.sh
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+      - name: Release
+        run: |
+          # do some configuration
+          sudo timedatectl set-timezone Europe/Amsterdam
+          git config user.name github-actions
+          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+          git config advice.addIgnoredFile false
+
+          # set some variables
+          releaseName=$version
+          originalName=$version
+          zipName=FireflyIII-$version.zip
+          tarName=FireflyIII-$version.tar.gz
+
+          # update composer (again)
+          composer update --no-dev --no-scripts --no-plugins
+          composer dump-autoload
+
+          # if this is a develop build, slightly different variable names.
+          if [[ "develop" == "$version" ]]; then
+            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            releaseName=$version-$(date +'%Y%m%d')
+            originalName=$releaseName
+            zipName=FireflyIII-develop.zip
+            tarName=FireflyIII-develop.tar.gz
+          fi
+
+          # in both cases, if the release or tag already exists, add ".1" until it no longer exists.
+          tagFound=true
+          tagCount=1
+          while [ "$tagFound" = true ]
+          do
+            if [ $(git tag -l "$releaseName") ]; then
+              echo "Tag $releaseName exists already."
+              releaseName="$originalName"."$tagCount"
+              echo "Tag for release is now $releaseName"
+              tagCount=$((tagCount+1))
+            else
+             echo "Tag $releaseName does not exist, can continue"
+             tagFound=false
+            fi
+          done
+          echo "Will use tag and release name $releaseName."
+
+          # add all content, except output.txt (this contains the changelog and/or the download instructions)
+          echo 'Add all and reset output.txt'
+          git add -A
+          if test -f "output.txt"; then
+            git reset output.txt
+          fi
+          git commit -m "Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
+          git push
+
+          # zip and tar everything
+          echo 'Zip and tar...'
+          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*"
+          touch $tarName
+          tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' -czf $tarName .
+
+          # add sha256 sum
+          echo 'Sha sum ...'
+          sha256sum -b $zipName > $zipName.sha256
+          sha256sum -b $tarName > $tarName.sha256
+
+          # add signatures:
+          gpg --armor --detach-sign $zipName
+          gpg --armor --detach-sign $tarName
+
+          # create a development (nightly) release:
+          if [[ "develop" == "$version" ]]; then
+            echo 'Develop release.'
+            # add text to output.txt (instructions)
+            rm output.txt
+            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+
+            # create the release:
+            echo "Create nightly release."
+            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
+              -t "Development release for $(date +'%Y-%m-%d')" \
+              -F output.txt
+
+            # add zip file to release.
+            gh release upload $releaseName $zipName
+            gh release upload $releaseName $tarName
+
+            # add sha256 sum to release
+            gh release upload $releaseName $zipName.sha256
+            gh release upload $releaseName $tarName.sha256
+
+            # add signatures to release
+            gh release upload $releaseName $zipName.asc
+            gh release upload $releaseName $tarName.asc
+
+            # get current HEAD and add as file to the release
+            HEAD=$(git rev-parse HEAD)
+            echo $HEAD > HEAD.txt
+            gh release upload $releaseName HEAD.txt
+          else
+            echo 'MAIN (real) release'
+            sudo chown -R runner:docker output.txt
+            # add text to output.txt (more instructions)
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)."
+
+            echo "Create default release."
+            git tag -a $releaseName -m "Here be changelog"
+            git push origin $releaseName
+            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+
+            # add archive files to release
+            gh release upload $releaseName $zipName
+            gh release upload $releaseName $tarName
+
+            # add sha256 sums to release
+            gh release upload $releaseName $zipName.sha256
+            gh release upload $releaseName $tarName.sha256
+
+            # add signatures to release
+            gh release upload $releaseName $zipName.asc
+            gh release upload $releaseName $tarName.asc
+
+            # get current HEAD and add as file to the release
+            HEAD=$(git rev-parse HEAD)
+            echo $HEAD > HEAD.txt
+            gh release upload $releaseName HEAD.txt
+
+            # remove all temporary files
+            rm output.txt
+            rm HEAD.txt
+            rm $zipName
+            rm $zipName.sha256
+            rm $tarName
+            rm $tarName.sha256
+
+            # merge main back into develop
+            git checkout develop
+            git merge main
+            git push
+          fi
+        env:
+          GH_TOKEN: ${{ github.token }}
+          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -15,10 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
+        uses: actions/checkout@v4
      - name: Setup PHP with Xdebug
        uses: shivammathur/setup-php@v2
        with:
@@ -48,15 +45,6 @@ jobs:
      - name: Install Composer dependencies
        run: composer install --prefer-dist --no-interaction --no-progress --no-scripts

-      - name: PHPStan
-        run: .ci/phpstan.sh
-
-      - name: PHPMD
-        run: .ci/phpmd.sh
-
-      - name: PHP CS Fixer
-        run: .ci/phpcs.sh
-
      - name: "Create database file"
        run: touch storage/database/database.sqlite

--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,7 +1,7 @@
-name: "Issues - Close stale issues"
+name: "Issues - Mark and close stale issues"
 on:
  schedule:
-    - cron: "30 1 * * *"
+    - cron: "0 4 * * *"
  workflow_dispatch:

 permissions:
@@ -14,21 +14,25 @@ jobs:
      pull-requests: write  # for actions/stale to close stale PRs
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: >
-            Hi there! This is an automatic reply. `Share and enjoy`
+          stale-issue-message: |
+            Hi there!
+
+            This is an automatic reply. `Share and enjoy`

            This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

            Thank you for your contributions.
-          stale-pr-message: >
-            Hi there! This is an automatic reply. `Share and enjoy`
+          stale-pr-message: |
+            Hi there!
+
+            This is an automatic reply. `Share and enjoy`

            This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

            Thank you for your contributions.
          days-before-stale: 14
          days-before-close: 7
-          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic'
+          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic,triage'
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,20 @@
 /node_modules
 /storage/*.key
 /vendor
+public/hot
 npm-debug.log
 yarn-error.log
 .env
 /.ci/php-cs-fixer/vendor
 coverage.xml
+
+# ignore generated files.
+public/build
+
+# ignore v1 build files
+resources/assets/v1/node_modules
+resources/assets/v1/build
+
+# ignore v2 build files
+resources/assets/v2/node_modules
+resources/assets/v2/build
--- a/THANKS.md
+++ b/THANKS.md
@@ -0,0 +1,193 @@
+# Thank you! :tada: :heart: :tada:
+
+Over time, many people have contributed to Firefly III. Their efforts are not always visible, but always remembered and appreciated.
+Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
+
+## 2024
+- imlonghao
+- Rahman Yusuf
+- Michael Thomas
+- WardenJakx
+- kuilin
+- Stevie Robinson
+- luzpaz
+- Lemuel Roberto Bonifácio
+- maureenferreira
+
+## 2023
+- tieu1991
+- Maxco10
+- zqye
+- Mateus Pereira
+- josephbadow
+- Christian Desktop
+- Edgars
+- Hannah K
+- noxonad
+- Kaijia Feng
+- Marc Ordinas i Llopis
+- Kuba Turek
+- Julien Stébenne
+
+## 2022
+- Johannes Zellner
+- Janne Heß
+- charlesteets
+- Nathan PERIER
+- Jan Willhaus
+- canoine
+- Rick Cuddy
+- James
+- Hugo Meyronneinc
+- naveen
+- neilnaveen
+- naveensrinivasan
+- Federico Micelli
+- George Hahn
+
+## 2021
+- StillLoading
+- Igor Rzegocki
+- Lorenzo Breda
+- Hosh
+- Flightkick
+- alex6480
+- VREEdom
+- Hamza FADIL
+- Kasper Læssø Sørensen
+- Alex
+- Jeroen De Meerleer
+- Ruben van Erk
+- Fabian Zimmermann
+- Mirko Berger
+- KaihatsuOnline
+- MihataBG
+
+## 2020
+- Hannes Körber
+- Julien Cassagne
+- bu4ak
+- Viktor Yakovlev
+- Oliver Kaufmann
+- Arvind Chembarpu
+- GrayStrider
+- psychowood
+- Hosh Sadiq
+- emansih
+- Aniruddha Maru
+- johnny
+- sephrat
+- bpatath
+- Florian Dupret
+- Maxim Kurbatov
+- Lucas Guima
+- Sandro
+- Ruben Verhoef
+- Daniel Idzerda
+- Calum Smith
+- Agraphie
+- Tomer Shvueli
+- Tomer S
+
+## 2019
+- Pascal Jungblut
+- Justyn Shull
+- Timendum
+- Nicolas Lœuillet
+- Dominic Guhl
+- Melroy van den Berg
+- Henning Stein
+- Jan Klepek
+- Jonathan
+- Geoffrey “Frogeye” Preud'homme
+- Michael Fix
+- Juraj Mlich
+- Eddybrando Vásquez
+- hulloanson
+- Will Rouesnel
+- lastlink
+- Mr. Funk
+- Simon Taddiken
+- Joris
+- Bastiaan Nijkamp
+
+## 2018
+- a1ex4
+- Daniel Quah
+- Marco Lourenço
+- Dennis Enderink
+- Luca Bognolo
+- Mike Conway
+- Ben
+- Mathieu Post
+- George Hertz
+- HamuZ HamuZ
+- David Meiseles
+- Erik Gelderblom
+- Luca Vallerini
+- Clemens Wijnekus
+- Jacob Weisz
+- Mateusz Gozdek
+- anmol26s
+- Kevin Hellemun
+- Shashank M Chakravarthy
+- Nico Schreiner
+- Paul Sohier
+- Brenden Conte
+- Ben Yanke
+- Andrew Prokhorenkov
+- devlearner
+- Kelvin
+- J'informatique
+
+## 2017
+- Victor Mosin
+- Justin
+- Hugo van Duijn
+- Lukas Winkler
+- Marcin Szymanski
+- Jens Kat
+- koziolek
+- jleeong
+- Simon Hanna
+- richard & xeli.eu
+- Sergey Besedin
+- Welbert Serra
+- Joris de Vries
+- Patrick Kostjens
+- Enrico Lamperti
+- Christian Musa
+- Enno Lohmeier
+
+## 2016
+- Sander
+- Toon Schoenmakers
+- Telyn
+- Sander Kleykens
+- Tom van der Werf
+- Matthew Peck
+- Sander Mulders
+- Bonno Nachtegaal-Karels
+- Niek Haarman
+- Edwin
+- Thijs Alkemade
+- zjean
+- Graham Miller
+- Robert Horlings
+- leander091
+
+## 2015
+- Antonio Spinelli
+- Colin O'Dell
+- RonaldvanMeer
+- Richard Ebbers
+- Balazs Varkonyi
+- Niek van der Kooy
+- Ilya Kil
+
+## 2014
+- Stewart Malik
+- Graham Campbell
+
+
+Thank you for all your support!
--- 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
@@ -61,17 +60,13 @@ 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
     */
@@ -81,10 +76,9 @@ class AccountController extends Controller
        $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'));
+
        // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
        $defaultCurrency = app('amount')->getDefaultCurrency();

--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
@@ -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
--- 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
    {
--- 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
    {
@@ -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,6 +100,7 @@ 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;
--- 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
    {
--- 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
    {
--- 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
    {
--- a/app/Api/V1/Controllers/Autocomplete/TagController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TagController.php
@@ -58,17 +58,13 @@ 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();
-
        $result = $this->repository->searchTags($data['query'], $this->parameters->get('limit'));
        $array  = [];
+
        /** @var Tag $tag */
        foreach ($result as $tag) {
            $array[] = [
--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php
@@ -63,10 +63,6 @@ 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
    {
@@ -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
    {
--- 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
    {
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -35,9 +35,6 @@ 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
@@ -50,8 +47,6 @@ class AccountController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -72,38 +67,35 @@ 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();
+
        /** @var Carbon $start */
        $start      = $dates['start'];
+
        /** @var Carbon $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);
+
+        /** @var Preference $frontpage */
+        $frontpage  = app('preferences')->get('frontpageAccounts', $defaultSet);
        $default    = app('amount')->getDefaultCurrency();

-        if (!(is_array($frontPage->data) && count($frontPage->data) > 0)) {
-            $frontPage->data = $defaultSet;
-            $frontPage->save();
+        if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) {
+            $frontpage->data = $defaultSet;
+            $frontpage->save();
        }

-
        // get accounts:
-        $accounts  = $this->repository->getAccountsById($frontPage->data);
+        $accounts   = $this->repository->getAccountsById($frontpage->data);
        $chartData  = [];
+
        /** @var Account $account */
        foreach ($accounts as $account) {
            $currency     = $this->repository->getAccountCurrency($account);
--- a/app/Api/V1/Controllers/Controller.php
+++ b/app/Api/V1/Controllers/Controller.php
@@ -35,15 +35,14 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 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
 {
@@ -52,6 +51,7 @@ abstract class Controller extends BaseController
    use ValidatesRequests;

    protected const string CONTENT_TYPE = 'application/vnd.api+json';
+
    /** @var array<int, string> */
    protected array        $allowedSort;
    protected ParameterBag $parameters;
@@ -78,10 +78,6 @@ abstract class Controller extends BaseController

    /**
     * Method to grab all parameters from the URL.
-     *
-     * @return ParameterBag
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
     */
    private function getParameters(): ParameterBag
    {
@@ -99,6 +95,7 @@ abstract class Controller extends BaseController
        $dates    = ['start', 'end', 'date'];
        foreach ($dates as $field) {
            $date = null;
+
            try {
                $date = request()->query->get($field);
            } catch (BadRequestException $e) {
@@ -111,7 +108,7 @@ abstract class Controller extends BaseController
            if (null !== $date) {
                try {
                    $obj = Carbon::parse((string)$date);
-                } catch (InvalidDateException | InvalidFormatException $e) {
+                } catch (InvalidDateException|InvalidFormatException $e) {
                    // don't care
                    app('log')->warning(
                        sprintf(
@@ -139,12 +136,13 @@ abstract class Controller extends BaseController
            if (null !== $value) {
                $bag->set($integer, (int)$value);
            }
-            if (null === $value &&
-                'limit' === $integer && // @phpstan-ignore-line
-                auth()->check()) {
+            if (null === $value
+                && 'limit' === $integer // @phpstan-ignore-line
+                && auth()->check()) {
                // set default for user:
                /** @var User $user */
                $user     = auth()->user();
+
                /** @var Preference $pageSize */
                $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data;
                $bag->set($integer, $pageSize);
@@ -155,14 +153,10 @@ 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) {
@@ -193,8 +187,6 @@ abstract class Controller extends BaseController

    /**
     * Method to help build URL's.
-     *
-     * @return string
     */
    final protected function buildParams(): string
    {
@@ -206,22 +198,20 @@ abstract class Controller extends BaseController
            }
            if ($value instanceof Carbon) {
                $params[$key] = $value->format('Y-m-d');
+
                continue;
            }
            $params[$key] = $value;
        }

-        return $return . http_build_query($params);
+        return $return.http_build_query($params);
    }

-    /**
-     * @return Manager
-     */
    final protected function getManager(): Manager
    {
        // create some objects:
        $manager = new Manager();
-        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
+        $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
    {
@@ -89,9 +82,7 @@ class TransactionController extends Controller
    }

    /**
-     * @param array $params <array<string, array<string, int|string>>>
-     *
-     * @return bool
+     * @param array<string, array<string, string>> $params
     */
    private function isUpdateTransactionAccount(array $params): bool
    {
--- a/app/Api/V1/Controllers/Data/DestroyController.php
+++ b/app/Api/V1/Controllers/Data/DestroyController.php
@@ -45,6 +45,7 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;

 /**
 * Class DestroyController
@@ -57,9 +58,6 @@ 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
@@ -67,10 +65,10 @@ class DestroyController extends Controller
        $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,];
+        $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,];
+        $transactions    = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::RECONCILIATION];

        match ($objects) {
            'budgets'                => $this->destroyBudgets(),
@@ -99,9 +97,6 @@ class DestroyController extends Controller
        return response()->json([], 204);
    }

-    /**
-     *
-     */
    private function destroyBudgets(): void
    {
        /** @var AvailableBudgetRepositoryInterface $abRepository */
@@ -117,9 +112,6 @@ class DestroyController extends Controller
        $budgetRepository->destroyAll();
    }

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

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

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

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

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

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

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

    /**
-     * @param array $types <int, string>
+     * @param array<int, string> $types
     */
    private function destroyAccounts(array $types): void
    {
@@ -202,18 +176,21 @@ class DestroyController extends Controller
            $count = $account->transactions()->count();
            if (true === $this->unused && 0 === $count) {
                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) {
                app('log')->info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
+                Log::channel('audit')->warning(sprintf('Deleted account #%d "%s"', $account->id, $account->name));
                $service->destroy($account, null);
            }
        }
    }

    /**
-     * @param array $types <int, string>
+     * @param array<int, string> $types
     */
    private function destroyTransactions(array $types): void
    {
@@ -221,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,12 +57,7 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
@@ -76,12 +69,7 @@ class ExportController extends Controller
    }

    /**
-     * @param string $key
-     *
-     * @return LaravelResponse
     * @throws FireflyException
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
     */
    private function returnExport(string $key): LaravelResponse
    {
@@ -94,13 +82,14 @@ class ExportController extends Controller
        $response
            ->header('Content-Description', 'File Transfer')
            ->header('Content-Type', 'application/octet-stream')
-            ->header('Content-Disposition', 'attachment; filename=' . $fileName)
+            ->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]));
+            ->header('Content-Length', (string)strlen($data[$key]))
+        ;

        return $response;
    }
@@ -109,12 +98,8 @@ class ExportController extends Controller
     * 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
+     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function bills(ExportRequest $request): LaravelResponse
@@ -128,12 +113,8 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
+     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function budgets(ExportRequest $request): LaravelResponse
@@ -147,12 +128,8 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
+     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function categories(ExportRequest $request): LaravelResponse
@@ -166,12 +143,8 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
+     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function piggyBanks(ExportRequest $request): LaravelResponse
@@ -185,12 +158,8 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
+     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function recurring(ExportRequest $request): LaravelResponse
@@ -204,12 +173,8 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
+     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function rules(ExportRequest $request): LaravelResponse
@@ -223,12 +188,8 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
+     *
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function tags(ExportRequest $request): LaravelResponse
@@ -242,12 +203,7 @@ 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 ContainerExceptionInterface
     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
     */
    public function transactions(ExportRequest $request): LaravelResponse
    {
--- a/app/Api/V1/Controllers/Data/PurgeController.php
+++ b/app/Api/V1/Controllers/Data/PurgeController.php
@@ -47,8 +47,6 @@ 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
    {
@@ -65,7 +63,9 @@ class PurgeController extends Controller

        // piggies
        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
-                        ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
+            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
+        ;
+
        /** @var PiggyBank $piggy */
        foreach ($set as $piggy) {
            $piggy->forceDelete();
@@ -86,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,8 +46,6 @@ class AccountController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -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,10 +60,6 @@ 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
    {
@@ -123,10 +119,6 @@ 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
    {
--- 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,10 +37,6 @@ 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
    {
--- a/app/Api/V1/Controllers/Insight/Expense/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/TagController.php
@@ -59,10 +59,6 @@ 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
    {
@@ -112,10 +108,6 @@ 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
    {
@@ -135,6 +127,7 @@ class TagController extends Controller
        $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'];
--- 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,8 +46,6 @@ class AccountController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -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,10 +37,6 @@ 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
    {
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -60,10 +60,6 @@ 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
    {
@@ -116,10 +112,6 @@ 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
    {
@@ -139,6 +131,7 @@ class TagController extends Controller
        $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'];
--- 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,10 +37,6 @@ 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
    {
--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
@@ -57,10 +57,6 @@ class TagController extends Controller
    /**
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoTag
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
     */
    public function noTag(GenericRequest $request): JsonResponse
    {
@@ -113,10 +109,6 @@ 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
    {
@@ -136,6 +128,7 @@ class TagController extends Controller
        $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'];
--- a/app/Api/V1/Controllers/Models/Account/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Account/DestroyController.php
@@ -39,8 +39,6 @@ class DestroyController extends Controller

    /**
     * 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
@@ -53,8 +53,6 @@ class ListController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -73,9 +71,6 @@ class ListController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAttachmentByAccount
     *
-     * @param Account $account
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function attachments(Account $account): JsonResponse
@@ -89,7 +84,7 @@ class ListController extends Controller

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

        /** @var AttachmentTransformer $transformer */
        $transformer = app(AttachmentTransformer::class);
@@ -105,9 +100,6 @@ class ListController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listPiggyBankByAccount
     *
-     * @param Account $account
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function piggyBanks(Account $account): JsonResponse
@@ -125,7 +117,7 @@ class ListController extends Controller

        // 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->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams());

        /** @var PiggyBankTransformer $transformer */
        $transformer = app(PiggyBankTransformer::class);
@@ -143,11 +135,6 @@ 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
@@ -157,6 +144,7 @@ class ListController extends Controller
        $this->parameters->set('type', $type);
        $types       = $this->mapTransactionTypes($this->parameters->get('type'));
        $manager     = $this->getManager();
+
        /** @var User $admin */
        $admin       = auth()->user();

@@ -164,7 +152,8 @@ class ListController extends Controller
        /** @var GroupCollectorInterface $collector */
        $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'));
@@ -174,7 +163,7 @@ class ListController extends Controller
        }

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

        /** @var TransactionGroupTransformer $transformer */
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -49,8 +49,6 @@ class ShowController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -71,9 +69,6 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @param Request $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(Request $request): JsonResponse
@@ -93,12 +88,11 @@ class ShowController extends Controller

        // continue sort:

-
        $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->setPath(route('api.v1.accounts.index').$this->buildParams());

        /** @var AccountTransformer $transformer */
        $transformer = app(AccountTransformer::class);
@@ -115,10 +109,6 @@ 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
    {
--- a/app/Api/V1/Controllers/Models/Account/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Account/StoreController.php
@@ -41,8 +41,6 @@ class StoreController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -62,10 +60,6 @@ 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
    {
--- a/app/Api/V1/Controllers/Models/Account/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php
@@ -42,8 +42,6 @@ class UpdateController extends Controller

    /**
     * AccountController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -63,17 +61,12 @@ 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
    {
        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();
--- 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')->warning(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
     */
    public function download(Attachment $attachment): LaravelResponse
    {
+        if (true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->warning(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).');
        }
@@ -96,16 +98,18 @@ class ShowController extends Controller
            $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,11 +119,16 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
    {
+        if (true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->warning(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
        $manager     = $this->getManager();

        // types to get, page size:
@@ -132,7 +141,7 @@ class ShowController extends Controller

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

        /** @var AttachmentTransformer $transformer */
        $transformer = app(AttachmentTransformer::class);
@@ -149,14 +158,16 @@ 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
    {
+        if (true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->warning(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);
--- a/app/Api/V1/Controllers/Models/Attachment/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/StoreController.php
@@ -34,7 +34,9 @@ use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\User;
 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
@@ -45,8 +47,6 @@ class StoreController extends Controller

    /**
     * StoreController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -70,13 +70,15 @@ class StoreController extends Controller
     *
     * Store a newly created resource in storage.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
    {
+        if (true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->warning(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);
@@ -93,15 +95,15 @@ class StoreController extends Controller

    /**
     * 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')->warning(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
        /** @var AttachmentHelperInterface $helper */
        $helper = app(AttachmentHelperInterface::class);
        $body   = $request->getContent();
--- 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,14 +66,14 @@ 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
    {
+        if (true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->warning(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();
--- 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,7 +66,6 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
@@ -88,7 +85,7 @@ class ShowController extends Controller

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

        /** @var AvailableBudgetTransformer $transformer */
        $transformer      = app(AvailableBudgetTransformer::class);
@@ -105,10 +102,6 @@ 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
    {
--- 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,9 +70,6 @@ class ListController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function attachments(Bill $bill): JsonResponse
@@ -88,7 +83,7 @@ class ListController extends Controller

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

        /** @var AttachmentTransformer $transformer */
        $transformer = app(AttachmentTransformer::class);
@@ -106,9 +101,6 @@ class ListController extends Controller
     *
     * List all of them.
     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function rules(Bill $bill): JsonResponse
@@ -125,7 +117,7 @@ class ListController extends Controller

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

        /** @var RuleTransformer $transformer */
        $transformer = app(RuleTransformer::class);
@@ -142,11 +134,6 @@ 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
@@ -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'));
@@ -186,7 +174,7 @@ class ListController extends Controller

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

        /** @var TransactionGroupTransformer $transformer */
--- 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,7 +63,6 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
@@ -93,14 +90,11 @@ 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();
+
        /** @var BillTransformer $transformer */
        $transformer = app(BillTransformer::class);
        $transformer->setParameters($this->parameters);
--- 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,9 +63,6 @@ class StoreController extends Controller
     *
     * Store a bill.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
--- 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,11 +59,6 @@ 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
    {
--- 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,9 +70,6 @@ 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
@@ -90,7 +83,7 @@ class ListController extends Controller

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

        /** @var AttachmentTransformer $transformer */
        $transformer = app(AttachmentTransformer::class);
@@ -108,9 +101,6 @@ class ListController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function budgetLimits(Budget $budget): JsonResponse
@@ -122,7 +112,7 @@ class ListController extends Controller
        $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);
@@ -139,11 +129,6 @@ 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
@@ -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'));
@@ -183,7 +169,7 @@ class ListController extends Controller
        }

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

        /** @var TransactionGroupTransformer $transformer */
@@ -201,9 +187,6 @@ class ListController extends Controller
     *
     * Show all transactions.
     *
-     * @param Request $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function withoutBudget(Request $request): JsonResponse
@@ -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'));
@@ -243,7 +227,7 @@ class ListController extends Controller
        }

        $paginator    = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budgets.without-budget') . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams());
        $transactions = $paginator->getCollection();

        /** @var TransactionGroupTransformer $transformer */
--- 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,7 +67,6 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
@@ -86,7 +83,7 @@ class ShowController extends Controller

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

        /** @var BudgetTransformer $transformer */
        $transformer = app(BudgetTransformer::class);
@@ -100,10 +97,6 @@ class ShowController extends Controller

    /**
     * Show a budget.
-     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
     */
    public function show(Budget $budget): JsonResponse
    {
--- 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,11 +60,7 @@ class StoreController extends Controller
     *
     * Store a budget.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
-     *
     */
    public function store(StoreRequest $request): JsonResponse
    {
--- 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,11 +59,6 @@ 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
    {
--- 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
@@ -48,11 +48,6 @@ class ListController extends Controller
     * 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
@@ -81,12 +76,13 @@ 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->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams());
        $transactions = $paginator->getCollection();

        /** @var TransactionGroupTransformer $transformer */
--- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
@@ -48,8 +48,6 @@ class ShowController extends Controller

    /**
     * BudgetLimitController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -73,10 +71,6 @@ 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 Budget $budget
-     *
-     * @return JsonResponse
     */
    public function index(Budget $budget): JsonResponse
    {
@@ -87,7 +81,7 @@ class ShowController extends Controller
        $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);
@@ -105,9 +99,6 @@ class ShowController extends Controller
     *
     * Display a listing of the budget limits for this budget.
     *
-     * @param SameDateRequest $request
-     *
-     * @return JsonResponse
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
    public function indexAll(SameDateRequest $request): JsonResponse
@@ -119,7 +110,7 @@ class ShowController extends Controller
        $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);
@@ -135,10 +126,6 @@ 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 Budget      $budget
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function show(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
--- 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
    {
@@ -79,6 +72,7 @@ class StoreController extends Controller

        $budgetLimit        = $this->blRepository->store($data);
        $manager            = $this->getManager();
+
        /** @var BudgetLimitTransformer $transformer */
        $transformer        = app(BudgetLimitTransformer::class);
        $transformer->setParameters($this->parameters);
--- 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,11 +67,6 @@ 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
--- 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,9 +67,6 @@ 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
@@ -85,7 +80,7 @@ class ListController extends Controller

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

        /** @var AttachmentTransformer $transformer */
        $transformer = app(AttachmentTransformer::class);
@@ -103,11 +98,6 @@ 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
@@ -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'));
@@ -146,7 +137,7 @@ class ListController extends Controller
        }

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

        /** @var TransactionGroupTransformer $transformer */
--- 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,7 +63,6 @@ class ShowController extends Controller
     *
     * Display a listing of the resource.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
@@ -82,7 +79,7 @@ class ShowController extends Controller

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

        /** @var CategoryTransformer $transformer */
        $transformer = app(CategoryTransformer::class);
@@ -98,10 +95,6 @@ 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
    {
--- 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,9 +60,6 @@ class StoreController extends Controller
     *
     * Store new category.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
--- 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,11 +59,6 @@ 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
    {
--- 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,9 +66,6 @@ class ListController extends Controller
     *
     * List all bills in this object group
     *
-     * @param ObjectGroup $objectGroup
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function bills(ObjectGroup $objectGroup): JsonResponse
@@ -85,7 +80,7 @@ class ListController extends Controller

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

        /** @var BillTransformer $transformer */
        $transformer = app(BillTransformer::class);
@@ -103,9 +98,6 @@ class ListController extends Controller
     *
     * List all piggies under the object group.
     *
-     * @param ObjectGroup $objectGroup
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
@@ -123,7 +115,7 @@ class ListController extends Controller

        // 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->setPath(route('api.v1.object-groups.piggy-banks', [$objectGroup->id]).$this->buildParams());

        /** @var PiggyBankTransformer $transformer */
        $transformer = app(PiggyBankTransformer::class);
--- a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
@@ -43,8 +43,6 @@ class ShowController extends Controller

    /**
     * ObjectGroupController constructor.
-     *
-
     */
    public function __construct()
    {
@@ -66,8 +64,6 @@ 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.
-     *
-     * @return JsonResponse
     */
    public function index(): JsonResponse
    {
@@ -83,7 +79,7 @@ class ShowController extends Controller

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

        /** @var ObjectGroupTransformer $transformer */
        $transformer  = app(ObjectGroupTransformer::class);
@@ -100,10 +96,6 @@ 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
    {
--- 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,11 +60,6 @@ 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
    {
--- 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,9 +61,6 @@ 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
@@ -79,7 +74,7 @@ class ListController extends Controller

        // 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->setPath(route('api.v1.piggy-banks.attachments', [$piggyBank->id]).$this->buildParams());

        /** @var AttachmentTransformer $transformer */
        $transformer = app(AttachmentTransformer::class);
@@ -97,9 +92,6 @@ class ListController extends Controller
     *
     * List single resource.
     *
-     * @param PiggyBank $piggyBank
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
@@ -114,7 +106,7 @@ class ListController extends Controller

        // 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->setPath(route('api.v1.piggy-banks.events', [$piggyBank->id]).$this->buildParams());

        /** @var PiggyBankEventTransformer $transformer */
        $transformer = app(PiggyBankEventTransformer::class);
--- 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,7 +63,6 @@ class ShowController extends Controller
     *
     * List all of them.
     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function index(): JsonResponse
@@ -81,7 +78,7 @@ class ShowController extends Controller

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

        /** @var PiggyBankTransformer $transformer */
        $transformer = app(PiggyBankTransformer::class);
@@ -98,10 +95,6 @@ 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
    {
--- 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,9 +60,6 @@ class StoreController extends Controller
     *
     * Store new object.
     *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
     * @throws FireflyException
     */
    public function store(StoreRequest $request): JsonResponse
--- a/Show More
+++ b/Show More