Merge branch 'release/v6.0.0'

Final 60

.ci/.env.ci

@@ -60,7 +60,7 @@ APP_LOG_LEVEL=info
 # Use "pgsql" for PostgreSQL
 # Use "mysql" for MySQL and MariaDB.
 # Use "sqlite" for SQLite.
-DB_CONNECTION=sqlite_test
+DB_CONNECTION=sqlite
 
 # MySQL supports SSL. You can configure it here.
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
@@ -127,7 +127,6 @@ MAIL_ENCRYPTION=null
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=
 
-
 # If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
 # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 MAILGUN_ENDPOINT=api.mailgun.net
@@ -136,7 +135,6 @@ MAILGUN_ENDPOINT=api.mailgun.net
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
-
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
@@ -223,7 +221,6 @@ ADLDAP_ADMIN_PASSWORD=
 ADLDAP_ACCOUNT_PREFIX=
 ADLDAP_ACCOUNT_SUFFIX=
 
-
 # LDAP authentication settings.
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false

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

@@ -379,16 +379,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.14.3",
+            "version": "v3.14.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "b418036b95b4936a33fe906245d3044395935e73"
+                "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b418036b95b4936a33fe906245d3044395935e73",
-                "reference": "b418036b95b4936a33fe906245d3044395935e73",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/1b3d9dba63d93b8a202c31e824748218781eae6b",
+                "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b",
                 "shasum": ""
             },
             "require": {
@@ -399,7 +399,7 @@
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "php": "^7.4 || ^8.0",
-                "sebastian/diff": "^4.0",
+                "sebastian/diff": "^4.0 || ^5.0",
                 "symfony/console": "^5.4 || ^6.0",
                 "symfony/event-dispatcher": "^5.4 || ^6.0",
                 "symfony/filesystem": "^5.4 || ^6.0",
@@ -457,7 +457,7 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.3"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.4"
             },
             "funding": [
                 {
@@ -465,7 +465,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-30T00:24:29+00:00"
+            "time": "2023-02-09T21:49:13+00:00"
         },
         {
             "name": "psr/cache",
@@ -671,29 +671,29 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f",
+                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
+                "phpunit/phpunit": "^10.0",
                 "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -725,7 +725,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0"
             },
             "funding": [
                 {
@@ -733,20 +733,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2023-02-03T07:00:31+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "3e294254f2191762c1d137aed4b94e966965e985"
+                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/3e294254f2191762c1d137aed4b94e966965e985",
-                "reference": "3e294254f2191762c1d137aed4b94e966965e985",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
+                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
                 "shasum": ""
             },
             "require": {
@@ -813,7 +813,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.2.5"
+                "source": "https://github.com/symfony/console/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -829,20 +829,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:38:09+00:00"
+            "time": "2023-02-25T17:00:03+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
+                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
-                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
+                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
                 "shasum": ""
             },
             "require": {
@@ -880,7 +880,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.2.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
             },
             "funding": [
                 {
@@ -896,20 +896,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-25T10:21:52+00:00"
+            "time": "2023-03-01T10:25:55+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68"
+                "reference": "404b307de426c1c488e5afad64403e5f145e82a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
-                "reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/404b307de426c1c488e5afad64403e5f145e82a5",
+                "reference": "404b307de426c1c488e5afad64403e5f145e82a5",
                 "shasum": ""
             },
             "require": {
@@ -963,7 +963,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.5"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -979,20 +979,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:38:09+00:00"
+            "time": "2023-02-14T08:44:56+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "0782b0b52a737a05b4383d0df35a474303cabdae"
+                "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae",
-                "reference": "0782b0b52a737a05b4383d0df35a474303cabdae",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
+                "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
                 "shasum": ""
             },
             "require": {
@@ -1042,7 +1042,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1"
             },
             "funding": [
                 {
@@ -1058,20 +1058,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-25T10:21:52+00:00"
+            "time": "2023-03-01T10:32:47+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593"
+                "reference": "82b6c62b959f642d000456f08c6d219d749215b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e59e8a4006afd7f5654786a83b4fcb8da98f4593",
-                "reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/82b6c62b959f642d000456f08c6d219d749215b3",
+                "reference": "82b6c62b959f642d000456f08c6d219d749215b3",
                 "shasum": ""
             },
             "require": {
@@ -1105,7 +1105,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.2.5"
+                "source": "https://github.com/symfony/filesystem/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -1121,20 +1121,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-20T17:45:48+00:00"
+            "time": "2023-02-14T08:44:56+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c"
+                "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/c90dc446976a612e3312a97a6ec0069ab0c2099c",
-                "reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb",
+                "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb",
                 "shasum": ""
             },
             "require": {
@@ -1169,7 +1169,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.2.5"
+                "source": "https://github.com/symfony/finder/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -1185,20 +1185,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-20T17:45:48+00:00"
+            "time": "2023-02-16T09:57:23+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "e8324d44f5af99ec2ccec849934a242f64458f86"
+                "reference": "aa0e85b53bbb2b4951960efd61d295907eacd629"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/e8324d44f5af99ec2ccec849934a242f64458f86",
-                "reference": "e8324d44f5af99ec2ccec849934a242f64458f86",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/aa0e85b53bbb2b4951960efd61d295907eacd629",
+                "reference": "aa0e85b53bbb2b4951960efd61d295907eacd629",
                 "shasum": ""
             },
             "require": {
@@ -1236,7 +1236,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.2.5"
+                "source": "https://github.com/symfony/options-resolver/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -1252,7 +1252,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:38:09+00:00"
+            "time": "2023-02-14T08:44:56+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1748,16 +1748,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7"
+                "reference": "680e8a2ea6b3f87aecc07a6a65a203ae573d1902"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
-                "reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
+                "url": "https://api.github.com/repos/symfony/process/zipball/680e8a2ea6b3f87aecc07a6a65a203ae573d1902",
+                "reference": "680e8a2ea6b3f87aecc07a6a65a203ae573d1902",
                 "shasum": ""
             },
             "require": {
@@ -1789,7 +1789,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.2.5"
+                "source": "https://github.com/symfony/process/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -1805,20 +1805,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:38:09+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75"
+                "reference": "a8c9cedf55f314f3a186041d19537303766df09a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aac98028c69df04ee77eb69b96b86ee51fbf4b75",
-                "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a8c9cedf55f314f3a186041d19537303766df09a",
+                "reference": "a8c9cedf55f314f3a186041d19537303766df09a",
                 "shasum": ""
             },
             "require": {
@@ -1874,7 +1874,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.2.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.2.1"
             },
             "funding": [
                 {
@@ -1890,20 +1890,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-25T10:21:52+00:00"
+            "time": "2023-03-01T10:32:47+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "00b6ac156aacffc53487c930e0ab14587a6607f6"
+                "reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/00b6ac156aacffc53487c930e0ab14587a6607f6",
-                "reference": "00b6ac156aacffc53487c930e0ab14587a6607f6",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
+                "reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
                 "shasum": ""
             },
             "require": {
@@ -1936,7 +1936,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.2.5"
+                "source": "https://github.com/symfony/stopwatch/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -1952,20 +1952,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:55+00:00"
+            "time": "2023-02-14T08:44:56+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.2.5",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0"
+                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
-                "reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
+                "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d",
+                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d",
                 "shasum": ""
             },
             "require": {
@@ -2022,7 +2022,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.2.5"
+                "source": "https://github.com/symfony/string/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -2038,7 +2038,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:38:09+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
         }
     ],
     "packages-dev": [],

.ci/phpstan.sh

@@ -31,3 +31,5 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # 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
+
+echo 'The PHPstan report can be found in phpstan-report.txt'

.ci/phpunit.sh

@@ -19,15 +19,43 @@
 # 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 .ci/.env.ci ../.env
+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
-# TODO no longer exists
-wget --quiet https://raw.githubusercontent.com/firefly-iii/test-data/main/test_db.sqlite -o storage/database/test_db.sqlite
+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
-./vendor/bin/phpunit --configuration phpunit.coverage.xml
+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
 
-exit 0
+# restore .env file
+mv $SCRIPT_DIR/../.env.backup $SCRIPT_DIR/../.env

.github/mergify.yml

@@ -1,3 +1,4 @@
+---
 pull_request_rules:
   - name: Close all on main
     conditions:
@@ -5,52 +6,58 @@ pull_request_rules:
       - -author~=^dependabot(|-preview)\[bot\]$
     actions:
       close:
-        message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!
+        message: Please do not open PR's on the `main` branch, but on the `develop`
+          branch only. Thank you!
   - name: No translations
     conditions:
+      - -author~=^dependabot(|-preview)\[bot\]$
+      - base=develop
       - or:
-          - -files=^resources/lang/bg_BG
-          - -files=^resources/lang/ca_ES
-          - -files=^resources/lang/cs_CZ
-          - -files=^resources/lang/da_DK
-          - -files=^resources/lang/de_DE
-          - -files=^resources/lang/el_GR
-          - -files=^resources/lang/en_GB
-          - -files=^resources/lang/es_ES
-          - -files=^resources/lang/et_EE
-          - -files=^resources/lang/fa_IR
-          - -files=^resources/lang/fi_FI
-          - -files=^resources/lang/fr_FR
-          - -files=^resources/lang/he_IL
-          - -files=^resources/lang/hu_HU
-          - -files=^resources/lang/id_ID
-          - -files=^resources/lang/is_IS
-          - -files=^resources/lang/it_IT
-          - -files=^resources/lang/ja_JP
-          - -files=^resources/lang/ko_KR
-          - -files=^resources/lang/lt_LT
-          - -files=^resources/lang/nb_NO
-          - -files=^resources/lang/nl_NL
-          - -files=^resources/lang/pl_PL
-          - -files=^resources/lang/pt_BR
-          - -files=^resources/lang/pt_PT
-          - -files=^resources/lang/ro_RO
-          - -files=^resources/lang/ru_RU
-          - -files=^resources/lang/si_LK
-          - -files=^resources/lang/sk_SK
-          - -files=^resources/lang/sl_SI
-          - -files=^resources/lang/sr_CS
-          - -files=^resources/lang/sv_SE
-          - -files=^resources/lang/th_TH
-          - -files=^resources/lang/tlh_AA
-          - -files=^resources/lang/tr_TR
-          - -files=^resources/lang/uk_UA
-          - -files=^resources/lang/vi_VN
-          - -files=^resources/lang/zh_CN
-          - -files=^resources/lang/zh_TW
+          - files~=^resources/lang/bg_BG
+          - files~=^resources/lang/ca_ES
+          - files~=^resources/lang/cs_CZ
+          - files~=^resources/lang/da_DK
+          - files~=^resources/lang/de_DE
+          - files~=^resources/lang/el_GR
+          - files~=^resources/lang/en_GB
+          - files~=^resources/lang/es_ES
+          - files~=^resources/lang/et_EE
+          - files~=^resources/lang/fa_IR
+          - files~=^resources/lang/fi_FI
+          - files~=^resources/lang/fr_FR
+          - files~=^resources/lang/he_IL
+          - files~=^resources/lang/hu_HU
+          - files~=^resources/lang/id_ID
+          - files~=^resources/lang/is_IS
+          - files~=^resources/lang/it_IT
+          - files~=^resources/lang/ja_JP
+          - files~=^resources/lang/ko_KR
+          - files~=^resources/lang/lt_LT
+          - files~=^resources/lang/nb_NO
+          - files~=^resources/lang/nl_NL
+          - files~=^resources/lang/pl_PL
+          - files~=^resources/lang/pt_BR
+          - files~=^resources/lang/pt_PT
+          - files~=^resources/lang/ro_RO
+          - files~=^resources/lang/ru_RU
+          - files~=^resources/lang/si_LK
+          - files~=^resources/lang/sk_SK
+          - files~=^resources/lang/sl_SI
+          - files~=^resources/lang/sr_CS
+          - files~=^resources/lang/sv_SE
+          - files~=^resources/lang/th_TH
+          - files~=^resources/lang/tlh_AA
+          - files~=^resources/lang/tr_TR
+          - files~=^resources/lang/uk_UA
+          - files~=^resources/lang/vi_VN
+          - files~=^resources/lang/zh_CN
+          - files~=^resources/lang/zh_TW
     actions:
       comment:
-        message: | 
-          Please do not submit translated strings in your PR. If you need new sentences to be translated, add them to the `en_US` language strings. New or changed translations for other languages can be submitted at https://crowdin.com/project/firefly-iii
-          
+        message: >
+          Please do not submit translated strings in your PR. If you need new
+          sentences to be translated, add them to the `en_US` language strings.
+          New or changed translations for other languages can be submitted at
+          https://crowdin.com/project/firefly-iii
+
           Thank you!

.github/workflows/build.yml

@@ -1,18 +1,12 @@
 name: Sonarcloud CI
 on:
-  push:
-    branches:
-      - main
-      - develop
-      - 5.8-dev
-  pull_request:
-    types: [opened, synchronize, reopened]
+  workflow_dispatch:
 jobs:
   sonarcloud:
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: SonarCloud Scan

.github/workflows/cleanup.yml

@@ -12,18 +12,18 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Prune cancelled/skipped runs
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
           script: |
-            const cancelled = await github.actions.listWorkflowRunsForRepo({
+            const cancelled = await github.rest.actions.listWorkflowRunsForRepo({
               owner: context.repo.owner,
               per_page: 100,
               repo: context.repo.repo,
               status: 'cancelled',
             });
             
-            const skipped = await github.actions.listWorkflowRunsForRepo({
+            const skipped = await github.rest.actions.listWorkflowRunsForRepo({
               owner: context.repo.owner,
               per_page: 100,
               repo: context.repo.repo,
@@ -33,7 +33,7 @@ jobs:
             for (const response of [cancelled, skipped]) {
               for (const run of response.data.workflow_runs) {
                 console.log(`Run id ${run.id} of '${run.name}' is a cancelled/skipped run. Deleting...`);
-                await github.actions.deleteWorkflowRun({
+                await github.rest.actions.deleteWorkflowRun({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   run_id: run.id
@@ -42,7 +42,7 @@ jobs:
             }
 
       - name: Prune runs older than 3 days
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
           script: |
@@ -67,7 +67,7 @@ jobs:
             
             for (const workflow of workflows) {
               for (let page = 0; page < pages; page += 1) {
-                let response = await github.actions.listWorkflowRuns({
+                let response = await github.rest.actions.listWorkflowRuns({
                   owner: context.repo.owner,
                   page: page,
                   per_page: 100,
@@ -88,7 +88,7 @@ jobs:
             for (const run of runs_to_delete) {
               console.log(`Run id ${run[0]} of '${run[1]}' is older than ${days_to_expiration} days. Deleting...`);
               try {
-                await github.actions.deleteWorkflowRun({
+                await github.rest.actions.deleteWorkflowRun({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   run_id: run[0]

.github/workflows/closed-issues.yml

@@ -1,21 +1,21 @@
 name: "Reply to closed issue"
-on: 
-  issues: 
-    types: 
+on:
+  issues:
+    types:
       - closed
-jobs: 
-  auto_comment: 
+jobs:
+  auto_comment:
     runs-on: ubuntu-latest
-    steps: 
-      - 
+    steps:
+      -
         uses: aws-actions/closed-issue-message@v1
-        with: 
+        with:
           message: |
               Hi there! This is an automatic reply. `Share and enjoy`
               
               This issue is now closed. Please be aware that closed issues are not actively monitored. If you reply, you may get no response.
                        
-              - If the original bug is not actually fixed, please feel free to open a new ticket. Please refer to this issue for clarity.
+              - If the original bug is not actually fixed, please feel free to open a new issue. Please refer to this issue for clarity.
               - Follow-up questions can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
               
               Thank you for your consideration.

.github/workflows/depsreview.yaml

@@ -11,4 +11,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v3
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v1
+        uses: actions/dependency-review-action@v3

.github/workflows/laravel.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Copy .env
         run: test -f .env || cp .ci/.env.ci .env
       - name: Prepare dependencies
@@ -51,7 +51,7 @@ jobs:
       - prepare
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Copy .env
         run: test -f .env || cp .ci/.env.ci .env
       - name: Download database
@@ -86,7 +86,7 @@ jobs:
       - prepare
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Copy .env
         run: test -f .env || cp .ci/.env.ci .env
       - name: Download database
@@ -120,7 +120,7 @@ jobs:
       - prepare
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Copy .env
         run: test -f .env || cp .ci/.env.ci .env
       - name: Download database

.github/workflows/lock.yml

@@ -15,7 +15,16 @@ jobs:
       pull-requests: write  # for dessant/lock-threads to lock PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@v4
         with:
           github-token: ${{ github.token }}
           issue-lock-inactive-days: '90'
+          issue-comment: >
+            Hi there! This is an automatic reply. `Share and enjoy`
+
+            This issue is now `locked` :lock:. 
+
+            - If you feel there is more to be said about this specific issue, please feel free to open a new issue. Please refer to this issue for clarity. 
+            - Follow-up questions and comments can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
+
+            Thank you for your consideration.

.github/workflows/qodana.yml

@@ -0,0 +1,37 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+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/stale.yml

@@ -18,13 +18,17 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: >
-            This issue has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions.
+            Hi there! This is an automatic reply. `Share and enjoy`
+
+            This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. 
+            
+            Thank you for your contributions.
           stale-pr-message: >
-            This issue has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions.
+            Hi there! This is an automatic reply. `Share and enjoy`
+
+            This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. 
+
+            Thank you for your contributions.
           days-before-stale: 14
           days-before-close: 7
           exempt-issue-labels: 'enhancement,feature,bug,announcement,layout-v3'

.gitignore

@@ -7,3 +7,4 @@ npm-debug.log
 yarn-error.log
 .env
 /.ci/php-cs-fixer/vendor
+/.ci/coverage

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

@@ -65,7 +65,7 @@ class AccountController extends Controller
 
     /**
      * Documentation for this endpoint:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getAccountsAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -57,7 +57,7 @@ class BillController extends Controller
 
     /**
      * Documentation for this endpoint is at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getBillsAC
+     * 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
@@ -71,9 +71,9 @@ class BillController extends Controller
         $filtered = $result->map(
             static function (Bill $item) {
                 return [
-                    'id'   => (string)$item->id,
-                    'name' => $item->name,
-                    'active' => $item->active
+                    'id'     => (string)$item->id,
+                    'name'   => $item->name,
+                    'active' => $item->active,
                 ];
             }
         );

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

@@ -57,7 +57,7 @@ class BudgetController extends Controller
 
     /**
      * Documentation for this endpoint is at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getBudgetsAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBudgetsAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -57,7 +57,7 @@ class CategoryController extends Controller
 
     /**
      * Documentation for this endpoint is at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getCategoriesAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCategoriesAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -57,7 +57,7 @@ class CurrencyController extends Controller
 
     /**
      * Documentation for this endpoint is at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesAC
      *
      * @param  AutocompleteRequest  $request
      *
@@ -85,7 +85,7 @@ class CurrencyController extends Controller
 
     /**
      * Documentation for this endpoint is at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesCodeAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -57,7 +57,7 @@ class ObjectGroupController extends Controller
 
     /**
      * Documentation for this endpoint is at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getObjectGroupsAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -61,7 +61,7 @@ class PiggyBankController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesAC
      *
      * @param  AutocompleteRequest  $request
      *
@@ -76,15 +76,18 @@ class PiggyBankController extends Controller
 
         /** @var PiggyBank $piggy */
         foreach ($piggies as $piggy) {
-            $currency   = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
-            $response[] = [
+            $currency    = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $objectGroup = $piggy->objectGroups()->first();
+            $response[]  = [
                 'id'                      => (string)$piggy->id,
                 'name'                    => $piggy->name,
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
+                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_title'      => $objectGroup?->title,
             ];
         }
 
@@ -93,7 +96,7 @@ class PiggyBankController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesBalanceAC
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesBalanceAC
      *
      * @param  AutocompleteRequest  $request
      *
@@ -109,6 +112,7 @@ class PiggyBankController extends Controller
         foreach ($piggies as $piggy) {
             $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
             $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
+            $objectGroup   = $piggy->objectGroups()->first();
             $response[]    = [
                 'id'                      => (string)$piggy->id,
                 'name'                    => $piggy->name,
@@ -118,11 +122,13 @@ class PiggyBankController extends Controller
                     app('amount')->formatAnything($currency, $currentAmount, false),
                     app('amount')->formatAnything($currency, $piggy->targetamount, false),
                 ),
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
+                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_title'      => $objectGroup?->title,
             ];
         }
 

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

@@ -45,6 +45,7 @@ class RecurrenceController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(RecurringRepositoryInterface::class);
+
                 $this->repository->setUser(auth()->user());
 
                 return $next($request);
@@ -54,7 +55,7 @@ class RecurrenceController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getRecurringAC
+     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRecurringAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -54,7 +54,7 @@ class RuleController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getRulesAC
+     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRulesAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -54,7 +54,7 @@ class RuleGroupController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getRuleGroupsAC
+     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRuleGroupsAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -57,7 +57,7 @@ class TagController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getTagAC
+     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTagAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -62,7 +62,7 @@ class TransactionController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsAC
+     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsAC
      *
      * @param  AutocompleteRequest  $request
      *
@@ -92,7 +92,7 @@ class TransactionController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsIDAC
+     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsIDAC
      *
      * @param  AutocompleteRequest  $request
      *

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

@@ -53,12 +53,11 @@ class TransactionTypeController extends Controller
 
     /**
      * This endpoint is documented at
-     * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionTypesAC
+     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionTypesAC
      *
      * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function transactionTypes(AutocompleteRequest $request): JsonResponse
     {

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

@@ -52,7 +52,7 @@ class AccountController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -74,7 +74,7 @@ class AccountController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/charts/getChartAccountOverview
      *
      * @param  DateRequest  $request
      *

app/Api/V1/Controllers/Controller.php

@@ -42,7 +42,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 /**
  * Class Controller.
  *
- * @codeCoverageIgnore
+
  */
 abstract class Controller extends BaseController
 {
@@ -97,6 +97,7 @@ abstract class Controller extends BaseController
         // some date fields:
         $dates = ['start', 'end', 'date'];
         foreach ($dates as $field) {
+            $date = null;
             try {
                 $date = request()->query->get($field);
             } catch (BadRequestException $e) {

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

@@ -1,78 +0,0 @@
-<?php
-
-/*
- * AccountController.php
- * 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/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
-
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\Bulk\MoveTransactionsRequest;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
-use Illuminate\Http\JsonResponse;
-
-/**
- * Class AccountController
- *
- * @deprecated
- */
-class AccountController extends Controller
-{
-    private AccountRepositoryInterface $repository;
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * This endpoint is deprecated and not documented.
-     *
-     * @param  MoveTransactionsRequest  $request
-     *
-     * @return JsonResponse
-     * @deprecated
-     */
-    public function moveTransactions(MoveTransactionsRequest $request): JsonResponse
-    {
-        $accountIds  = $request->getAll();
-        $original    = $this->repository->find($accountIds['original_account']);
-        $destination = $this->repository->find($accountIds['destination_account']);
-
-        /** @var AccountDestroyService $service */
-        $service = app(AccountDestroyService::class);
-        $service->moveTransactions($original, $destination);
-
-        return response()->json([], 204);
-    }
-}

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

@@ -62,6 +62,7 @@ class TransactionController extends Controller
 
     /**
      * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/bulkUpdateTransactions
      *
      * @param  TransactionRequest  $request
      *

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

@@ -56,7 +56,7 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/destroyData
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/destroyData
      *
      * @param  DestroyRequest  $request
      *

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

@@ -55,7 +55,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportAccounts
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportAccounts
      *
      * @param  ExportRequest  $request
      *
@@ -99,7 +99,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportBills
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills
      *
      * @param  ExportRequest  $request
      *
@@ -115,7 +115,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportBudgets
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBudgets
      *
      * @param  ExportRequest  $request
      *
@@ -131,7 +131,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportCategories
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportCategories
      *
      * @param  ExportRequest  $request
      *
@@ -147,7 +147,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportPiggies
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportPiggies
      *
      * @param  ExportRequest  $request
      *
@@ -163,7 +163,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportRecurring
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRecurring
      *
      * @param  ExportRequest  $request
      *
@@ -179,7 +179,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportRules
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRules
      *
      * @param  ExportRequest  $request
      *
@@ -195,7 +195,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportTags
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTags
      *
      * @param  ExportRequest  $request
      *
@@ -211,7 +211,7 @@ class ExportController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/data/exportTransactions
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTransactions
      *
      * @param  ExportRequest  $request
      *

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

@@ -40,6 +40,9 @@ use Illuminate\Http\JsonResponse;
 class PurgeController extends Controller
 {
     /**
+     * TODO cleanup and use repositories.
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/purgeData
      * @return JsonResponse
      */
     public function purge(): JsonResponse
@@ -47,7 +50,6 @@ class PurgeController extends Controller
         $user = auth()->user();
 
         // some manual code, too lazy to call all repositories.
-        //,transactions,withdrawals,deposits,transfers';
 
         // budgets:
         Budget::whereUserId($user->id)->onlyTrashed()->forceDelete();

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

@@ -50,7 +50,7 @@ class AccountController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -74,7 +74,7 @@ class AccountController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseAsset
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseAsset
      *
      * @param  GenericRequest  $request
      *
@@ -105,7 +105,7 @@ class AccountController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseExpense
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseExpense
      *
      * @param  GenericRequest  $request
      *

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

@@ -57,7 +57,7 @@ class BillController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBill
      *
      * Expenses per bill, possibly filtered by bill and account.
      *
@@ -120,7 +120,7 @@ class BillController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBill
      *
      * Expenses for no bill filtered by account.
      *

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

@@ -44,7 +44,7 @@ class BudgetController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -66,7 +66,7 @@ class BudgetController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBudget
      *
      * @param  GenericRequest  $request
      *
@@ -103,7 +103,7 @@ class BudgetController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBudget
      *
      * @param  GenericRequest  $request
      *

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

@@ -45,7 +45,7 @@ class CategoryController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -67,7 +67,7 @@ class CategoryController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
      *
      * @param  GenericRequest  $request
      *
@@ -104,7 +104,7 @@ class CategoryController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
      *
      * @param  GenericRequest  $request
      *

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

@@ -36,7 +36,7 @@ class PeriodController extends Controller
 {
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTotal
      *
      * @param  GenericRequest  $request
      *

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

@@ -56,7 +56,7 @@ class TagController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoTag
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoTag
      *
      * Expenses for no tag filtered by account.
      *
@@ -109,7 +109,7 @@ class TagController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightExpenseTag
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTag
      *
      * Expenses per tag, possibly filtered by tag and account.
      *

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

@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
  * Class AccountController
  *
  * Shows income information grouped or limited by date.
- * Ie. all income grouped by account + currency.
+ * I.e. all income grouped by account + currency.
  */
 class AccountController extends Controller
 {
@@ -50,7 +50,7 @@ class AccountController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -74,7 +74,7 @@ class AccountController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeAsset
      *
      * @param  GenericRequest  $request
      *
@@ -104,7 +104,7 @@ class AccountController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeRevenue
      *
      * @param  GenericRequest  $request
      *

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

@@ -45,7 +45,7 @@ class CategoryController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -67,7 +67,7 @@ class CategoryController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightIncomeCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeCategory
      *
      * @param  GenericRequest  $request
      *
@@ -104,7 +104,7 @@ class CategoryController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightIncomeNoCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoCategory
      *
      * @param  GenericRequest  $request
      *

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

@@ -36,7 +36,7 @@ class PeriodController extends Controller
 {
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTotal
      *
      * @param  GenericRequest  $request
      *

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

@@ -57,7 +57,7 @@ class TagController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightIncomeTag
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTag
      *
      * Expenses for no tag filtered by account.
      *
@@ -113,7 +113,7 @@ class TagController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightIncomeNoTag
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoTag
      *
      * Expenses per tag, possibly filtered by tag and account.
      *

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

@@ -41,7 +41,7 @@ class AccountController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -59,7 +59,7 @@ class AccountController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransfers
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransfers
      *
      * @param  GenericRequest  $request
      *

app/Api/V1/Controllers/Insight/Transfer/CategoryController.php

@@ -44,7 +44,7 @@ class CategoryController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -66,7 +66,7 @@ class CategoryController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
      *
      * @param  GenericRequest  $request
      *
@@ -103,7 +103,7 @@ class CategoryController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
      *
      * @param  GenericRequest  $request
      *

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -36,7 +36,7 @@ class PeriodController extends Controller
 {
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransferTotal
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTotal
      *
      * @param  GenericRequest  $request
      *

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -56,7 +56,7 @@ class TagController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransferNoTag
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoTag
      *
      * @param  GenericRequest  $request
      *
@@ -110,7 +110,7 @@ class TagController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/insight/insightTransferTag
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTag
      *
      * Transfers per tag, possibly filtered by tag and account.
      *

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

@@ -40,7 +40,7 @@ class DestroyController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -57,13 +57,12 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/deleteAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/deleteAccount
      *
      * Remove the specified resource from storage.
      *
      * @param  Account  $account
      *
-     * @codeCoverageIgnore
      * @return JsonResponse
      */
     public function destroy(Account $account): JsonResponse

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

@@ -54,7 +54,7 @@ class ListController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -71,12 +71,11 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/listAttachmentByAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAttachmentByAccount
      *
      * @param  Account  $account
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      * @throws FireflyException
      */
     public function attachments(Account $account): JsonResponse
@@ -104,13 +103,12 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/listPiggyBankByAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listPiggyBankByAccount
      *
      * @param  Account  $account
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function piggyBanks(Account $account): JsonResponse
     {
@@ -127,7 +125,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]).$this->buildParams());
+        $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams());
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
@@ -141,11 +139,10 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/listTransactionByAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listTransactionByAccount
      *
      * Show all transaction groups related to the account.
      *
-     * @codeCoverageIgnore
      *
      * @param  Request  $request
      * @param  Account  $account

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

@@ -50,7 +50,7 @@ class ShowController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -67,7 +67,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/listAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAccount
      *
      * Display a listing of the resource.
      *
@@ -75,7 +75,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(Request $request): JsonResponse
     {
@@ -113,7 +112,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/getAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/getAccount
      *
      * Show single instance.
      *

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

@@ -42,7 +42,7 @@ class StoreController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -59,7 +59,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/storeAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/storeAccount
      *
      * Store a new instance.
      *

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

@@ -45,7 +45,7 @@ class UpdateController extends Controller
     /**
      * AccountController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -62,7 +62,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/accounts/updateAccount
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/updateAccount
      *
      * Update account.
      *

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

@@ -40,7 +40,7 @@ class DestroyController extends Controller
     /**
      * DestroyController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -60,11 +60,10 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/attachments/deleteAttachment
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/deleteAttachment
      *
      * Remove the specified resource from storage.
      *
-     * @codeCoverageIgnore
      *
      * @param  Attachment  $attachment
      *

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

@@ -47,7 +47,7 @@ class ShowController extends Controller
     /**
      * ShowController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -67,13 +67,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/attachments/downloadAttachment
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/downloadAttachment
      *
      * Download an attachment.
      *
      * @param  Attachment  $attachment
      *
-     * @codeCoverageIgnore
      * @return LaravelResponse
      * @throws   FireflyException
      */
@@ -112,13 +111,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/attachments/listAttachment
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/listAttachment
      *
      * Display a listing of the resource.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -148,7 +146,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/attachments/getAttachment
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/getAttachment
      *
      * Display the specified resource.
      *

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

@@ -47,7 +47,7 @@ class StoreController extends Controller
     /**
      * StoreController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -67,7 +67,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/attachments/uploadAttachment
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/uploadAttachment
      *
      * Store a newly created resource in storage.
      *
@@ -95,7 +95,6 @@ class StoreController extends Controller
     /**
      * Upload an attachment.
      *
-     * @codeCoverageIgnore
      *
      * @param  Request  $request
      * @param  Attachment  $attachment

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

@@ -43,7 +43,7 @@ class UpdateController extends Controller
     /**
      * UpdateController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -63,7 +63,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/attachments/updateAttachment
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/updateAttachment
      *
      * Update the specified resource in storage.
      *

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

@@ -45,7 +45,7 @@ class ShowController extends Controller
     /**
      * AvailableBudgetController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -64,13 +64,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/available_budgets/getAvailableBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/available_budgets/getAvailableBudget
      *
      * Display a listing of the resource.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -89,7 +88,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.available_budgets.index').$this->buildParams());
+        $paginator->setPath(route('api.v1.available-budgets.index').$this->buildParams());
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
@@ -103,14 +102,13 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/available_budgets/getAvailableBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/available_budgets/getAvailableBudget
      *
      * Display the specified resource.
      *
      * @param  AvailableBudget  $availableBudget
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function show(AvailableBudget $availableBudget): JsonResponse
     {

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

@@ -38,7 +38,7 @@ class DestroyController extends Controller
     /**
      * BillController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -55,14 +55,13 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/deleteBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/deleteBill
      *
      * Remove the specified resource from storage.
      *
      * @param  Bill  $bill
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function destroy(Bill $bill): JsonResponse
     {

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

@@ -51,7 +51,7 @@ class ListController extends Controller
     /**
      * BillController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -68,7 +68,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/listAttachmentByBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listAttachmentByBill
      *
      * Display a listing of the resource.
      *
@@ -76,7 +76,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function attachments(Bill $bill): JsonResponse
     {
@@ -103,7 +102,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/listRuleByBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listRuleByBill
      *
      * List all of them.
      *
@@ -111,7 +110,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function rules(Bill $bill): JsonResponse
     {
@@ -140,7 +138,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/listTransactionByBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listTransactionByBill
      *
      * Show all transactions.
      *
@@ -150,7 +148,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function transactions(Request $request, Bill $bill): JsonResponse
     {

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

@@ -44,7 +44,7 @@ class ShowController extends Controller
     /**
      * BillController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,13 +61,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/listBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listBill
      *
      * Display a listing of the resource.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -91,14 +90,13 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/getBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/getBill
      *
      * Show the specified bill.
      *
      * @param  Bill  $bill
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function show(Bill $bill): JsonResponse
     {

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

@@ -44,7 +44,7 @@ class StoreController extends Controller
     /**
      * BillController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,7 +61,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/storeBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/storeBill
      *
      * Store a bill.
      *

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

@@ -41,7 +41,7 @@ class UpdateController extends Controller
     /**
      * BillController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/bills/updateBill
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/updateBill
      *
      * Update a bill.
      *

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

@@ -38,7 +38,7 @@ class DestroyController extends Controller
     /**
      * DestroyController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -55,14 +55,13 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/deleteBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/deleteBudget
      *
      * Remove the specified resource from storage.
      *
      * @param  Budget  $budget
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function destroy(Budget $budget): JsonResponse
     {

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

@@ -53,7 +53,7 @@ class ListController extends Controller
     /**
      * ListController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -72,13 +72,12 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listAttachmentByBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listAttachmentByBudget
      *
      * @param  Budget  $budget
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function attachments(Budget $budget): JsonResponse
     {
@@ -105,7 +104,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listBudgetLimitByBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudgetLimitByBudget
      *
      * Display a listing of the resource.
      *
@@ -113,7 +112,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function budgetLimits(Budget $budget): JsonResponse
     {
@@ -124,7 +122,7 @@ class ListController extends Controller
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]).$this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.budget-limits', [$budget->id]).$this->buildParams());
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -137,7 +135,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionByBudget
      *
      * Show all transactions.
      *
@@ -147,7 +145,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function transactions(Request $request, Budget $budget): JsonResponse
     {
@@ -203,7 +200,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listTransactionWithoutBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionWithoutBudget
      *
      * Show all transactions.
      *
@@ -211,7 +208,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function withoutBudget(Request $request): JsonResponse
     {

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

@@ -46,7 +46,7 @@ class ShowController extends Controller
     /**
      * ListController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -65,13 +65,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudget
      *
      * Display a listing of the resource.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -105,7 +104,6 @@ class ShowController extends Controller
      * @param  Budget  $budget
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function show(Budget $budget): JsonResponse
     {

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

@@ -41,7 +41,7 @@ class StoreController extends Controller
     /**
      * StoreController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/storeBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/storeBudget
      *
      * Store a budget.
      *

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

@@ -41,7 +41,7 @@ class UpdateController extends Controller
     /**
      * UpdateController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/updateBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudget
      *
      * Update a budget.
      *

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

@@ -41,7 +41,7 @@ class DestroyController extends Controller
     /**
      * BudgetLimitController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -60,7 +60,7 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/deleteBudgetLimit
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/deleteBudgetLimit
      *
      * Remove the specified resource from storage.
      *
@@ -69,7 +69,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {

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

@@ -49,7 +49,7 @@ class ListController extends Controller
     /**
      * BudgetLimitController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -68,7 +68,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudgetLimit
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionByBudgetLimit
      * Show all transactions.
      *
      * @param  Request  $request
@@ -77,7 +77,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {

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

@@ -50,7 +50,7 @@ class ShowController extends Controller
     /**
      * BudgetLimitController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -71,7 +71,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listBudgetLimitByBudget
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudgetLimitByBudget
      *
      * Display a listing of the budget limits for this budget.
      *
@@ -80,7 +80,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(Request $request, Budget $budget): JsonResponse
     {
@@ -105,7 +104,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/listBudgetLimit
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudgetLimit
      *
      * Display a listing of the budget limits for this budget.
      *
@@ -113,7 +112,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function indexAll(DateRequest $request): JsonResponse
     {
@@ -138,7 +136,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/getBudgetLimit
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/getBudgetLimit
      *
      * @param  Request  $request
      * @param  Budget  $budget

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

@@ -42,7 +42,7 @@ class StoreController extends Controller
     /**
      * BudgetLimitController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,7 +61,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/storeBudgetLimit
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/storeBudgetLimit
      *
      * Store a newly created resource in storage.
      *

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

@@ -43,11 +43,11 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/budgets/updateBudgetLimit
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudgetLimit
      *
      * BudgetLimitController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -66,6 +66,8 @@ class UpdateController extends Controller
 
     /**
      * Update the specified resource in storage.
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudgetLimit
      *
      * @param  UpdateRequest  $request
      * @param  Budget  $budget

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

@@ -38,7 +38,7 @@ class DestroyController extends Controller
     /**
      * CategoryController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -55,14 +55,13 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/categories/deleteCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/deleteCategory
      *
      * Remove the specified resource from storage.
      *
      * @param  Category  $category
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function destroy(Category $category): JsonResponse
     {

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

@@ -50,7 +50,7 @@ class ListController extends Controller
     /**
      * CategoryController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -67,13 +67,12 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/categories/listAttachmentByCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/listAttachmentByCategory
      *
      * @param  Category  $category
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function attachments(Category $category): JsonResponse
     {
@@ -100,7 +99,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/categories/listTransactionByCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/listTransactionByCategory
      *
      * Show all transactions.
      *
@@ -110,7 +109,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function transactions(Request $request, Category $category): JsonResponse
     {

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

@@ -44,7 +44,7 @@ class ShowController extends Controller
     /**
      * CategoryController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,13 +61,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/categories/listCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/listCategory
      *
      * Display a listing of the resource.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -96,14 +95,13 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/categories/getCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/getCategory
      *
      * Show the category.
      *
      * @param  Category  $category
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function show(Category $category): JsonResponse
     {

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

@@ -41,7 +41,7 @@ class StoreController extends Controller
     /**
      * CategoryController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/categories/storeCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/storeCategory
      *
      * Store new category.
      *

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

@@ -41,7 +41,7 @@ class UpdateController extends Controller
     /**
      * CategoryController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/categories/updateCategory
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/updateCategory
      *
      * Update the category.
      *

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

@@ -39,7 +39,7 @@ class DestroyController extends Controller
     /**
      * ObjectGroupController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,13 +58,12 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/object_groups/deleteObjectGroup
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/deleteObjectGroup
      *
      * Remove the specified resource from storage.
      *
      * @param  ObjectGroup  $objectGroup
      *
-     * @codeCoverageIgnore
      * @return JsonResponse
      */
     public function destroy(ObjectGroup $objectGroup): JsonResponse

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

@@ -45,7 +45,7 @@ class ListController extends Controller
     /**
      * ObjectGroupController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -64,7 +64,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/object_groups/listBillByObjectGroup
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/listBillByObjectGroup
      *
      * List all bills in this object group
      *
@@ -72,7 +72,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function bills(ObjectGroup $objectGroup): JsonResponse
     {
@@ -100,7 +99,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/object_groups/listPiggyBankByObjectGroup
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/listPiggyBankByObjectGroup
      *
      * List all piggies under the object group.
      *
@@ -108,7 +107,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
     {
@@ -125,7 +123,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]).$this->buildParams());
+        $paginator->setPath(route('api.v1.object-groups.piggy-banks', [$objectGroup->id]).$this->buildParams());
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);

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

@@ -46,7 +46,7 @@ class ShowController extends Controller
     /**
      * ObjectGroupController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -65,7 +65,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/object_groups/listObjectGroups
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/listObjectGroups
      *
      * Display a listing of the resource.
      *
@@ -73,7 +73,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(Request $request): JsonResponse
     {
@@ -103,7 +102,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/object_groups/getObjectGroup
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/getObjectGroup
      *
      * Show single instance.
      *

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

@@ -42,7 +42,7 @@ class UpdateController extends Controller
     /**
      * ObjectGroupController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,7 +61,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/object_groups/updateObjectGroup
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/updateObjectGroup
      *
      * @param  UpdateRequest  $request
      * @param  ObjectGroup  $objectGroup

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

@@ -38,7 +38,7 @@ class DestroyController extends Controller
     /**
      * Constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -55,14 +55,13 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/piggy_banks/deletePiggyBank
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/deletePiggyBank
      *
      * Delete the resource.
      *
      * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function destroy(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -44,7 +44,7 @@ class ListController extends Controller
     /**
      * Constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,13 +61,12 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/piggy_banks/listAttachmentByPiggyBank
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAttachmentByPiggyBank
      *
      * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function attachments(PiggyBank $piggyBank): JsonResponse
     {
@@ -80,7 +79,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]).$this->buildParams());
+        $paginator->setPath(route('api.v1.piggy-banks.attachments', [$piggyBank->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -94,7 +93,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/piggy_banks/listEventByPiggyBank
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listEventByPiggyBank
      *
      * List single resource.
      *
@@ -102,7 +101,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {
@@ -116,7 +114,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]).$this->buildParams());
+        $paginator->setPath(route('api.v1.piggy-banks.events', [$piggyBank->id]).$this->buildParams());
 
         /** @var PiggyBankEventTransformer $transformer */
         $transformer = app(PiggyBankEventTransformer::class);

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

@@ -44,7 +44,7 @@ class ShowController extends Controller
     /**
      * Constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,13 +61,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/piggy_banks/listPiggyBank
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listPiggyBank
      *
      * List all of them.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -82,7 +81,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.index').$this->buildParams());
+        $paginator->setPath(route('api.v1.piggy-banks.index').$this->buildParams());
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
@@ -96,14 +95,13 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/piggy_banks/getPiggyBank
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/getPiggyBank
      *
      * List single resource.
      *
      * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function show(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -41,7 +41,7 @@ class StoreController extends Controller
     /**
      * Constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/piggy_banks/storePiggyBank
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/storePiggyBank
      *
      * Store new object.
      *

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

@@ -41,7 +41,7 @@ class UpdateController extends Controller
     /**
      * Constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/piggy_banks/updatePiggyBank
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/updatePiggyBank
      *
      * Update piggy bank.
      *

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

@@ -38,7 +38,7 @@ class DestroyController extends Controller
     /**
      * RecurrenceController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -55,14 +55,13 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/recurrences/deleteRecurrence
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/deleteRecurrence
      *
      * Delete the resource.
      *
      * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function destroy(Recurrence $recurrence): JsonResponse
     {

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

@@ -48,7 +48,7 @@ class ListController extends Controller
     /**
      * RecurrenceController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -65,7 +65,7 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/recurrences/listTransactionByRecurrence
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/listTransactionByRecurrence
      *
      * Show transactions for this recurrence.
      *
@@ -74,7 +74,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function transactions(Request $request, Recurrence $recurrence): JsonResponse
     {

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

@@ -44,7 +44,7 @@ class ShowController extends Controller
     /**
      * RecurrenceController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,13 +61,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/recurrences/listRecurrence
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/listRecurrence
      *
      * List all of them.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -97,14 +96,13 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/recurrences/getRecurrence
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/getRecurrence
      *
      * List single resource.
      *
      * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function show(Recurrence $recurrence): JsonResponse
     {

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

@@ -41,7 +41,7 @@ class StoreController extends Controller
     /**
      * RecurrenceController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/recurrences/storeRecurrence
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/storeRecurrence
      *
      * Store new object.
      *

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

@@ -41,7 +41,7 @@ class UpdateController extends Controller
     /**
      * RecurrenceController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -58,7 +58,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/recurrences/updateRecurrence
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/updateRecurrence
      *
      * Update single recurrence.
      *

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

@@ -39,7 +39,7 @@ class DestroyController extends Controller
     /**
      * RuleController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -59,14 +59,13 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rules/deleteRule
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/deleteRule
      *
      * Delete the resource.
      *
      * @param  Rule  $rule
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function destroy(Rule $rule): JsonResponse
     {

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

@@ -1,62 +0,0 @@
-<?php
-/*
- * ListController.php
- * 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/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers\Models\Rule;
-
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
-use FireflyIII\User;
-
-/**
- * Class ListController
- */
-class ListController extends Controller
-{
-    private AccountRepositoryInterface $accountRepository;
-    private RuleRepositoryInterface    $ruleRepository;
-
-    /**
-     * RuleController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-
-                $this->ruleRepository = app(RuleRepositoryInterface::class);
-                $this->ruleRepository->setUser($user);
-
-                $this->accountRepository = app(AccountRepositoryInterface::class);
-                $this->accountRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-}

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

@@ -45,7 +45,7 @@ class ShowController extends Controller
     /**
      * RuleController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -65,13 +65,12 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rules/listRule
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/listRule
      *
      * List all of them.
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function index(): JsonResponse
     {
@@ -101,14 +100,13 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rules/getRule
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/getRule
      *
      * List single resource.
      *
      * @param  Rule  $rule
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function show(Rule $rule): JsonResponse
     {

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

@@ -41,7 +41,7 @@ class StoreController extends Controller
     /**
      * RuleController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -61,7 +61,7 @@ class StoreController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rules/storeRule
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/storeRule
      *
      * Store new object.
      *

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

@@ -47,7 +47,7 @@ class TriggerController extends Controller
     /**
      * RuleController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -67,7 +67,7 @@ class TriggerController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rules/testRule
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/testRule
      *
      * @param  TestRequest  $request
      * @param  Rule  $rule
@@ -117,7 +117,7 @@ class TriggerController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rules/fireRule
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/fireRule
      *
      * Execute the given rule group on a set of existing transactions.
      *

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

@@ -42,7 +42,7 @@ class UpdateController extends Controller
     /**
      * RuleController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -62,7 +62,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rules/updateRule
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/updateRule
      *
      * Update a rule.
      *

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

@@ -39,7 +39,7 @@ class DestroyController extends Controller
     /**
      * RuleGroupController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -59,14 +59,13 @@ class DestroyController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rule_groups/deleteRuleGroup
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/deleteRuleGroup
      *
      * Delete the resource.
      *
      * @param  RuleGroup  $ruleGroup
      *
      * @return JsonResponse
-     * @codeCoverageIgnore
      */
     public function destroy(RuleGroup $ruleGroup): JsonResponse
     {

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

@@ -44,7 +44,7 @@ class ListController extends Controller
     /**
      * RuleGroupController constructor.
      *
-     * @codeCoverageIgnore
+
      */
     public function __construct()
     {
@@ -64,13 +64,12 @@ class ListController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/rule_groups/listRuleByGroup
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/listRuleByGroup
      *
      * @param  RuleGroup  $group
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @codeCoverageIgnore
      */
     public function rules(RuleGroup $group): JsonResponse
     {
@@ -85,7 +84,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.rule_groups.rules', [$group->id]).$this->buildParams());
+        $paginator->setPath(route('api.v1.rule-groups.rules', [$group->id]).$this->buildParams());
 
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);