Update meta data for new release.

chore(deps): bump phpseclib/phpseclib from 3.0.33 to 3.0.34

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -36,9 +36,13 @@ $finder = PhpCsFixer\Finder::create()
 
 $config = new PhpCsFixer\Config();
 return $config->setRules([
-                             '@PSR12'               => true,
+                             '@PhpCsFixer:risky'           => true,
+                             '@PSR12:risky'                => true,
                              'declare_strict_types'        => true,
                              'strict_param'                => true,
                              'array_syntax'                => ['syntax' => 'short'],
+                             'native_function_invocation'  => false, // annoying
+                             'php_unit_data_provider_name' => false, // bloody annoying long test names
+                             'static_lambda' => false, // breaks the Response macro for API's.
                          ])
               ->setFinder($finder);

.ci/phpcs.sh

@@ -28,11 +28,29 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # enable test .env file.
 # cp .ci/.env.ci .env
 
+OUTPUT_FORMAT=txt
+EXTRA_PARAMS="-v"
+
+if [[ $GITHUB_ACTIONS = "true" ]]
+then
+    OUTPUT_FORMAT=gitlab
+    EXTRA_PARAMS="--diff --dry-run"
+fi
+
 # clean up php code
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
 rm -f .php-cs-fixer.cache
-PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
+PHP_CS_FIXER_IGNORE_ENV=true
+./vendor/bin/php-cs-fixer fix \
+    --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
+    --format=$OUTPUT_FORMAT \
+    --allow-risky=yes $EXTRA_PARAMS
+
+EXIT_CODE=$?
+
+echo "Exit code for CS fixer is $EXIT_CODE."
+
 cd $SCRIPT_DIR/..
 
-exit 0
+exit $EXIT_CODE

.ci/phpmd.sh

@@ -22,16 +22,30 @@
 
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+OUTPUT_FORMAT=text
+
+if [[ $GITHUB_ACTIONS = "true" ]]
+then
+    OUTPUT_FORMAT=github
+fi
+
 
 cd $SCRIPT_DIR/phpmd
 composer update --quiet
 ./vendor/bin/phpmd \
-  $SCRIPT_DIR/../app text phpmd.xml \
+  $SCRIPT_DIR/../app,$SCRIPT_DIR/../database,$SCRIPT_DIR/../routes,$SCRIPT_DIR/../config \
+   $OUTPUT_FORMAT phpmd.xml \
   --exclude $SCRIPT_DIR/../app/resources/** \
   --exclude $SCRIPT_DIR/../app/frontend/** \
   --exclude $SCRIPT_DIR/../app/public/** \
-  --exclude $SCRIPT_DIR/../app/vendor/** \
+  --exclude $SCRIPT_DIR/../app/vendor/**
+
+EXIT_CODE=$?
 
 cd $SCRIPT_DIR/..
 
+echo "Exit code is $EXIT_CODE, but we ignore this for the time being."
+
+# for the time being, exit 0
+#exit $EXIT_CODE
 exit 0

.ci/phpmd/composer.lock

@@ -9,16 +9,16 @@
     "packages-dev": [
         {
             "name": "composer/pcre",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
                 "shasum": ""
             },
             "require": {
@@ -60,7 +60,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.0"
+                "source": "https://github.com/composer/pcre/tree/3.1.1"
             },
             "funding": [
                 {
@@ -76,7 +76,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-17T09:50:14+00:00"
+            "time": "2023-10-11T07:11:09+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -146,23 +146,24 @@
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.14.0",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1"
+                "reference": "8dfc0c46529e2073fa97986552f80646eedac562"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/8dfc0c46529e2073fa97986552f80646eedac562",
+                "reference": "8dfc0c46529e2073fa97986552f80646eedac562",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.7",
-                "symfony/config": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0"
+                "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/polyfill-mbstring": "^1.19"
             },
             "require-dev": {
                 "easy-doc/easy-doc": "0.0.0|^1.2.3",
@@ -197,7 +198,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pdepend/pdepend/issues",
-                "source": "https://github.com/pdepend/pdepend/tree/2.14.0"
+                "source": "https://github.com/pdepend/pdepend/tree/2.16.0"
             },
             "funding": [
                 {
@@ -205,26 +206,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-26T13:15:18+00:00"
+            "time": "2023-11-29T08:52:35+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.13.0",
+            "version": "2.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
+                "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/442fc2c34edcd5198b442d8647c7f0aec3afabe8",
+                "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.12.1",
+                "pdepend/pdepend": "^2.15.1",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -234,7 +235,7 @@
                 "gregwar/rst": "^1.0",
                 "mikey179/vfsstream": "^1.6.8",
                 "phpunit/phpunit": "^4.8.36 || ^5.7.27",
-                "squizlabs/php_codesniffer": "^2.0"
+                "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2"
             },
             "bin": [
                 "src/bin/phpmd"
@@ -271,6 +272,7 @@
             "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
             "homepage": "https://phpmd.org/",
             "keywords": [
+                "dev",
                 "mess detection",
                 "mess detector",
                 "pdepend",
@@ -280,7 +282,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/phpmd",
                 "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+                "source": "https://github.com/phpmd/phpmd/tree/2.14.1"
             },
             "funding": [
                 {
@@ -288,7 +290,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-10T08:44:15+00:00"
+            "time": "2023-09-28T13:07:44+00:00"
         },
         {
             "name": "psr/container",
@@ -395,34 +397,34 @@
         },
         {
             "name": "symfony/config",
-            "version": "v6.3.0",
+            "version": "v7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "a5e00dec161b08c946a2c16eed02adbeedf827ae"
+                "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/a5e00dec161b08c946a2c16eed02adbeedf827ae",
-                "reference": "a5e00dec161b08c946a2c16eed02adbeedf827ae",
+                "url": "https://api.github.com/repos/symfony/config/zipball/8789646600f4e7e451dde9e1dc81cfa429f3857a",
+                "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/filesystem": "^5.4|^6.0",
+                "symfony/filesystem": "^6.4|^7.0",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/finder": "<5.4",
+                "symfony/finder": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
-                "symfony/messenger": "^5.4|^6.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0"
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -450,7 +452,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v6.3.0"
+                "source": "https://github.com/symfony/config/tree/v7.0.0"
             },
             "funding": [
                 {
@@ -466,44 +468,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-25T10:46:17+00:00"
+            "time": "2023-11-09T08:30:23+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v6.3.1",
+            "version": "v7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "7abf242af21f196b65f20ab00ff251fdf3889b8d"
+                "reference": "f6667642954bce638733f254c39e5b5700b47ba4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/7abf242af21f196b65f20ab00ff251fdf3889b8d",
-                "reference": "7abf242af21f196b65f20ab00ff251fdf3889b8d",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6667642954bce638733f254c39e5b5700b47ba4",
+                "reference": "f6667642954bce638733f254c39e5b5700b47ba4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/container": "^1.1|^2.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/service-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.2.10"
+                "symfony/service-contracts": "^3.3",
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2",
-                "symfony/config": "<6.1",
-                "symfony/finder": "<5.4",
-                "symfony/proxy-manager-bridge": "<6.3",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/finder": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "provide": {
                 "psr/container-implementation": "1.1|2.0",
                 "symfony/service-implementation": "1.1|2.0|3.0"
             },
             "require-dev": {
-                "symfony/config": "^6.1",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/yaml": "^5.4|^6.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -531,7 +532,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v6.3.1"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.1"
             },
             "funding": [
                 {
@@ -547,11 +548,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-24T11:51:27+00:00"
+            "time": "2023-12-01T15:10:06+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.3.0",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
@@ -598,7 +599,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -618,20 +619,20 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.3.1",
+            "version": "v7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
+                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7",
+                "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
@@ -661,7 +662,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
+                "source": "https://github.com/symfony/filesystem/tree/v7.0.0"
             },
             "funding": [
                 {
@@ -677,20 +678,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-01T08:30:39+00:00"
+            "time": "2023-07-27T06:33:22+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
                 "shasum": ""
             },
             "require": {
@@ -705,7 +706,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -743,7 +744,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -759,20 +760,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+                "reference": "42292d99c55abe617799667f454222c54c60e229"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+                "reference": "42292d99c55abe617799667f454222c54c60e229",
                 "shasum": ""
             },
             "require": {
@@ -787,7 +788,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -826,7 +827,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -842,20 +843,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-07-28T09:04:16+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.3.0",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
+                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
+                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
                 "shasum": ""
             },
             "require": {
@@ -908,7 +909,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -924,27 +925,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2023-07-30T20:28:31+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v6.3.0",
+            "version": "v7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "db5416d04269f2827d8c54331ba4cfa42620d350"
+                "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db5416d04269f2827d8c54331ba4cfa42620d350",
-                "reference": "db5416d04269f2827d8c54331ba4cfa42620d350",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
+                "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -982,7 +983,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.3.0"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.0.1"
             },
             "funding": [
                 {
@@ -998,7 +999,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T08:48:44+00:00"
+            "time": "2023-11-30T11:38:21+00:00"
         }
     ],
     "aliases": [],
@@ -1008,5 +1009,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

.ci/phpmd/phpmd.xml

@@ -24,41 +24,60 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-	<description>Bla bla</description>
-
-	<!--
-Commando vanuit firefly directory:
-phpmd database,app,tests html /gdrive-all/development/phpmd/phpmd.xml > public/report.html
-	-->
-
+    <description>Firefly III ruleset.</description>
     <!-- Import the entire controversial code rule set -->
     <rule ref="rulesets/controversial.xml">
         <exclude name="CamelCasePropertyName"/>
     </rule>
 
     <!-- clean code -->
-	<rule ref="rulesets/codesize.xml" />
-	<rule ref="rulesets/design.xml" />
-	<rule ref="rulesets/naming.xml" />
+    <!-- <rule ref="rulesets/codesize.xml" /> -->
     <rule ref="rulesets/unusedcode.xml"/>
 
+
+    <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"/>
+        </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"/>
+        </properties>
+    </rule>
+
+
+    <rule ref="rulesets/naming.xml/ShortMethodName">
+        <properties>
+            <property name="minimum" value="3"/>
+        </properties>
+    </rule>
+
+    <!-- code size -->
     <rule ref="rulesets/codesize.xml/CyclomaticComplexity">
         <properties>
-			<property name="reportLevel" value="5"/>
+            <!-- TODO we want to be at report level 5. But we start high, and drop the bar slowly. -->
+            <property name="reportLevel" value="500"/>
         </properties>
     </rule>
     <rule ref="rulesets/codesize.xml/NPathComplexity">
         <properties>
-			<property name="minimum" value="128"/>
+            <!-- TODO we want to be at a value of 128. But we start high, and drop the bar slowly. -->
+            <property name="minimum" value="24062500"/>
         </properties>
     </rule>
     <rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
         <properties>
-			<property name="minimum" value="40"/>
+            <!-- TODO we want to be at a value of 40. But we start high, and drop the bar slowly. -->
+            <property name="minimum" value="100"/>
+            <property name="ignore-whitespace" value="true"/>
         </properties>
     </rule>
     <rule ref="rulesets/codesize.xml/ExcessiveParameterList">
         <properties>
+            <!-- 5 is fine. 6 is excessive, but I have just one of those. At the end of the day, I still need all params. -->
             <property name="minimum" value="5"/>
         </properties>
     </rule>
@@ -66,7 +85,9 @@ phpmd database,app,tests html /gdrive-all/development/phpmd/phpmd.xml > public/r
     <!-- include clean code manually -->
     <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
     <rule ref="rulesets/cleancode.xml/ElseExpression"/>
-
-	<!-- no this one -->
-	<!--<rule ref="rulesets/cleancode.xml/StaticAccess" />-->
+    <rule ref="rulesets/cleancode.xml/MissingImport"/>
+    <rule ref="rulesets/cleancode.xml/UndefinedVariable"/>
+    <rule ref="rulesets/cleancode.xml/IfStatementAssignment"/>
+    <rule ref="rulesets/cleancode.xml/DuplicatedArrayKey"/>
+    <rule ref="rulesets/cleancode.xml/ErrorControlOperator"/>
 </ruleset>

.ci/phpstan.neon

@@ -1,42 +1,32 @@
-includes:
-  - ../vendor/nunomaduro/larastan/extension.neon
-  - ../vendor/ergebnis/phpstan-rules/rules.neon
-  - ../vendor/phpstan/phpstan-deprecation-rules/rules.neon
-  - ../vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
-
 parameters:
+  universalObjectCratesClasses:
+    - Illuminate\Database\Eloquent\Model
+  # TODO: slowly remove these parameters and fix the issues found.
+  reportUnmatchedIgnoredErrors: false
+  checkGenericClassInNonGenericObjectType: false  # remove this rule when all other issues are solved.
   ignoreErrors:
+  # TODO: slowly remove these exceptions and fix the issues found.
+    - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
+    - '#Control structures using switch should not be used.#' # switch is fine in some cases.
+    - '#with no value type specified in iterable type array#' # remove this rule when all other issues are solved.
+    - '#has no value type specified in iterable type array#' # remove this rule when all other issues are solved.
     - '#is not allowed to extend#'
+    - '#switch is forbidden to use#'
     - '#is neither abstract nor final#'
-    - '#has a nullable return type declaration#'
-    - '#with a nullable type declaration#'
+    - '#has a nullable return type declaration#' # perhaps throw errors instead?
+    - '#with a nullable type declaration#' # decide what action should be if param is null.
     - '#with null as default value#'
-    - '#is not covariant with PHPDoc type array#'
+    -
+        message: '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
+        paths:
+            - ../app/Exceptions/IntervalException.php
+            - ../app/Support/Navigation.php
     -
         message: '#but containers should not be injected#'
         paths:
             - ../app/Support/Authentication/RemoteUserGuard.php
     -
-        message: '#Control structures using switch should not be used.#'
-        paths:
-            - ../app/Api/V1/Controllers/Data/DestroyController.php
-            - ../app/Console/Commands/Correction/FixAccountTypes.php
-            - ../app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
-            - ../app/Exceptions/GracefulNotFoundHandler.php
-            - ../app/Generator/Webhook/StandardMessageGenerator.php
-            - ../app/Support/Amount.php
-            - ../app/Support/Navigation.php
-            - ../app/Support/ParseDateString.php
-            - ../app/Support/Search/AccountSearch.php
-            - ../app/Support/Search/OperatorQuerySearch.php
-            - ../app/Support/Twig/General.php
-            - ../app/Transformers/RecurrenceTransformer.php
-            - ../app/Validation/AccountValidator.php
-            - ../app/Validation/RecurrenceValidation.php
-            - ../app/Validation/TransactionValidation.php
-
-    -
-        message: '#Function compact\(\) should not be used#'
+        message: '#Function compact\(\) should not be used#' # too useful in template rendering.
         paths:
             - ../app/Generator/Report/Account/MonthReportGenerator.php
             - ../app/Generator/Report/Audit/MonthReportGenerator.php
@@ -57,7 +47,6 @@ parameters:
         message: '#Either catch a more specific exception#'
         paths:
             - ../app/Support/Form/FormSupport.php
-
   paths:
     - ../app
     - ../database
@@ -66,5 +55,6 @@ parameters:
     - ../bootstrap/app.php
 
   # The level 8 is the highest level. original was 5
-  level: 4
+  # 7 is more than enough, higher just leaves NULL things.
+  level: 7
 

.ci/phpstan.sh

@@ -29,7 +29,20 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # cp .ci/.env.ci .env
 
 # Do static code analysis.
-# ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress
-./vendor/bin/phpstan analyse -c .ci/phpstan.neon --xdebug --error-format=table > phpstan-report.txt
+if [[ $GITHUB_ACTIONS = "" ]]
+then
+    ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --error-format=table > phpstan-report.txt
+    EXIT_CODE=$?
+    echo "The PHPstan report can be found in phpstan-report.txt. Exit code is $EXIT_CODE."
+fi
 
-echo 'The PHPstan report can be found in phpstan-report.txt'
+if [[ $GITHUB_ACTIONS = "true" ]]
+then
+    ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress --error-format=github
+    EXIT_CODE=$?
+
+    # temporary exit code 0
+    # EXIT_CODE=0
+fi
+
+exit $EXIT_CODE

.ci/phpunit.sh

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

.editorconfig

@@ -2,8 +2,17 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = space
-indent_size = 2
 end_of_line = lf
+indent_size = 4
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[docker-compose.yml]
+indent_size = 4

.env.example

@@ -45,12 +45,6 @@ TRUSTED_PROXIES=
 # Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
 LOG_CHANNEL=stack
 
-#
-# Used when logging to papertrail:
-#
-PAPERTRAIL_HOST=
-PAPERTRAIL_PORT=
-
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
@@ -58,8 +52,30 @@ PAPERTRAIL_PORT=
 APP_LOG_LEVEL=notice
 
 # Audit log level.
-# Set this to "emergency" if you dont want to store audit logs, leave on info otherwise.
-AUDIT_LOG_LEVEL=info
+# The audit log is used to log notable Firefly III events on a separate channel.
+# These log entries may contain sensitive financial information.
+# The audit log is disabled by default.
+#
+# To enable it, set AUDIT_LOG_LEVEL to "info"
+# To disable it, set AUDIT_LOG_LEVEL to "emergency"
+AUDIT_LOG_LEVEL=emergency
+
+#
+# If you want, you can redirect the audit logs to another channel.
+# Set 'audit_stdout', 'audit_syslog', 'audit_errorlog' to log to the system itself.
+# Use audit_daily to log to a rotating file.
+# Use audit_papertrail to log to papertrail.
+#
+# If you do this, the audit logs may be mixed with normal logs because the settings for these channels
+# are often the same as the settings for the normal logs.
+AUDIT_LOG_CHANNEL=
+
+#
+# Used when logging to papertrail:
+# Also used when audit logs log to papertrail:
+#
+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
@@ -179,6 +195,16 @@ MAP_DEFAULT_LAT=51.983333
 MAP_DEFAULT_LONG=5.916667
 MAP_DEFAULT_ZOOM=6
 
+#
+# Some objects have room for an URL, like transactions and webhooks.
+# By default, the following protocols are allowed:
+# http, https, ftp, ftps, mailto
+#
+# To change this, set your preferred comma separated set below.
+# Be sure to include http, https and other default ones if you need to.
+#
+VALID_URL_PROTOCOLS=
+
 #
 # Firefly III authentication settings
 #

.env.testing

@@ -0,0 +1,26 @@
+APP_ENV=testing
+APP_DEBUG=true
+SITE_OWNER=mail@example.com
+APP_KEY=TestTestTestTestTestTestTestTest
+DEFAULT_LANGUAGE=en_US
+DEFAULT_LOCALE=equal
+TZ=Europe/Amsterdam
+LOG_CHANNEL=stdout
+APP_LOG_LEVEL=debug
+AUDIT_LOG_LEVEL=info
+AUDIT_LOG_CHANNEL=audit_stdout
+DB_CONNECTION=sqlite
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+MAIL_MAILER=log
+SEND_ERROR_MESSAGE=true
+ENABLE_EXTERNAL_MAP=false
+ENABLE_EXTERNAL_RATES=true
+AUTHENTICATION_GUARD=web
+ALLOW_WEBHOOKS=true
+APP_NAME=FireflyIII
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
+CACHE_PREFIX=firefly
+FIREFLY_III_LAYOUT=v1
+APP_URL=http://localhost

.gitattributes

@@ -1,8 +1,11 @@
-* text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
+* text=auto eol=lf
+
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
 CHANGELOG.md export-ignore
-/tests       export-ignore
-/phpunit.xml export-ignore
-/.ci export-ignore
+.styleci.yml export-ignore

.github/label-actions.yml

@@ -0,0 +1,37 @@
+# Configuration for Label Actions - https://github.com/dessant/label-actions
+
+# The `feature` label is added to issues
+feature:
+  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 a feature request. The requested (new) feature will become a part of Firefly III or the data importer in due course.
+
+      If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
+
+      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`
+
+      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.
+
+      If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
+
+      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`
+
+      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.

.github/workflows/cleanup.yml

@@ -1,6 +1,6 @@
 # This workflow prunes old workflow runs for an entire repository.
 
-name: Prune old builds
+name: "Chore - Prune old builds"
 
 on:
   schedule:
@@ -57,10 +57,9 @@ jobs:
             const workflows = [
               'cleanup.yml',
               'closed-issues.yml',
-              'depsreview.yaml',
-              'laravel.yml',
+              'depsreview.yml',
+              'label-actions.yml',
               'lock.yml',
-              'qodana.yml',
               'sonarcloud.yml',
               'stale.yml'
             ]

.github/workflows/closed-issues.yml

@@ -1,10 +1,11 @@
-name: "Reply to closed issue"
+---
+name: Issues - Reply to closed issue
 on:
   issues:
     types:
       - closed
 jobs:
-  auto_comment:
+  command_and_close:
     runs-on: ubuntu-latest
     steps:
       - uses: aws-actions/closed-issue-message@v1
@@ -12,11 +13,16 @@ jobs:
           message: |
             Hi there! This is an automatic reply. `Share and enjoy`
 
-            This issue is now 🔒 closed. Please be aware that closed issues are **not** watched.
+            This issue is now 🔒 closed. Please be aware that closed issues are not monitored by the developer of Firefly III.
 
-            - If the original bug is not actually fixed, please feel free to open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose). Please refer to this issue for clarity.
+            - If the original bug is not actually fixed, please open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose). Refer to this issue for clarity.
             - Follow-up questions must be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
-            - Further replies to this issue will get **no response**.
+            - Further replies to this issue may get no response.
+
+            If there is more to discuss, please open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose) or [discussion](https://github.com/firefly-iii/firefly-iii/discussions/).
 
             Thank you for your contributions.
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: OSDKDev/lock-issues@v1.1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/depsreview.yml

@@ -1,4 +1,4 @@
-name: 'Dependency Review'
+name: 'Code - Dependency review'
 on: [ pull_request ]
 
 permissions:
@@ -8,7 +8,9 @@ jobs:
   dependency-review:
     runs-on: ubuntu-latest
     steps:
-      - name: 'Checkout Repository'
+      - name: 'Checkout repository'
         uses: actions/checkout@v3
-      - name: 'Dependency Review'
+        with:
+          fetch-depth: 0
+      - name: 'Dependency review'
         uses: actions/dependency-review-action@v3

.github/workflows/label-actions.yml

@@ -0,0 +1,21 @@
+name: 'Issues - Reply to specific labels'
+
+on:
+  issues:
+    types: [labeled, unlabeled]
+  pull_request_target:
+    types: [labeled, unlabeled]
+  discussion:
+    types: [labeled, unlabeled]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+  discussions: write
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/label-actions@v3

.github/workflows/laravel.yml

@@ -1,146 +0,0 @@
-name: Firefly III
-
-on:
-  push:
-    branches-ignore:
-      - '**'
-
-jobs:
-  prepare:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Prepare dependencies
-        run: |
-          set -euxo pipefail
-          export PATH=$PATH:$HOME/.composer/vendor/bin/
-          composer global require hirak/prestissimo --no-plugins --no-scripts
-          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-          touch ./storage/database/database.sqlite
-      - name: Prepare Firefly III
-        run: |
-          chmod -R 777 storage bootstrap/cache
-          php artisan migrate --seed
-          php artisan firefly-iii:upgrade-database
-      - name: Upload database
-        uses: actions/upload-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Upload cache
-        uses: actions/upload-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Upload composer cache
-        uses: actions/upload-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-
-  laravel-tests:
-
-    runs-on: ubuntu-latest
-
-    needs:
-      - prepare
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Download database
-        uses: actions/download-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Download cache
-        uses: actions/download-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Download vendor
-        uses: actions/download-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-      - name: Install composer
-        run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-      - name: PHPUnit tests
-        uses: php-actions/phpunit@v1
-        with:
-          config: phpunit.xml
-          memory: 512M
-
-  coding-standards:
-
-    runs-on: ubuntu-latest
-
-    needs:
-      - prepare
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Download database
-        uses: actions/download-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Download cache
-        uses: actions/download-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Download vendor
-        uses: actions/download-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-      - name: install depenencies
-        run: |
-          composer global require nette/coding-standard
-          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-      - name: Execute code standard
-        run: /home/runner/.composer/vendor/bin/ecs check app tests --config ./.ci/firefly-iii-standard.yml
-
-  phpstan:
-
-    runs-on: ubuntu-latest
-
-    needs:
-      - prepare
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Download database
-        uses: actions/download-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Download cache
-        uses: actions/download-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Download vendor
-        uses: actions/download-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-      - name: Install depenencies
-        run: |
-          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-      - name: Execute PHPStan
-        run: vendor/bin/phpstan analyse -c .ci/phpstan.neon

.github/workflows/lock.yml

@@ -1,4 +1,4 @@
-name: Lock old issues
+name: 'Issues - Lock old issues'
 
 on:
   workflow_dispatch:

.github/workflows/qodana.yml

@@ -1,35 +0,0 @@
-name: Qodana
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - develop
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    name: 'Qodana Scan'
-    steps:
-      - name: Setup PHP with no coverage driver
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.2'
-          coverage: none
-          extensions: bcmath, intl
-        env:
-          update: true
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Install dependencies
-        run: |
-          composer install --no-scripts
-          cp .env.example .env
-          php artisan key:generate
-          php artisan clear-compiled
-          php artisan ide-helper:generate;
-
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@main
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.github/workflows/sonarcloud.yml

@@ -1,21 +1,21 @@
-name: Sonarcloud
+name: 'Code - Run Sonarcloud'
 on:
   pull_request:
+  workflow_dispatch:
   push:
     branches:
       - main
       - develop
+env:
+  DB_CONNECTION: sqlite
+  APP_KEY: UfpBqqeXx7zpNodsC6yjYQcRfDdm4Bxh
 jobs:
   sonarcloud:
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -24,15 +24,47 @@ jobs:
         with:
           php-version: '8.2'
           coverage: xdebug
+          extensions: >-
+            bcmath
+            curl
+            fileinfo
+            iconv
+            intl
+            json
+            sqlite3
+            mbstring
+            openssl
+            pdo
+            session
+            simplexml
+            sodium
+            tokenizer
+            xml
+            xmlwriter
+
+      - name: Copy standard configuration
+        run: cp .env.testing .env
 
       - name: Install Composer dependencies
         run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
 
-      - name: Copy environment file
-        run: cp .env.example .env
+      - name: PHPStan
+        run: .ci/phpstan.sh
 
-      - name: Generate app key
-        run: php artisan key:generate
+      - name: PHPMD
+        run: .ci/phpmd.sh
+
+      - name: PHP CS Fixer
+        run: .ci/phpcs.sh
+
+      - name: "Create database file"
+        run: touch storage/database/database.sqlite
+
+      - name: "Upgrades the database to the latest version"
+        run: php artisan firefly-iii:upgrade-database
+
+      - name: "Integrity Database Report"
+        run: php artisan firefly-iii:report-integrity
 
       - name: "Run tests with coverage"
         run: composer coverage

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: "Close stale issues"
+name: "Issues - Close stale issues"
 on:
   schedule:
     - cron: "30 1 * * *"

.gitignore

@@ -1,8 +1,6 @@
 /node_modules
-/frontend/node_modules
 /storage/*.key
 /vendor
-/.vagrant
 npm-debug.log
 yarn-error.log
 .env

.htaccess

@@ -8,7 +8,5 @@
 # To hide directory listing
 Options All -Indexes
 
-# To prevent access to .env and other files
-<Files .*>
+# To prevent access any file
 Deny from all
-</Files>

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

@@ -41,6 +41,7 @@ class AccountController extends Controller
 {
     use AccountFilter;
 
+    /** @var array<int, string> */
     private array                      $balanceTypes;
     private AccountRepositoryInterface $repository;
 
@@ -82,7 +83,8 @@ class AccountController extends Controller
         $date  = $data['date'] ?? today(config('app.timezone'));
 
         $return = [];
-        $result = $this->repository->searchAccount((string)$query, $types, $data['limit']);
+
+        $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();
 
@@ -105,7 +107,7 @@ class AccountController extends Controller
                 'name'                    => $account->name,
                 'name_with_balance'       => $nameWithBalance,
                 'type'                    => $account->accountType->type,
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -116,10 +118,10 @@ class AccountController extends Controller
         // custom order.
         usort(
             $return,
-            function ($a, $b) {
+            static function (array $left, array $right) {
                 $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
-                $posA  = array_search($a['type'], $order, true);
-                $posB  = array_search($b['type'], $order, true);
+                $posA  = (int)array_search($left['type'], $order, true);
+                $posB  = (int)array_search($right['type'], $order, true);
 
                 return $posA - $posB;
             }

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

@@ -58,7 +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
-     * TODO expand API to add active field.
      *
      * @param AutocompleteRequest $request
      *
@@ -67,7 +66,7 @@ class BillController extends Controller
     public function bills(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $result   = $this->repository->searchBill($data['query'], $data['limit']);
+        $result   = $this->repository->searchBill($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
             static function (Bill $item) {
                 return [

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

@@ -66,7 +66,7 @@ class BudgetController extends Controller
     public function budgets(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $result   = $this->repository->searchBudget($data['query'], $data['limit']);
+        $result   = $this->repository->searchBudget($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
             static function (Budget $item) {
                 return [

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

@@ -66,7 +66,7 @@ class CategoryController extends Controller
     public function categories(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $result   = $this->repository->searchCategory($data['query'], $data['limit']);
+        $result   = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
             static function (Category $item) {
                 return [

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

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -66,7 +66,7 @@ class CurrencyController extends Controller
     public function currencies(AutocompleteRequest $request): JsonResponse
     {
         $data       = $request->getData();
-        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $collection = $this->repository->searchCurrency($data['query'], $this->parameters->get('limit'));
         $result     = [];
 
         /** @var TransactionCurrency $currency */
@@ -95,7 +95,7 @@ class CurrencyController extends Controller
     public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
     {
         $data       = $request->getData();
-        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $collection = $this->repository->searchCurrency($data['query'], $this->parameters->get('limit'));
         $result     = [];
 
         /** @var TransactionCurrency $currency */

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

@@ -67,7 +67,7 @@ class ObjectGroupController extends Controller
     {
         $data   = $request->getData();
         $return = [];
-        $result = $this->repository->search($data['query'], $data['limit']);
+        $result = $this->repository->search($data['query'], $this->parameters->get('limit'));
 
         /** @var ObjectGroup $objectGroup */
         foreach ($result as $objectGroup) {

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

@@ -70,7 +70,7 @@ class PiggyBankController extends Controller
     public function piggyBanks(AutocompleteRequest $request): JsonResponse
     {
         $data            = $request->getData();
-        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $response        = [];
 
@@ -105,7 +105,7 @@ class PiggyBankController extends Controller
     public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
     {
         $data            = $request->getData();
-        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $response        = [];
         /** @var PiggyBank $piggy */

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

@@ -64,7 +64,7 @@ class RecurrenceController extends Controller
     public function recurring(AutocompleteRequest $request): JsonResponse
     {
         $data        = $request->getData();
-        $recurrences = $this->repository->searchRecurrence($data['query'], $data['limit']);
+        $recurrences = $this->repository->searchRecurrence($data['query'], $this->parameters->get('limit'));
         $response    = [];
 
         /** @var Recurrence $recurrence */

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

@@ -63,7 +63,7 @@ class RuleController extends Controller
     public function rules(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $rules    = $this->repository->searchRule($data['query'], $data['limit']);
+        $rules    = $this->repository->searchRule($data['query'], $this->parameters->get('limit'));
         $response = [];
 
         /** @var Rule $rule */

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

@@ -63,7 +63,7 @@ class RuleGroupController extends Controller
     public function ruleGroups(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $groups   = $this->repository->searchRuleGroup($data['query'], $data['limit']);
+        $groups   = $this->repository->searchRuleGroup($data['query'], $this->parameters->get('limit'));
         $response = [];
 
         /** @var RuleGroup $group */

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

@@ -67,7 +67,7 @@ class TagController extends Controller
     {
         $data = $request->getData();
 
-        $result = $this->repository->searchTags($data['query'], $data['limit']);
+        $result = $this->repository->searchTags($data['query'], $this->parameters->get('limit'));
         $array  = [];
         /** @var Tag $tag */
         foreach ($result as $tag) {

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

@@ -71,7 +71,7 @@ class TransactionController extends Controller
     public function transactions(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();
-        $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+        $result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit'));
 
         // limit and unique
         $filtered = $result->unique('description');
@@ -113,7 +113,7 @@ class TransactionController extends Controller
             }
         }
         if (!is_numeric($data['query'])) {
-            $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+            $result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit'));
         }
 
         // limit and unique

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

@@ -62,7 +62,7 @@ class TransactionTypeController extends Controller
     public function transactionTypes(AutocompleteRequest $request): JsonResponse
     {
         $data  = $request->getData();
-        $types = $this->repository->searchTypes($data['query'], $data['limit']);
+        $types = $this->repository->searchTypes($data['query'], $this->parameters->get('limit'));
         $array = [];
 
         /** @var TransactionType $type */

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

@@ -30,8 +30,8 @@ use FireflyIII\Api\V1\Requests\Data\DateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -46,7 +46,6 @@ class AccountController extends Controller
 {
     use ApiSupport;
 
-    private CurrencyRepositoryInterface $currencyRepository;
     private AccountRepositoryInterface $repository;
 
     /**
@@ -64,9 +63,6 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 return $next($request);
             }
         );
@@ -95,6 +91,7 @@ class AccountController extends Controller
 
         // user's preferences
         $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray();
+        /** @var Preference $frontPage */
         $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
         $default    = app('amount')->getDefaultCurrency();
 

app/Api/V1/Controllers/Controller.php

@@ -27,11 +27,12 @@ namespace FireflyIII\Api\V1\Controllers;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
+use FireflyIII\Models\Preference;
+use FireflyIII\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\Log;
 use League\Fractal\Manager;
 use League\Fractal\Serializer\JsonApiSerializer;
 use Psr\Container\ContainerExceptionInterface;
@@ -50,7 +51,8 @@ abstract class Controller extends BaseController
     use DispatchesJobs;
     use ValidatesRequests;
 
-    protected const CONTENT_TYPE = 'application/vnd.api+json';
+    protected const string CONTENT_TYPE = 'application/vnd.api+json';
+    /** @var array<int, string> */
     protected array        $allowedSort;
     protected ParameterBag $parameters;
 
@@ -61,9 +63,9 @@ abstract class Controller extends BaseController
     {
         // get global parameters
         $this->allowedSort = config('firefly.allowed_sort_parameters');
-        $this->parameters  = $this->getParameters();
         $this->middleware(
             function ($request, $next) {
+                $this->parameters = $this->getParameters();
                 if (auth()->check()) {
                     $language = app('steam')->getLanguage();
                     app()->setLocale($language);
@@ -88,8 +90,8 @@ abstract class Controller extends BaseController
         if ($page < 1) {
             $page = 1;
         }
-        if ($page > pow(2, 16)) {
-            $page = pow(2, 16);
+        if ($page > 2 ** 16) {
+            $page = 2 ** 16;
         }
         $bag->set('page', $page);
 
@@ -100,20 +102,21 @@ abstract class Controller extends BaseController
             try {
                 $date = request()->query->get($field);
             } catch (BadRequestException $e) {
-                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
-                Log::error($e->getMessage());
+                app('log')->error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
                 $value = null;
             }
             $obj = null;
             if (null !== $date) {
                 try {
-                    $obj = Carbon::parse($date);
+                    $obj = Carbon::parse((string)$date);
                 } catch (InvalidDateException | InvalidFormatException $e) {
                     // don't care
                     app('log')->warning(
                         sprintf(
                             'Ignored invalid date "%s" in API controller parameter check: %s',
-                            substr($date, 0, 20),
+                            substr((string)$date, 0, 20),
                             $e->getMessage()
                         )
                     );
@@ -128,13 +131,24 @@ abstract class Controller extends BaseController
             try {
                 $value = request()->query->get($integer);
             } catch (BadRequestException $e) {
-                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
-                Log::error($e->getMessage());
+                app('log')->error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
                 $value = null;
             }
             if (null !== $value) {
                 $bag->set($integer, (int)$value);
             }
+            if (null === $value &&
+                'limit' === $integer && // @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);
+            }
         }
 
         // sort fields:
@@ -152,8 +166,9 @@ abstract class Controller extends BaseController
         try {
             $param = (string)request()->query->get('sort');
         } catch (BadRequestException $e) {
-            Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
-            Log::error($e->getMessage());
+            app('log')->error('Request field "sort" contains a non-scalar value. Value set to NULL.');
+            app('log')->error($e->getMessage());
+            app('log')->error($e->getTraceAsString());
             $param = '';
         }
         if ('' === $param) {

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

@@ -76,7 +76,7 @@ class TransactionController extends Controller
         // this deserves better code, but for now a loop of basic if-statements
         // to respond to what is in the $query.
         // this is OK because only one thing can be in the query at the moment.
-        if ($this->updatesTransactionAccount($params)) {
+        if ($this->isUpdateTransactionAccount($params)) {
             $original    = $this->repository->find((int)$params['where']['account_id']);
             $destination = $this->repository->find((int)$params['update']['account_id']);
 
@@ -89,11 +89,11 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param array $params
+     * @param array $params <array<string, array<string, int|string>>>
      *
      * @return bool
      */
-    private function updatesTransactionAccount(array $params): bool
+    private function isUpdateTransactionAccount(array $params): bool
     {
         return array_key_exists('account_id', $params['where']) && array_key_exists('account_id', $params['update']);
     }

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

@@ -45,7 +45,6 @@ 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
@@ -67,135 +66,34 @@ class DestroyController extends Controller
     {
         $objects      = $request->getObjects();
         $this->unused = $request->boolean('unused', false);
-        switch ($objects) {
-            default:
-                throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects));
-            case 'budgets':
-                $this->destroyBudgets();
-                break;
-            case 'bills':
-                $this->destroyBills();
-                break;
-            case 'piggy_banks':
-                $this->destroyPiggyBanks();
-                break;
-            case 'rules':
-                $this->destroyRules();
-                break;
-            case 'recurring':
-                $this->destroyRecurringTransactions();
-                break;
-            case 'categories':
-                $this->destroyCategories();
-                break;
-            case 'tags':
-                $this->destroyTags();
-                break;
-            case 'object_groups':
-                $this->destroyObjectGroups();
-                break;
-            case 'not_assets_liabilities':
-                $this->destroyAccounts(
-                    [
-                        AccountType::BENEFICIARY,
-                        AccountType::CASH,
-                        AccountType::CREDITCARD,
-                        AccountType::DEFAULT,
-                        AccountType::EXPENSE,
-                        AccountType::IMPORT,
-                        AccountType::INITIAL_BALANCE,
-                        AccountType::LIABILITY_CREDIT,
-                        AccountType::RECONCILIATION,
-                        AccountType::REVENUE,
-                    ]
-                );
-                break;
-            case 'accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::ASSET,
-                        AccountType::BENEFICIARY,
-                        AccountType::CASH,
-                        AccountType::CREDITCARD,
-                        AccountType::DEBT,
-                        AccountType::DEFAULT,
-                        AccountType::EXPENSE,
-                        AccountType::IMPORT,
-                        AccountType::INITIAL_BALANCE,
-                        AccountType::LIABILITY_CREDIT,
-                        AccountType::LOAN,
-                        AccountType::MORTGAGE,
-                        AccountType::RECONCILIATION,
-                        AccountType::REVENUE,
-                    ]
-                );
-                break;
-            case 'asset_accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::ASSET,
-                        AccountType::DEFAULT,
-                    ]
-                );
-                break;
-            case 'expense_accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::BENEFICIARY,
-                        AccountType::EXPENSE,
-                    ]
-                );
-                break;
-            case 'revenue_accounts':
-                $this->destroyAccounts(
-                    [
-                        AccountType::REVENUE,
-                    ]
-                );
-                break;
-            case 'liabilities':
-                $this->destroyAccounts(
-                    [
-                        AccountType::DEBT,
-                        AccountType::LOAN,
-                        AccountType::MORTGAGE,
-                        AccountType::CREDITCARD,
-                    ]
-                );
-                break;
-            case 'transactions':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::WITHDRAWAL,
-                        TransactionType::DEPOSIT,
-                        TransactionType::TRANSFER,
-                        TransactionType::RECONCILIATION,
-                        TransactionType::OPENING_BALANCE,
-                    ]
-                );
-                break;
-            case 'withdrawals':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::WITHDRAWAL,
-                    ]
-                );
-                break;
-            case 'deposits':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::DEPOSIT,
-                    ]
-                );
-                break;
-            case 'transfers':
-                $this->destroyTransactions(
-                    [
-                        TransactionType::TRANSFER,
-                    ]
-                );
-                break;
-        }
+
+        $allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE,];
+        $all             = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION,];
+        $liabilities     = [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
+        $transactions    = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::RECONCILIATION, TransactionType::OPENING_BALANCE,];
+
+        match ($objects) {
+            'budgets'                => $this->destroyBudgets(),
+            'bills'                  => $this->destroyBills(),
+            'piggy_banks'            => $this->destroyPiggyBanks(),
+            'rules'                  => $this->destroyRules(),
+            'recurring'              => $this->destroyRecurringTransactions(),
+            'categories'             => $this->destroyCategories(),
+            'tags'                   => $this->destroyTags(),
+            'object_groups'          => $this->destroyObjectGroups(),
+            'not_assets_liabilities' => $this->destroyAccounts($allExceptAssets),
+            'accounts'               => $this->destroyAccounts($all),
+            'asset_accounts'         => $this->destroyAccounts([AccountType::ASSET, AccountType::DEFAULT]),
+            'expense_accounts'       => $this->destroyAccounts([AccountType::BENEFICIARY, AccountType::EXPENSE]),
+            'revenue_accounts'       => $this->destroyAccounts([AccountType::REVENUE]),
+            'liabilities'            => $this->destroyAccounts($liabilities),
+            'transactions'           => $this->destroyTransactions($transactions),
+            'withdrawals'            => $this->destroyTransactions([TransactionType::WITHDRAWAL]),
+            'deposits'               => $this->destroyTransactions([TransactionType::DEPOSIT]),
+            'transfers'              => $this->destroyTransactions([TransactionType::TRANSFER]),
+            default                  => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)),
+        };
+
         app('preferences')->mark();
 
         return response()->json([], 204);
@@ -290,7 +188,7 @@ class DestroyController extends Controller
     }
 
     /**
-     * @param array $types
+     * @param array $types <int, string>
      */
     private function destroyAccounts(array $types): void
     {
@@ -303,19 +201,19 @@ class DestroyController extends Controller
         foreach ($collection as $account) {
             $count = $account->transactions()->count();
             if (true === $this->unused && 0 === $count) {
-                Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
+                app('log')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
                 $service->destroy($account, null);
                 continue;
             }
             if (false === $this->unused) {
-                Log::info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
+                app('log')->info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
                 $service->destroy($account, null);
             }
         }
     }
 
     /**
-     * @param array $types
+     * @param array $types <int, string>
      */
     private function destroyTransactions(array $types): void
     {

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

@@ -62,7 +62,11 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function accounts(ExportRequest $request): LaravelResponse
     {
@@ -108,7 +112,10 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function bills(ExportRequest $request): LaravelResponse
     {
@@ -124,7 +131,10 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function budgets(ExportRequest $request): LaravelResponse
     {
@@ -140,7 +150,10 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function categories(ExportRequest $request): LaravelResponse
     {
@@ -156,7 +169,10 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function piggyBanks(ExportRequest $request): LaravelResponse
     {
@@ -172,7 +188,10 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function recurring(ExportRequest $request): LaravelResponse
     {
@@ -188,7 +207,10 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function rules(ExportRequest $request): LaravelResponse
     {
@@ -204,7 +226,10 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     *                                   @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function tags(ExportRequest $request): LaravelResponse
     {
@@ -220,7 +245,9 @@ class ExportController extends Controller
      * @param ExportRequest $request
      *
      * @return LaravelResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function transactions(ExportRequest $request): LaravelResponse
     {

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

@@ -35,6 +35,7 @@ use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -51,6 +52,7 @@ class PurgeController extends Controller
      */
     public function purge(): JsonResponse
     {
+        /** @var User $user */
         $user = auth()->user();
 
         // some manual code, too lazy to call all repositories.

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

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use Illuminate\Http\JsonResponse;
 
@@ -43,7 +42,6 @@ class AccountController extends Controller
 {
     use ApiSupport;
 
-    private CurrencyRepositoryInterface   $currencyRepository;
     private OperationsRepositoryInterface $opsRepository;
     private AccountRepositoryInterface    $repository;
 
@@ -61,9 +59,6 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->opsRepository->setUser($user);
 

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

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use Illuminate\Http\JsonResponse;
 
@@ -43,7 +42,6 @@ class AccountController extends Controller
 {
     use ApiSupport;
 
-    private CurrencyRepositoryInterface   $currencyRepository;
     private OperationsRepositoryInterface $opsRepository;
     private AccountRepositoryInterface    $repository;
 
@@ -61,9 +59,6 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->opsRepository->setUser($user);
 

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

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
  */
 class DestroyController extends Controller
 {
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';
 
     private AccountRepositoryInterface $repository;
 

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

@@ -47,7 +47,7 @@ class ListController extends Controller
 {
     use TransactionFilter;
 
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';
 
     private AccountRepositoryInterface $repository;
 
@@ -81,7 +81,7 @@ class ListController extends Controller
     public function attachments(Account $account): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($account);
 
         $count       = $collection->count();
@@ -116,7 +116,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getPiggyBanks($account);
@@ -152,15 +152,9 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Account $account): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
-
-        // user can overrule page size with limit parameter.
-        $limit = $this->parameters->get('limit');
-        if (null !== $limit && $limit > 0) {
-            $pageSize = $limit;
-        }
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
         $manager = $this->getManager();
         /** @var User $admin */
@@ -172,8 +166,11 @@ class ListController extends Controller
         $collector->setUser($admin)->setAccounts(new Collection([$account]))
                   ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();

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

@@ -43,7 +43,7 @@ class ShowController extends Controller
 {
     use AccountFilter;
 
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';
 
     private AccountRepositoryInterface $repository;
 
@@ -84,7 +84,7 @@ class ShowController extends Controller
 
         // types to get, page size:
         $types    = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of accounts. Count it and split it.
         $this->repository->resetAccountOrder();

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

@@ -35,7 +35,7 @@ use League\Fractal\Resource\Item;
  */
 class StoreController extends Controller
 {
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';
 
     private AccountRepositoryInterface $repository;
 

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

@@ -29,16 +29,14 @@ use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\AccountTransformer;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
-use Preferences;
 
 /**
  * Class UpdateController
  */
 class UpdateController extends Controller
 {
-    public const RESOURCE_KEY = 'accounts';
+    public const string RESOURCE_KEY = 'accounts';
 
     private AccountRepositoryInterface $repository;
 
@@ -73,13 +71,13 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Account $account): JsonResponse
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
         $data         = $request->getUpdateData();
         $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $account      = $this->repository->update($account, $data);
         $manager      = $this->getManager();
         $account->refresh();
-        Preferences::mark();
+        app('preferences')->mark();
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);

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

@@ -123,7 +123,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of attachments. Count it and split it.
         $collection  = $this->repository->get();

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

@@ -34,7 +34,6 @@ 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;
 
 /**
@@ -78,7 +77,7 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
         $data       = $request->getAll();
         $attachment = $this->repository->store($data);
         $manager    = $this->getManager();
@@ -107,7 +106,7 @@ class StoreController extends Controller
         $helper = app(AttachmentHelperInterface::class);
         $body   = $request->getContent();
         if ('' === $body) {
-            Log::error('Body of attachment is empty.');
+            app('log')->error('Body of attachment is empty.');
 
             return response()->json([], 422);
         }

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

@@ -76,7 +76,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         $start = $this->parameters->get('start');
         $end   = $this->parameters->get('end');

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

@@ -80,7 +80,7 @@ class ListController extends Controller
     public function attachments(Bill $bill): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($bill);
 
         $count       = $collection->count();
@@ -116,7 +116,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getRulesForBill($bill);
@@ -151,7 +151,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Bill $bill): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -177,9 +177,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        // do parameter stuff on new group collector.
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         // get paginator.

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

@@ -73,7 +73,7 @@ class ShowController extends Controller
         $this->repository->correctOrder();
         $bills     = $this->repository->getBills();
         $manager   = $this->getManager();
-        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize  = $this->parameters->get('limit');
         $count     = $bills->count();
         $bills     = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));

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

@@ -82,7 +82,7 @@ class ListController extends Controller
     public function attachments(Budget $budget): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($budget);
 
         $count       = $collection->count();
@@ -116,7 +116,7 @@ class ListController extends Controller
     public function budgetLimits(Budget $budget): JsonResponse
     {
         $manager  = $this->getManager();
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $this->parameters->set('budget_id', $budget->id);
         $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
@@ -148,13 +148,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Budget $budget): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // user can overrule page size with limit parameter.
-        $limit = $this->parameters->get('limit');
-        if (null !== $limit && $limit > 0) {
-            $pageSize = $limit;
-        }
+        $pageSize = $this->parameters->get('limit');
 
         $type = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
@@ -181,8 +175,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();
@@ -211,13 +208,7 @@ class ListController extends Controller
      */
     public function withoutBudget(Request $request): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // user can overrule page size with limit parameter.
-        $limit = $this->parameters->get('limit');
-        if (null !== $limit && $limit > 0) {
-            $pageSize = $limit;
-        }
+        $pageSize = $this->parameters->get('limit');
 
         $type = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
@@ -244,8 +235,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();

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

@@ -77,7 +77,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getBudgets();

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

@@ -28,7 +28,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -44,28 +43,6 @@ class ListController extends Controller
 {
     use TransactionFilter;
 
-    private BudgetLimitRepositoryInterface $blRepository;
-
-    /**
-     * BudgetLimitController constructor.
-     *
-
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->blRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionByBudgetLimit
@@ -80,7 +57,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 

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

@@ -75,17 +75,15 @@ class ShowController extends Controller
      *
      * Display a listing of the budget limits for this budget.
      *
-     * @param Request $request
      * @param Budget $budget
      *
      * @return JsonResponse
-     * @throws FireflyException
      */
-    public function index(Request $request, Budget $budget): JsonResponse
+    public function index(Budget $budget): JsonResponse
     {
         $manager = $this->getManager();
         $manager->parseIncludes('budget');
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -111,13 +109,13 @@ class ShowController extends Controller
      * @param SameDateRequest $request
      *
      * @return JsonResponse
-     * @throws FireflyException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function indexAll(SameDateRequest $request): JsonResponse
     {
         $manager = $this->getManager();
         $manager->parseIncludes('budget');
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $collection   = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -138,16 +136,15 @@ class ShowController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/getBudgetLimit
      *
-     * @param Request     $request
      * @param Budget      $budget
      * @param BudgetLimit $budgetLimit
      *
      * @return JsonResponse
      * @throws FireflyException
      */
-    public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
+    public function show(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
-        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
+        if ($budget->id !== $budgetLimit->budget_id) {
             throw new FireflyException('20028: The budget limit does not belong to the budget.');
         }
         // continue!

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

@@ -78,7 +78,7 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
-        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
+        if ($budget->id !== $budgetLimit->budget_id) {
             throw new FireflyException('20028: The budget limit does not belong to the budget.');
         }
         $data              = $request->getAll();

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

@@ -77,7 +77,7 @@ class ListController extends Controller
     public function attachments(Category $category): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($category);
 
         $count       = $collection->count();
@@ -112,7 +112,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Category $category): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -138,8 +138,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();

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

@@ -73,7 +73,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getCategories();

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

@@ -77,7 +77,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
 
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         // get list of piggy banks. Count it and split it.
         $collection = $this->repository->getBills($objectGroup);
         $count      = $collection->count();
@@ -114,7 +114,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of piggy banks. Count it and split it.
         $collection = $this->repository->getPiggyBanks($objectGroup);

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

@@ -69,17 +69,14 @@ class ShowController extends Controller
      *
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
-     * @throws FireflyException
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         $this->repository->resetOrder();
         $collection   = $this->repository->get();

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

@@ -71,7 +71,7 @@ class ListController extends Controller
     public function attachments(PiggyBank $piggyBank): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($piggyBank);
 
         $count       = $collection->count();
@@ -105,7 +105,7 @@ class ListController extends Controller
     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $manager  = $this->getManager();
 
         $collection = $this->repository->getEvents($piggyBank);

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

@@ -72,7 +72,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getPiggyBanks();

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

@@ -77,7 +77,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Recurrence $recurrence): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -105,9 +105,13 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
         }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
+        }
+
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
         $transactions = $paginator->getCollection();

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

@@ -73,7 +73,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->get();

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

@@ -77,7 +77,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->ruleRepository->getAll();

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

@@ -75,7 +75,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->ruleGroupRepository->getRules($group);

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

@@ -75,7 +75,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of rule groups. Count it and split it.
         $collection = $this->ruleGroupRepository->get();

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

@@ -80,7 +80,7 @@ class ListController extends Controller
     public function attachments(Tag $tag): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($tag);
 
         $count       = $collection->count();
@@ -114,7 +114,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Tag $tag): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -139,8 +139,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.tags.transactions', [$tag->id]) . $this->buildParams());

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

@@ -76,7 +76,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->get();

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

@@ -33,7 +33,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class DestroyController
@@ -79,7 +78,7 @@ class DestroyController extends Controller
      */
     public function destroy(TransactionGroup $transactionGroup): JsonResponse
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
         // grab asset account(s) from group:
         $accounts = [];
         /** @var TransactionJournal $journal */
@@ -100,7 +99,7 @@ class DestroyController extends Controller
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));
+            app('log')->debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));
             event(new UpdatedAccount($account));
         }
 

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

@@ -78,7 +78,7 @@ class ListController extends Controller
     public function attachments(TransactionGroup $transactionGroup): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = new Collection();
         foreach ($transactionGroup->transactionJournals as $transactionJournal) {
             $collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection);
@@ -114,7 +114,7 @@ class ListController extends Controller
     {
         $manager    = $this->getManager();
         $collection = new Collection();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         foreach ($transactionGroup->transactionJournals as $transactionJournal) {
             $collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection);
         }
@@ -152,7 +152,7 @@ class ListController extends Controller
     {
         $manager      = $this->getManager();
         $collection   = $this->journalAPIRepository->getJournalLinks($transactionJournal);
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $count        = $collection->count();
         $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 

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

@@ -58,7 +58,7 @@ class ShowController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -80,7 +80,7 @@ class ShowController extends Controller
             ->setPage($this->parameters->get('page'))
             // set types of transactions to return.
             ->setTypes($types);
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+        if (null !== $this->parameters->get('start') || null !== $this->parameters->get('end')) {
             $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();

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

@@ -83,7 +83,7 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        Log::debug('Now in API StoreController::store()');
+        app('log')->debug('Now in API StoreController::store()');
         $data         = $request->getAll();
         $data['user'] = auth()->user()->id;
 
@@ -92,19 +92,19 @@ class StoreController extends Controller
 
         try {
             $transactionGroup = $this->groupRepository->store($data);
-        } catch (DuplicateTransactionException $e) {
+        } catch (DuplicateTransactionException $e) { // @phpstan-ignore-line
             app('log')->warning('Caught a duplicate transaction. Return error message.');
             $validator = Validator::make(
                 ['transactions' => [['description' => $e->getMessage()]]],
                 ['transactions.0.description' => new IsDuplicateTransaction()]
             );
-            throw new ValidationException($validator, 0, $e);
-        } catch (FireflyException $e) {
+            throw new ValidationException($validator); // @phpstan-ignore-line
+        } catch (FireflyException $e) { // @phpstan-ignore-line
             app('log')->warning('Caught an exception. Return error message.');
-            Log::error($e->getMessage());
+            app('log')->error($e->getMessage());
             $message   = sprintf('Internal exception: %s', $e->getMessage());
             $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);
-            throw new ValidationException($validator, 0, $e);
+            throw new ValidationException($validator); // @phpstan-ignore-line
         }
         app('preferences')->mark();
         $applyRules   = $data['apply_rules'] ?? true;

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

@@ -32,7 +32,6 @@ use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -77,8 +76,9 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
     {
-        Log::debug('Now in update routine for transaction group!');
+        app('log')->debug('Now in update routine for transaction group!');
         $data = $request->getAll();
+
         $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
         $manager          = $this->getManager();
 

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

@@ -27,8 +27,8 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Validator;

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

@@ -38,7 +38,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
@@ -65,26 +64,6 @@ class ListController extends Controller
     use AccountFilter;
     use TransactionFilter;
 
-    private CurrencyRepositoryInterface $repository;
-
-    /**
-     * CurrencyRepository constructor.
-     *
-
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
-
-                return $next($request);
-            }
-        );
-    }
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listAccountByCurrency
@@ -106,7 +85,7 @@ class ListController extends Controller
 
         // types to get, page size:
         $types    = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of accounts. Count it and split it.
         /** @var AccountRepositoryInterface $accountRepository */
@@ -153,7 +132,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of available budgets. Count it and split it.
         /** @var AvailableBudgetRepositoryInterface $abRepository */
@@ -193,7 +172,7 @@ class ListController extends Controller
 
         /** @var BillRepositoryInterface $billRepos */
         $billRepos  = app(BillRepositoryInterface::class);
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $unfiltered = $billRepos->getBills();
 
         // filter and paginate list:
@@ -236,7 +215,7 @@ class ListController extends Controller
         $blRepository = app(BudgetLimitRepositoryInterface::class);
 
         $manager      = $this->getManager();
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $collection   = $blRepository->getAllBudgetLimitsByCurrency($currency, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -268,7 +247,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         /** @var RecurringRepositoryInterface $recurringRepos */
@@ -276,8 +255,8 @@ class ListController extends Controller
         $unfiltered     = $recurringRepos->getAll();
 
         // filter selection
-        $collection = $unfiltered->filter(
-            static function (Recurrence $recurrence) use ($currency) {
+        $collection = $unfiltered->filter(/** @phpstan-ignore-line */
+            static function (Recurrence $recurrence) use ($currency) {  // @phpstan-ignore-line
                 /** @var RecurrenceTransaction $transaction */
                 foreach ($recurrence->recurrenceTransactions as $transaction) {
                     if ($transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id) {
@@ -319,15 +298,15 @@ class ListController extends Controller
     public function rules(TransactionCurrency $currency): JsonResponse
     {
         $manager  = $this->getManager();
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         /** @var RuleRepositoryInterface $ruleRepos */
         $ruleRepos  = app(RuleRepositoryInterface::class);
         $unfiltered = $ruleRepos->getAll();
 
-        $collection = $unfiltered->filter(
-            static function (Rule $rule) use ($currency) {
+        $collection = $unfiltered->filter(/** @phpstan-ignore-line */
+            static function (Rule $rule) use ($currency) { // @phpstan-ignore-line
                 /** @var RuleTrigger $trigger */
                 foreach ($rule->ruleTriggers as $trigger) {
                     if ('currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value) {
@@ -371,7 +350,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, TransactionCurrency $currency): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -396,8 +375,11 @@ class ListController extends Controller
             ->setPage($this->parameters->get('page'))
             // set types of transactions to return.
             ->setTypes($types);
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.currencies.transactions', [$currency->code]) . $this->buildParams());

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

@@ -27,10 +27,11 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use JsonException;
@@ -78,16 +79,15 @@ class ShowController extends Controller
      */
     public function index(): JsonResponse
     {
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAll();
         $count      = $collection->count();
+
         // slice them:
         $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator  = new LengthAwarePaginator($currencies, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
         $manager = $this->getManager();
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -113,10 +113,15 @@ class ShowController extends Controller
      */
     public function show(TransactionCurrency $currency): JsonResponse
     {
+        /** @var User $user */
+        $user            = auth()->user();
         $manager         = $this->getManager();
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
+        // update fields with user info.
+        $currency->refreshForUser($user);
+
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -138,9 +143,13 @@ class ShowController extends Controller
      */
     public function showDefault(): JsonResponse
     {
+        /** @var User $user */
+        $user     = auth()->user();
         $manager  = $this->getManager();
-        $currency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $currency);
+        $currency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+
+        // update fields with user info.
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);

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

@@ -27,10 +27,11 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use JsonException;
 use League\Fractal\Resource\Item;
@@ -79,12 +80,14 @@ class StoreController extends Controller
     {
         $currency = $this->repository->store($request->getAll());
         if (true === $request->boolean('default')) {
-            app('preferences')->set('currencyPreference', $currency->code);
+            $this->repository->makeDefault($currency);
             app('preferences')->mark();
         }
         $manager = $this->getManager();
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        /** @var User $user */
+        $user = auth()->user();
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);

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

@@ -28,10 +28,11 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use JsonException;
 use League\Fractal\Resource\Item;
@@ -82,11 +83,16 @@ class UpdateController extends Controller
         if ($this->repository->currencyInUse($currency)) {
             return response()->json([], 409);
         }
+        // must not be the only one in use:
+        if (1 === $this->repository->get()->count()) {
+            return response()->json([], 409);
+        }
+        /** @var User $user */
+        $user = auth()->user();
         $this->repository->disable($currency);
         $manager = $this->getManager();
 
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -110,14 +116,15 @@ class UpdateController extends Controller
      */
     public function makeDefault(TransactionCurrency $currency): JsonResponse
     {
+        /** @var User $user */
+        $user = auth()->user();
         $this->repository->enable($currency);
+        $this->repository->makeDefault($currency);
 
-        app('preferences')->set('currencyPreference', $currency->code);
         app('preferences')->mark();
 
         $manager = $this->getManager();
-
-        $this->parameters->set('defaultCurrency', $currency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -144,9 +151,10 @@ class UpdateController extends Controller
     {
         $this->repository->enable($currency);
         $manager = $this->getManager();
+        /** @var User $user */
+        $user = auth()->user();
 
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -173,17 +181,22 @@ class UpdateController extends Controller
     public function update(UpdateRequest $request, TransactionCurrency $currency): JsonResponse
     {
         $data = $request->getAll();
+
+        /** @var User $user */
+        $user = auth()->user();
+
+        // safety catch on currency disablement.
+        $set = $this->repository->get();
+        if (array_key_exists('enabled', $data) && false === $data['enabled'] && 1 === count($set) && $set->first()->id === $currency->id) {
+            return response()->json([], 409);
+
+        }
         $currency = $this->repository->update($currency, $data);
 
-        if (true === $request->boolean('default')) {
-            app('preferences')->set('currencyPreference', $currency->code);
         app('preferences')->mark();
-        }
 
         $manager = $this->getManager();
-
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);

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

@@ -85,7 +85,7 @@ class ShowController extends Controller
         $name = $request->get('name');
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $linkType = $this->repository->findByName($name);
 
         // get list of transaction links. Count it and split it.

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

@@ -78,7 +78,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, LinkType $linkType): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -106,8 +106,11 @@ class ListController extends Controller
             ->setPage($this->parameters->get('page'))
             // set types of transactions to return.
             ->setTypes($types);
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());

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

@@ -78,7 +78,7 @@ class ShowController extends Controller
     {
         // create some objects:
         $manager  = $this->getManager();
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of accounts. Count it and split it.
         $collection = $this->repository->get();

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

@@ -32,7 +32,6 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 
@@ -67,7 +66,7 @@ class AccountController extends Controller
      */
     public function search(Request $request): JsonResponse | Response
     {
-        Log::debug('Now in account search()');
+        app('log')->debug('Now in account search()');
         $manager = $this->getManager();
         $query   = trim((string)$request->get('query'));
         $field   = trim((string)$request->get('field'));

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

@@ -53,8 +53,7 @@ class TransactionController extends Controller
         $manager   = $this->getManager();
         $fullQuery = (string)$request->get('query');
         $page      = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
-        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $pageSize  = 0 === (int)$request->get('limit') ? $pageSize : (int)$request->get('limit');
+        $pageSize  = $this->parameters->get('limit');
         $searcher->parseQuery($fullQuery);
         $searcher->setPage($page);
         $searcher->setLimit($pageSize);

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

@@ -32,14 +32,13 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -107,8 +106,8 @@ class BasicController extends Controller
         $balanceData  = $this->getBalanceInformation($start, $end);
         $billData     = $this->getBillInformation($start, $end);
         $spentData    = $this->getLeftToSpendInfo($start, $end);
-        $networthData = $this->getNetWorthInfo($start, $end);
-        $total        = array_merge($balanceData, $billData, $spentData, $networthData);
+        $netWorthData = $this->getNetWorthInfo($start, $end);
+        $total        = array_merge($balanceData, $billData, $spentData, $netWorthData);
 
         // give new keys
         $return = [];
@@ -190,7 +189,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('balance-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_balance_in_currency', ['currency' => $currency->symbol]),
                 'monetary_value'          => $sums[$currencyId] ?? '0',
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -203,7 +202,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('spent-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
                 'monetary_value'          => $expenses[$currencyId] ?? '0',
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -215,7 +214,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('earned-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
                 'monetary_value'          => $incomes[$currencyId] ?? '0',
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -236,6 +235,7 @@ class BasicController extends Controller
      */
     private function getBillInformation(Carbon $start, Carbon $end): array
     {
+        app('log')->debug(sprintf('Now in getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
         /*
          * Since both this method and the chart use the exact same data, we can suffice
          * with calling the one method in the bill repository that will get this amount.
@@ -253,7 +253,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('bills-paid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $info['symbol']]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $info['id'],
+                'currency_id'             => (string)$info['id'],
                 'currency_code'           => $info['code'],
                 'currency_symbol'         => $info['symbol'],
                 'currency_decimal_places' => $info['decimal_places'],
@@ -272,7 +272,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('bills-unpaid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $info['symbol']]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $info['id'],
+                'currency_id'             => (string)$info['id'],
                 'currency_code'           => $info['code'],
                 'currency_symbol'         => $info['symbol'],
                 'currency_decimal_places' => $info['decimal_places'],
@@ -281,7 +281,7 @@ class BasicController extends Controller
                 'sub_title'               => '',
             ];
         }
-
+        app('log')->debug(sprintf('Done with getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
         return $return;
     }
 
@@ -302,7 +302,7 @@ class BasicController extends Controller
 
         foreach ($spent as $row) {
             // either an amount was budgeted or 0 is available.
-            $amount          = $available[$row['currency_id']] ?? '0';
+            $amount          = (string)($available[$row['currency_id']] ?? '0');
             $spentInCurrency = $row['sum'];
             $leftToSpend     = bcadd($amount, $spentInCurrency);
 
@@ -316,23 +316,18 @@ class BasicController extends Controller
                 'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
                 'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
                 'monetary_value'          => $leftToSpend,
-                'currency_id'             => $row['currency_id'],
+                'currency_id'             => (string)$row['currency_id'],
                 'currency_code'           => $row['currency_code'],
                 'currency_symbol'         => $row['currency_symbol'],
                 'currency_decimal_places' => $row['currency_decimal_places'],
                 'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $leftToSpend, false),
                 'local_icon'              => 'money',
-                'sub_title'               => (string)trans(
-                    'firefly.box_spend_per_day',
-                    [
-                        'amount' => app('amount')->formatFlat(
+                'sub_title'               => app('amount')->formatFlat(
                     $row['currency_symbol'],
                     $row['currency_decimal_places'],
                     $perDay,
                     false
                 ),
-                    ]
-                ),
             ];
         }
 
@@ -372,30 +367,30 @@ class BasicController extends Controller
             }
         );
 
-        $netWorthSet = $netWorthHelper->getNetWorthByCurrency($filtered, $date);
+        $netWorthSet = $netWorthHelper->byAccounts($filtered, $date);
         $return      = [];
-        foreach ($netWorthSet as $data) {
-            /** @var TransactionCurrency $currency */
-            $currency = $data['currency'];
+        foreach ($netWorthSet as $key => $data) {
+            if ('native' === $key) {
+                continue;
+            }
             $amount = $data['balance'];
             if (0 === bccomp($amount, '0')) {
                 continue;
             }
             // return stuff
             $return[] = [
-                'key'                     => sprintf('net-worth-in-%s', $currency->code),
-                'title'                   => trans('firefly.box_net_worth_in_currency', ['currency' => $currency->symbol]),
+                'key'                     => sprintf('net-worth-in-%s', $data['currency_code']),
+                'title'                   => trans('firefly.box_net_worth_in_currency', ['currency' => $data['currency_symbol']]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatAnything($currency, $data['balance'], false),
+                'currency_id'             => (string)$data['currency_id'],
+                'currency_code'           => $data['currency_code'],
+                'currency_symbol'         => $data['currency_symbol'],
+                'currency_decimal_places' => $data['currency_decimal_places'],
+                'value_parsed'            => app('amount')->formatFlat($data['currency_symbol'], $data['currency_decimal_places'], $data['balance'], false),
                 'local_icon'              => 'line-chart',
                 'sub_title'               => '',
             ];
         }
-
         return $return;
     }
 

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

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Binder\EitherConfigKey;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Validator;
@@ -70,8 +69,8 @@ class ConfigurationController extends Controller
         try {
             $dynamicData = $this->getDynamicConfiguration();
         } catch (FireflyException $e) {
-            Log::error($e->getMessage());
-            Log::error($e->getTraceAsString());
+            app('log')->error($e->getMessage());
+            app('log')->error($e->getTraceAsString());
             throw new FireflyException('200030: Could not load config variables.', 0, $e);
         }
         $staticData = $this->getStaticConfiguration();

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

@@ -27,7 +27,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\System\CronRequest;
 use FireflyIII\Support\Http\Controllers\CronRunner;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -43,22 +42,21 @@ class CronController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/about/getCron
      *
      * @param CronRequest $request
-     * @param string      $token
      *
      * @return JsonResponse
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public function cron(CronRequest $request, string $token): JsonResponse
+    public function cron(CronRequest $request): JsonResponse
     {
         $config = $request->getAll();
 
-        Log::debug(sprintf('Now in %s', __METHOD__));
-        Log::debug(sprintf('Date is %s', $config['date']->toIsoString()));
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        app('log')->debug(sprintf('Date is %s', $config['date']->toIsoString()));
         $return                           = [];
         $return['recurring_transactions'] = $this->runRecurring($config['force'], $config['date']);
         $return['auto_budgets']           = $this->runAutoBudget($config['force'], $config['date']);
-        if (true === config('cer.enabled')) {
+        if (true === config('cer.download_enabled')) {
             $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']);
         }
         $return['bill_warnings'] = $this->billWarningCronJob($config['force'], $config['date']);

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

@@ -33,7 +33,6 @@ use FireflyIII\Transformers\UserTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 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;
@@ -101,7 +100,7 @@ class UserController extends Controller
     public function index(): JsonResponse
     {
         // user preferences
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $manager  = $this->getManager();
 
         // build collection
@@ -192,7 +191,7 @@ class UserController extends Controller
 
         // can only update 'blocked' when user is admin.
         if (!$this->repository->hasRole(auth()->user(), 'owner')) {
-            Log::debug('Quietly drop fields "blocked" and "blocked_code" from request.');
+            app('log')->debug('Quietly drop fields "blocked" and "blocked_code" from request.');
             unset($data['blocked'], $data['blocked_code']);
         }
 

app/Api/V1/Controllers/User/PreferencesController.php

@@ -41,8 +41,8 @@ use League\Fractal\Resource\Item;
  */
 class PreferencesController extends Controller
 {
-    public const DATE_FORMAT  = 'Y-m-d';
-    public const RESOURCE_KEY = 'preferences';
+    public const string DATE_FORMAT  = 'Y-m-d';
+    public const string RESOURCE_KEY = 'preferences';
 
     /**
      * This endpoint is documented at:
@@ -58,7 +58,7 @@ class PreferencesController extends Controller
         $collection  = app('preferences')->all();
         $manager     = $this->getManager();
         $count       = $collection->count();
-        $pageSize    = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize    = $this->parameters->get('limit');
         $preferences = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // make paginator:

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

@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
  */
 class AttemptController extends Controller
 {
-    public const RESOURCE_KEY = 'webhook_attempts';
+    public const string RESOURCE_KEY = 'webhook_attempts';
     private WebhookRepositoryInterface $repository;
 
     /**
@@ -76,7 +76,7 @@ class AttemptController extends Controller
         }
 
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttempts($message);
         $count      = $collection->count();
         $attempts   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

@@ -40,7 +40,7 @@ use League\Fractal\Resource\Item;
  */
 class MessageController extends Controller
 {
-    public const RESOURCE_KEY = 'webhook_messages';
+    public const string RESOURCE_KEY = 'webhook_messages';
     private WebhookRepositoryInterface $repository;
 
     /**
@@ -70,7 +70,7 @@ class MessageController extends Controller
     public function index(Webhook $webhook): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getMessages($webhook);
 
         $count    = $collection->count();

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

@@ -43,7 +43,7 @@ use League\Fractal\Resource\Item;
  */
 class ShowController extends Controller
 {
-    public const RESOURCE_KEY = 'webhooks';
+    public const string RESOURCE_KEY = 'webhooks';
     private WebhookRepositoryInterface $repository;
 
     /**
@@ -74,7 +74,7 @@ class ShowController extends Controller
     {
         $manager    = $this->getManager();
         $collection = $this->repository->all();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $count      = $collection->count();
         $webhooks   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 

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

@@ -35,7 +35,7 @@ use League\Fractal\Resource\Item;
  */
 class StoreController extends Controller
 {
-    public const RESOURCE_KEY = 'webhooks';
+    public const string RESOURCE_KEY = 'webhooks';
     private WebhookRepositoryInterface $repository;
 
     /**

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AutocompleteRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array
@@ -46,8 +46,6 @@ class AutocompleteRequest extends FormRequest
         if ('' !== $types) {
             $array = explode(',', $types);
         }
-        $limit = $this->convertInteger('limit');
-        $limit = 0 === $limit ? 10 : $limit;
 
         // remove 'initial balance' from allowed types. its internal
         $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
@@ -56,7 +54,6 @@ class AutocompleteRequest extends FormRequest
             'types' => $array,
             'query' => $this->convertString('query'),
             'date'  => $this->getCarbonDate('date'),
-            'limit' => $limit,
         ];
     }
 
@@ -66,7 +63,6 @@ class AutocompleteRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'limit' => 'min:0|max:1337',
         ];
     }
 }

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

@@ -30,7 +30,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\Api\Data\Bulk\ValidatesBulkTransactionQuery;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
 use JsonException;
 
@@ -55,7 +54,7 @@ class TransactionRequest extends FormRequest
             ];
         } catch (JsonException $e) {
             // dont really care. the validation should catch invalid json.
-            Log::error($e->getMessage());
+            app('log')->error($e->getMessage());
         }
 
         return $data;