Merge branch 'release/v6.0.5'

Meta files for v6.0.5

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

@@ -37,8 +37,8 @@ $finder = PhpCsFixer\Finder::create()
 $config = new PhpCsFixer\Config();
 return $config->setRules([
     '@PSR12'               => true,
+    'declare_strict_types' => true,
     'strict_param'         => true,
     'array_syntax'         => ['syntax' => 'short'],
 ])
-              ->setFinder($finder)
+              ->setFinder($finder);
-    ;

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

@@ -379,16 +379,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.14.4",
+            "version": "v3.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b"
+                "reference": "d48755372a113bddb99f749e34805d83f3acfe04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/1b3d9dba63d93b8a202c31e824748218781eae6b",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d48755372a113bddb99f749e34805d83f3acfe04",
-                "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b",
+                "reference": "d48755372a113bddb99f749e34805d83f3acfe04",
                 "shasum": ""
             },
             "require": {
@@ -455,9 +455,15 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "keywords": [
+                "Static code analysis",
+                "fixer",
+                "standards",
+                "static analysis"
+            ],
             "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.4"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.15.1"
             },
             "funding": [
                 {
@@ -465,7 +471,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-09T21:49:13+00:00"
+            "time": "2023-03-13T23:26:30+00:00"
         },
         {
             "name": "psr/cache",
@@ -737,16 +743,16 @@
         },
         {
             "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",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
-                "reference": "3e294254f2191762c1d137aed4b94e966965e985",
+                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
                 "shasum": ""
             },
             "require": {
@@ -813,7 +819,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 +835,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",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
-                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
                 "shasum": ""
             },
             "require": {
@@ -880,7 +886,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 +902,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",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/404b307de426c1c488e5afad64403e5f145e82a5",
-                "reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
+                "reference": "404b307de426c1c488e5afad64403e5f145e82a5",
                 "shasum": ""
             },
             "require": {
@@ -963,7 +969,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 +985,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",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
-                "reference": "0782b0b52a737a05b4383d0df35a474303cabdae",
+                "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
                 "shasum": ""
             },
             "require": {
@@ -1042,7 +1048,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 +1064,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",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/82b6c62b959f642d000456f08c6d219d749215b3",
-                "reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593",
+                "reference": "82b6c62b959f642d000456f08c6d219d749215b3",
                 "shasum": ""
             },
             "require": {
@@ -1105,7 +1111,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 +1127,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",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb",
-                "reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c",
+                "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb",
                 "shasum": ""
             },
             "require": {
@@ -1169,7 +1175,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 +1191,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",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/aa0e85b53bbb2b4951960efd61d295907eacd629",
-                "reference": "e8324d44f5af99ec2ccec849934a242f64458f86",
+                "reference": "aa0e85b53bbb2b4951960efd61d295907eacd629",
                 "shasum": ""
             },
             "require": {
@@ -1236,7 +1242,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 +1258,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 +1754,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",
+                "url": "https://api.github.com/repos/symfony/process/zipball/680e8a2ea6b3f87aecc07a6a65a203ae573d1902",
-                "reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
+                "reference": "680e8a2ea6b3f87aecc07a6a65a203ae573d1902",
                 "shasum": ""
             },
             "require": {
@@ -1789,7 +1795,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 +1811,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",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a8c9cedf55f314f3a186041d19537303766df09a",
-                "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75",
+                "reference": "a8c9cedf55f314f3a186041d19537303766df09a",
                 "shasum": ""
             },
             "require": {
@@ -1874,7 +1880,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 +1896,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",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
-                "reference": "00b6ac156aacffc53487c930e0ab14587a6607f6",
+                "reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
                 "shasum": ""
             },
             "require": {
@@ -1936,7 +1942,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 +1958,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",
+                "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d",
-                "reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
+                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d",
                 "shasum": ""
             },
             "require": {
@@ -2022,7 +2028,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 +2044,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:38:09+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
         }
     ],
     "packages-dev": [],

.github/ISSUE_TEMPLATE/bug.yml

@@ -16,7 +16,7 @@ body:
       options:
         - label: ... [the documentation](https://docs.firefly-iii.org/) does not mention anything about my problem
         - label: ... there are no open or closed issues that are related to my problem
-        - label: ... it's [definitely me, not you](https://github.com/firefly-iii/firefly-iii/blob/main/.github/its_you_not_me.md)
+        - label: ... it's [definitely a Firefly III issue, not me](https://github.com/firefly-iii/firefly-iii/blob/main/.github/its_you_not_me.md)
 
   - type: textarea
     attributes:
@@ -27,18 +27,18 @@ body:
 
   - type: textarea
     attributes:
-      label: Expected behaviour
+      label: Debug information
-      description: Please describe precisely what you'd expect to happen.
+      description: Please provide the table from the /debug page. Do not add backticks or quotes.
+      placeholder: The output from the /debug page
     validations:
       required: true
 
   - type: textarea
     attributes:
-      label: Debug information
+      label: Expected behaviour
-      description: Please provide the table from the /debug page
+      description: Please describe precisely what you'd expect to happen. Be specific.
-      placeholder: The output from the /debug page
     validations:
-      required: true
+      required: false
 
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/fr.yml

@@ -8,9 +8,9 @@ body:
       options:
         - label: I've read the [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
           required: true
-        - label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/)
+        - label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/firefly-iii/more-information/what-its-not/)
           required: true
-        - label: I've used [the search](https://github.com/firefly-iii/firefly-iii/issues?q=is%3Aissue) and this has not been discussed before.
+        - label: I've used [the search](https://github.com/firefly-iii/firefly-iii/issues?q=is%3Aissue) and this has not been requested before.
           required: true
 
   - type: textarea
@@ -18,9 +18,9 @@ body:
       label: Description
       description: Please describe your feature request
       placeholder: |
-        - I would like Firefly III to do ABC.
+        - I would like Firefly III to do (thing).
-        - What if you would add feature XYZ?
+        - What if you would add feature (feature here)?
-        - Firefly III doesn't do DEF.
+        - Firefly III doesn't do (thing).
     validations:
       required: true
 

.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]

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

@@ -58,7 +58,6 @@ class TransactionTypeController extends Controller
      * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
-
      */
     public function transactionTypes(AutocompleteRequest $request): JsonResponse
     {

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

@@ -94,19 +94,39 @@ class DestroyController extends Controller
             case 'object_groups':
                 $this->destroyObjectGroups();
                 break;
+            case 'not_assets_liabilities':
+                $this->destroyAccounts(
+                    [
+                        AccountType::BENEFICIARY,
+                        AccountType::CASH,
+                        AccountType::CREDITCARD,
+                        AccountType::DEFAULT,
+                        AccountType::EXPENSE,
+                        AccountType::IMPORT,
+                        AccountType::INITIAL_BALANCE,
+                        AccountType::LIABILITY_CREDIT,
+                        AccountType::RECONCILIATION,
+                        AccountType::REVENUE,
+                    ]
+                );
+                break;
             case 'accounts':
                 $this->destroyAccounts(
                     [
                         AccountType::ASSET,
-                        AccountType::DEFAULT,
                         AccountType::BENEFICIARY,
-                        AccountType::EXPENSE,
+                        AccountType::CASH,
-                        AccountType::REVENUE,
+                        AccountType::CREDITCARD,
-                        AccountType::INITIAL_BALANCE,
                         AccountType::DEBT,
+                        AccountType::DEFAULT,
+                        AccountType::EXPENSE,
+                        AccountType::IMPORT,
+                        AccountType::INITIAL_BALANCE,
+                        AccountType::LIABILITY_CREDIT,
                         AccountType::LOAN,
                         AccountType::MORTGAGE,
-                        AccountType::CREDITCARD,
+                        AccountType::RECONCILIATION,
+                        AccountType::REVENUE,
                     ]
                 );
                 break;

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

@@ -63,7 +63,6 @@ class DestroyController extends Controller
      *
      * @param  Account  $account
      *
-
      * @return JsonResponse
      */
     public function destroy(Account $account): JsonResponse

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

@@ -76,7 +76,6 @@ class ListController extends Controller
      * @param  Account  $account
      *
      * @return JsonResponse
-
      * @throws FireflyException
      */
     public function attachments(Account $account): JsonResponse
@@ -110,7 +109,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBanks(Account $account): JsonResponse
     {
@@ -145,7 +143,6 @@ class ListController extends Controller
      *
      * Show all transaction groups related to the account.
      *
-
      *
      * @param  Request  $request
      * @param  Account  $account

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

@@ -75,7 +75,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {

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

@@ -64,7 +64,6 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-
      *
      * @param  Attachment  $attachment
      *

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

@@ -73,7 +73,6 @@ class ShowController extends Controller
      *
      * @param  Attachment  $attachment
      *
-
      * @return LaravelResponse
      * @throws   FireflyException
      */
@@ -118,7 +117,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {

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

@@ -95,7 +95,6 @@ class StoreController extends Controller
     /**
      * Upload an attachment.
      *
-
      *
      * @param  Request  $request
      * @param  Attachment  $attachment

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

@@ -70,7 +70,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -110,7 +109,6 @@ class ShowController extends Controller
      * @param  AvailableBudget  $availableBudget
      *
      * @return JsonResponse
-
      */
     public function show(AvailableBudget $availableBudget): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Bill  $bill
      *
      * @return JsonResponse
-
      */
     public function destroy(Bill $bill): JsonResponse
     {

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

@@ -76,7 +76,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Bill $bill): JsonResponse
     {
@@ -111,7 +110,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function rules(Bill $bill): JsonResponse
     {
@@ -150,7 +148,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Bill $bill): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -98,7 +97,6 @@ class ShowController extends Controller
      * @param  Bill  $bill
      *
      * @return JsonResponse
-
      */
     public function show(Bill $bill): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Budget  $budget
      *
      * @return JsonResponse
-
      */
     public function destroy(Budget $budget): JsonResponse
     {

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

@@ -78,7 +78,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Budget $budget): JsonResponse
     {
@@ -113,7 +112,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function budgetLimits(Budget $budget): JsonResponse
     {
@@ -147,7 +145,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Budget $budget): JsonResponse
     {
@@ -211,7 +208,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function withoutBudget(Request $request): JsonResponse
     {

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

@@ -71,7 +71,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -105,7 +104,6 @@ class ShowController extends Controller
      * @param  Budget  $budget
      *
      * @return JsonResponse
-
      */
     public function show(Budget $budget): JsonResponse
     {

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

@@ -69,7 +69,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {

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

@@ -77,7 +77,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {

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

@@ -80,7 +80,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request, Budget $budget): JsonResponse
     {
@@ -113,7 +112,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function indexAll(DateRequest $request): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Category  $category
      *
      * @return JsonResponse
-
      */
     public function destroy(Category $category): JsonResponse
     {

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

@@ -73,7 +73,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Category $category): JsonResponse
     {
@@ -110,7 +109,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Category $category): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -103,7 +102,6 @@ class ShowController extends Controller
      * @param  Category  $category
      *
      * @return JsonResponse
-
      */
     public function show(Category $category): JsonResponse
     {

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

@@ -64,7 +64,6 @@ class DestroyController extends Controller
      *
      * @param  ObjectGroup  $objectGroup
      *
-
      * @return JsonResponse
      */
     public function destroy(ObjectGroup $objectGroup): JsonResponse

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

@@ -72,7 +72,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function bills(ObjectGroup $objectGroup): JsonResponse
     {
@@ -108,7 +107,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
     {

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

@@ -73,7 +73,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
-
      */
     public function destroy(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(PiggyBank $piggyBank): JsonResponse
     {
@@ -102,7 +101,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -103,7 +102,6 @@ class ShowController extends Controller
      * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
-
      */
     public function show(PiggyBank $piggyBank): JsonResponse
     {

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

@@ -62,7 +62,6 @@ class DestroyController extends Controller
      * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
-
      */
     public function destroy(Recurrence $recurrence): JsonResponse
     {

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

@@ -74,7 +74,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Recurrence $recurrence): JsonResponse
     {

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

@@ -67,7 +67,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -104,7 +103,6 @@ class ShowController extends Controller
      * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
-
      */
     public function show(Recurrence $recurrence): JsonResponse
     {

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

@@ -66,7 +66,6 @@ class DestroyController extends Controller
      * @param  Rule  $rule
      *
      * @return JsonResponse
-
      */
     public function destroy(Rule $rule): JsonResponse
     {

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

@@ -71,7 +71,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -108,7 +107,6 @@ class ShowController extends Controller
      * @param  Rule  $rule
      *
      * @return JsonResponse
-
      */
     public function show(Rule $rule): JsonResponse
     {

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

@@ -66,7 +66,6 @@ class DestroyController extends Controller
      * @param  RuleGroup  $ruleGroup
      *
      * @return JsonResponse
-
      */
     public function destroy(RuleGroup $ruleGroup): JsonResponse
     {

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

@@ -70,7 +70,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function rules(RuleGroup $group): JsonResponse
     {

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

@@ -70,7 +70,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -106,7 +105,6 @@ class ShowController extends Controller
      * @param  RuleGroup  $ruleGroup
      *
      * @return JsonResponse
-
      */
     public function show(RuleGroup $ruleGroup): JsonResponse
     {

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

@@ -66,7 +66,6 @@ class DestroyController extends Controller
      * @param  Tag  $tag
      *
      * @return JsonResponse
-
      */
     public function destroy(Tag $tag): JsonResponse
     {

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

@@ -76,7 +76,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(Tag $tag): JsonResponse
     {
@@ -112,7 +111,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, Tag $tag): JsonResponse
     {

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

@@ -71,7 +71,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -107,7 +106,6 @@ class ShowController extends Controller
      * @param  Tag  $tag
      *
      * @return JsonResponse
-
      */
     public function show(Tag $tag): JsonResponse
     {

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

@@ -76,7 +76,6 @@ class DestroyController extends Controller
      * @param  TransactionGroup  $transactionGroup
      *
      * @return JsonResponse
-
      */
     public function destroy(TransactionGroup $transactionGroup): JsonResponse
     {
@@ -116,7 +115,6 @@ class DestroyController extends Controller
      *
      * @param  TransactionJournal  $transactionJournal
      *
-
      * @return JsonResponse
      */
     public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse

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

@@ -74,7 +74,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function attachments(TransactionGroup $transactionGroup): JsonResponse
     {
@@ -110,7 +109,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse
     {
@@ -149,7 +147,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse
     {

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

@@ -55,7 +55,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {
@@ -107,7 +106,6 @@ class ShowController extends Controller
      * @param  TransactionJournal  $transactionJournal
      *
      * @return JsonResponse
-
      */
     public function showJournal(TransactionJournal $transactionJournal): JsonResponse
     {
@@ -123,7 +121,6 @@ class ShowController extends Controller
      * @param  TransactionGroup  $transactionGroup
      *
      * @return JsonResponse
-
      */
     public function show(TransactionGroup $transactionGroup): JsonResponse
     {

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

@@ -70,7 +70,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroy(TransactionCurrency $currency): JsonResponse
     {

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

@@ -41,7 +41,6 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AccountTransformer;
@@ -67,6 +66,7 @@ class ListController extends Controller
     use TransactionFilter;
 
     private CurrencyRepositoryInterface $repository;
+
     /**
      * CurrencyRepository constructor.
      *
@@ -95,7 +95,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
     {
@@ -149,7 +148,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function availableBudgets(TransactionCurrency $currency): JsonResponse
     {
@@ -188,7 +186,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function bills(TransactionCurrency $currency): JsonResponse
     {
@@ -232,7 +229,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function budgetLimits(TransactionCurrency $currency): JsonResponse
     {
@@ -267,7 +263,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function recurrences(TransactionCurrency $currency): JsonResponse
     {
@@ -320,7 +315,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function rules(TransactionCurrency $currency): JsonResponse
     {
@@ -374,7 +368,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, TransactionCurrency $currency): JsonResponse
     {

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

@@ -75,7 +75,6 @@ class ShowController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function index(): JsonResponse
     {
@@ -111,7 +110,6 @@ class ShowController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function show(TransactionCurrency $currency): JsonResponse
     {
@@ -137,7 +135,6 @@ class ShowController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function showDefault(): JsonResponse
     {

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

@@ -29,7 +29,6 @@ use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
@@ -76,7 +75,6 @@ class UpdateController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function disable(TransactionCurrency $currency): JsonResponse
     {
@@ -109,7 +107,6 @@ class UpdateController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function makeDefault(TransactionCurrency $currency): JsonResponse
     {
@@ -142,7 +139,6 @@ class UpdateController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      * @throws JsonException
-
      */
     public function enable(TransactionCurrency $currency): JsonResponse
     {

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

@@ -65,7 +65,6 @@ class DestroyController extends Controller
      * @param  TransactionJournalLink  $link
      *
      * @return JsonResponse
-
      */
     public function destroy(TransactionJournalLink $link): JsonResponse
     {

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

@@ -73,7 +73,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(Request $request): JsonResponse
     {
@@ -114,7 +113,6 @@ class ShowController extends Controller
      * @param  TransactionJournalLink  $journalLink
      *
      * @return JsonResponse
-
      */
     public function show(TransactionJournalLink $journalLink): JsonResponse
     {

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

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\LinkType;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -76,7 +75,6 @@ class ListController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function transactions(Request $request, LinkType $linkType): JsonResponse
     {

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

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\LinkType;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\LinkTypeTransformer;
 use FireflyIII\User;
@@ -74,7 +73,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -110,7 +108,6 @@ class ShowController extends Controller
      * @param  LinkType  $linkType
      *
      * @return JsonResponse
-
      */
     public function show(LinkType $linkType): JsonResponse
     {

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

@@ -360,7 +360,9 @@ class BasicController extends Controller
         /** @var NetWorthInterface $netWorthHelper */
         $netWorthHelper = app(NetWorthInterface::class);
         $netWorthHelper->setUser($user);
-        $allAccounts = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]);
+        $allAccounts = $this->accountRepository->getActiveAccountsByType(
+            [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]
+        );
 
         // filter list on preference of being included.
         $filtered = $allAccounts->filter(

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

@@ -33,7 +33,6 @@ use League\Fractal\Resource\Item;
 /**
  * Returns basic information about this installation.
  *
-
  * Class AboutController.
  */
 class AboutController extends Controller

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

@@ -61,7 +61,9 @@ class ConfigurationController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getConfiguration
      *
      * @return JsonResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function index(): JsonResponse
     {
@@ -96,7 +98,6 @@ class ConfigurationController extends Controller
      * Get all config values.
      *
      * @return array
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
@@ -136,7 +137,9 @@ class ConfigurationController extends Controller
      * @param  string  $configKey
      *
      * @return JsonResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function show(string $configKey): JsonResponse
     {
@@ -171,7 +174,9 @@ class ConfigurationController extends Controller
      * @param  string  $name
      *
      * @return JsonResponse
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function update(UpdateRequest $request, string $name): JsonResponse
     {

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

@@ -72,7 +72,6 @@ class UserController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroy(User $user): JsonResponse
     {
@@ -98,7 +97,6 @@ class UserController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -135,7 +133,6 @@ class UserController extends Controller
      * @param  User  $user
      *
      * @return JsonResponse
-
      */
     public function show(User $user): JsonResponse
     {

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

@@ -52,7 +52,6 @@ class PreferencesController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {
@@ -85,7 +84,6 @@ class PreferencesController extends Controller
      * @param  Preference  $preference
      *
      * @return JsonResponse
-
      */
     public function show(Preference $preference): JsonResponse
     {

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

@@ -45,7 +45,6 @@ class AttemptController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

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

@@ -40,7 +40,6 @@ class DestroyController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {
@@ -64,7 +63,6 @@ class DestroyController extends Controller
      * @param  Webhook  $webhook
      *
      * @return JsonResponse
-
      */
     public function destroy(Webhook $webhook): JsonResponse
     {
@@ -86,7 +84,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroyAttempt(Webhook $webhook, WebhookMessage $message, WebhookAttempt $attempt): JsonResponse
     {
@@ -114,7 +111,6 @@ class DestroyController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function destroyMessage(Webhook $webhook, WebhookMessage $message): JsonResponse
     {

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

@@ -41,7 +41,6 @@ class MessageController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

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

@@ -24,9 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Webhook;
 
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Events\RequestedSendWebhookMessages;
-use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
 use FireflyIII\Models\TransactionGroup;
@@ -49,7 +47,6 @@ class ShowController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {
@@ -72,7 +69,6 @@ class ShowController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-
      */
     public function index(): JsonResponse
     {

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

@@ -39,7 +39,6 @@ class StoreController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

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

@@ -37,7 +37,6 @@ class SubmitController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {
@@ -59,7 +58,6 @@ class SubmitController extends Controller
      * @param  Webhook  $webhook
      *
      * @return JsonResponse
-
      */
     public function submit(Webhook $webhook): JsonResponse
     {

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

@@ -39,7 +39,6 @@ class UpdateController extends Controller
     private WebhookRepositoryInterface $repository;
 
     /**
-
      */
     public function __construct()
     {

app/Api/V1/Requests/Data/DestroyRequest.php

@@ -53,7 +53,8 @@ class DestroyRequest extends FormRequest
     public function rules(): array
     {
         $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'.
-                 ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers';
+                 ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'.
+                 ',not_assets_liabilities';
 
         return [
             'objects' => sprintf('required|min:1|string|in:%s', $valid),

app/Api/V1/Requests/Data/Export/ExportRequest.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data\Export;
 
-use Carbon\Carbon;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;

app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php

@@ -29,7 +29,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
-
  * Class StoreRequest
  */
 class StoreRequest extends FormRequest

app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php

@@ -30,7 +30,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
-
  * Class UpdateRequest
  */
 class UpdateRequest extends FormRequest

app/Api/V1/Requests/System/CronRequest.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\System;
 
-use Carbon\Carbon;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 

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

@@ -32,6 +32,8 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
 use Illuminate\Http\JsonResponse;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class AccountController
@@ -62,6 +64,8 @@ class AccountController extends Controller
      *
      * @param  DateRequest  $request
      * @return JsonResponse
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function dashboard(DateRequest $request): JsonResponse
     {

app/Api/V2/Controllers/Model/Account/ShowController.php

@@ -37,8 +37,6 @@ class ShowController extends Controller
 {
     /**
      * TODO this endpoint is not yet reachable.
-     * @param  Account  $account
-     * @return JsonResponse
      */
     public function show(Request $request, Account $account): JsonResponse
     {

app/Api/V2/Controllers/Model/Budget/ShowController.php

@@ -57,8 +57,6 @@ class ShowController extends Controller
      * This endpoint is documented at:
      * TODO add URL
      *
-     * @param  DateRequest  $request
-     * @return JsonResponse
      */
     public function budgeted(DateRequest $request, Budget $budget): JsonResponse
     {
@@ -73,8 +71,6 @@ class ShowController extends Controller
      * This endpoint is documented at:
      * TODO add URL
      *
-     * @param  DateRequest  $request
-     * @return JsonResponse
      */
     public function spent(DateRequest $request, Budget $budget): JsonResponse
     {

app/Api/V2/Controllers/Model/BudgetLimit/ListController.php

@@ -50,7 +50,6 @@ class ListController extends Controller
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/listBudgetLimitByBudget
-     * @return JsonResponse
      */
     public function index(DateRequest $request, Budget $budget): JsonResponse
     {

app/Api/V2/Controllers/NetWorthController.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V2\Controllers;
 
 use FireflyIII\Api\V2\Request\Generic\SingleDateRequest;
 use FireflyIII\Helpers\Report\NetWorthInterface;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
 use Illuminate\Http\JsonResponse;
 

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -94,6 +94,8 @@ class CorrectOpeningBalanceCurrencies extends Command
      * @param  TransactionJournal  $journal
      *
      * @return int
+     * @throws FireflyException
+     * @throws JsonException
      */
     private function correctJournal(TransactionJournal $journal): int
     {

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -27,7 +27,6 @@ use Exception;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Database\QueryException;
 use Log;
 use stdClass;
 

app/Console/Commands/Correction/DeleteZeroAmount.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Database\QueryException;
 
 /**
  * Class DeleteZeroAmount

app/Console/Commands/Correction/FixAccountTypes.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
+use JsonException;
 use Log;
 
 /**
@@ -166,6 +167,7 @@ class FixAccountTypes extends Command
      * @param  Transaction  $dest
      *
      * @throws FireflyException
+     * @throws JsonException
      */
     private function fixJournal(TransactionJournal $journal, string $type, Transaction $source, Transaction $dest): void
     {

app/Console/Commands/DecryptDatabase.php

@@ -90,6 +90,8 @@ class DecryptDatabase extends Command
     /**
      * @param  string  $table
      * @param  array  $fields
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     private function decryptTable(string $table, array $fields): void
     {

app/Console/Commands/Tools/Cron.php

@@ -33,6 +33,8 @@ use FireflyIII\Support\Cronjobs\RecurringCronjob;
 use Illuminate\Console\Command;
 use InvalidArgumentException;
 use Log;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class Cron
@@ -124,7 +126,6 @@ class Cron extends Command
     /**
      * @param  bool  $force
      * @param  Carbon|null  $date
-     * @throws FireflyException
      */
     private function exchangeRatesCronJob(bool $force, ?Carbon $date): void
     {
@@ -152,7 +153,9 @@ class Cron extends Command
      * @param  bool  $force
      * @param  Carbon|null  $date
      *
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     private function recurringCronJob(bool $force, ?Carbon $date): void
     {
@@ -207,6 +210,8 @@ class Cron extends Command
      * @param  bool  $force
      * @param  Carbon|null  $date
      * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     private function billWarningCronJob(bool $force, ?Carbon $date): void
     {

app/Console/Commands/Upgrade/AccountCurrencies.php

@@ -66,7 +66,9 @@ class AccountCurrencies extends Command
      * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon the account.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -110,7 +112,6 @@ class AccountCurrencies extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php

@@ -50,7 +50,9 @@ class AppendBudgetLimitPeriods extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -73,7 +75,6 @@ class AppendBudgetLimitPeriods extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/BackToJournals.php

@@ -58,7 +58,9 @@ class BackToJournals extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -86,6 +88,8 @@ class BackToJournals extends Command
 
     /**
      * @return bool
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     private function isMigrated(): bool
     {
@@ -96,7 +100,6 @@ class BackToJournals extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/BudgetLimitCurrency.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Console\Command;
-use JsonException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -53,8 +52,9 @@ class BudgetLimitCurrency extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
-     * @throws JsonException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -100,7 +100,6 @@ class BudgetLimitCurrency extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/CCLiabilities.php

@@ -54,7 +54,9 @@ class CCLiabilities extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -97,7 +99,6 @@ class CCLiabilities extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/MigrateAttachments.php

@@ -54,7 +54,9 @@ class MigrateAttachments extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -106,7 +108,6 @@ class MigrateAttachments extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/MigrateJournalNotes.php

@@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournalMeta;
 use Illuminate\Console\Command;
-use Illuminate\Database\QueryException;
 use Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -55,7 +54,9 @@ class MigrateJournalNotes extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -102,7 +103,6 @@ class MigrateJournalNotes extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php

@@ -56,8 +56,10 @@ class MigrateRecurrenceMeta extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
      * @throws JsonException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -86,7 +88,6 @@ class MigrateRecurrenceMeta extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/MigrateRecurrenceType.php

@@ -55,7 +55,9 @@ class MigrateRecurrenceType extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -78,7 +80,6 @@ class MigrateRecurrenceType extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/MigrateTagLocations.php

@@ -54,7 +54,9 @@ class MigrateTagLocations extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -75,7 +77,6 @@ class MigrateTagLocations extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/MigrateToGroups.php

@@ -72,7 +72,9 @@ class MigrateToGroups extends Command
      * Execute the console command.
      *
      * @return int
-     * @throws Exception
+     * @throws ContainerExceptionInterface
+     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -130,7 +132,6 @@ class MigrateToGroups extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/MigrateToRules.php

@@ -68,7 +68,9 @@ class MigrateToRules extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -121,7 +123,6 @@ class MigrateToRules extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php

@@ -67,7 +67,9 @@ class OtherCurrenciesCorrections extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -110,7 +112,6 @@ class OtherCurrenciesCorrections extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/RenameAccountMeta.php

@@ -52,7 +52,9 @@ class RenameAccountMeta extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -100,7 +102,6 @@ class RenameAccountMeta extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/TransactionIdentifier.php

@@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Log;
@@ -68,7 +67,9 @@ class TransactionIdentifier extends Command
      * think. So each set gets a number (1,2,3) to keep them apart.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -121,7 +122,6 @@ class TransactionIdentifier extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php

@@ -138,7 +138,6 @@ class TransferCurrenciesCorrections extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
@@ -238,7 +237,6 @@ class TransferCurrenciesCorrections extends Command
      * @param  TransactionJournal  $transfer
      *
      * @return bool
-
      */
     private function isSplitJournal(TransactionJournal $transfer): bool
     {
@@ -263,7 +261,6 @@ class TransferCurrenciesCorrections extends Command
      * @param  TransactionJournal  $transfer
      *
      * @return Transaction|null
-
      */
     private function getSourceTransaction(TransactionJournal $transfer): ?Transaction
     {
@@ -313,7 +310,6 @@ class TransferCurrenciesCorrections extends Command
      * @param  TransactionJournal  $transfer
      *
      * @return Transaction|null
-
      */
     private function getDestinationTransaction(TransactionJournal $transfer): ?Transaction
     {
@@ -324,7 +320,6 @@ class TransferCurrenciesCorrections extends Command
      * Is either the source or destination transaction NULL?
      *
      * @return bool
-
      */
     private function isEmptyTransactions(): bool
     {
@@ -335,7 +330,6 @@ class TransferCurrenciesCorrections extends Command
 
     /**
      * @return bool
-
      */
     private function isNoCurrencyPresent(): bool
     {

app/Console/Commands/Upgrade/UpgradeLiabilities.php

@@ -60,7 +60,9 @@ class UpgradeLiabilities extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -82,7 +84,6 @@ class UpgradeLiabilities extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php

@@ -62,7 +62,9 @@ class UpgradeLiabilitiesEight extends Command
      * Execute the console command.
      *
      * @return int
+     * @throws ContainerExceptionInterface
      * @throws FireflyException
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -83,7 +85,6 @@ class UpgradeLiabilitiesEight extends Command
 
     /**
      * @return bool
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
@@ -158,82 +159,6 @@ class UpgradeLiabilitiesEight extends Command
         Log::debug(sprintf('Done upgrading liability #%d ("%s")', $account->id, $account->name));
     }
 
-    /**
-     * @param $account
-     * @return int
-     */
-    private function deleteTransactions($account): int
-    {
-        $count    = 0;
-        $journals = TransactionJournal::leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                      ->where('transactions.account_id', $account->id)->get(['transaction_journals.*']);
-        Log::debug(sprintf('Found %d journals to analyse.', $journals->count()));
-        /** @var TransactionJournal $journal */
-        foreach ($journals as $journal) {
-            $delete = false;
-            /** @var Transaction $source */
-            $source = $journal->transactions()->where('amount', '<', 0)->first();
-            /** @var Transaction $dest */
-            $dest = $journal->transactions()->where('amount', '>', 0)->first();
-
-            // if source is this liability and destination is expense, remove transaction.
-            // if source is revenue and destination is liability, remove transaction.
-            if ((int)$source->account_id === (int)$account->id && $dest->account->accountType->type === AccountType::EXPENSE) {
-                $delete = true;
-            }
-            if ((int)$dest->account_id === (int)$account->id && $source->account->accountType->type === AccountType::REVENUE) {
-                $delete = true;
-            }
-            if ($delete) {
-                Log::debug(
-                    sprintf(
-                        'Deleted %s journal #%d ("%s") (%s %s).',
-                        $journal->transactionType->type,
-                        $journal->id,
-                        $journal->description,
-                        $journal->transactionCurrency->code,
-                        $dest->amount
-                    )
-                );
-                $service = app(TransactionGroupDestroyService::class);
-                $service->destroy($journal->transactionGroup);
-                $count++;
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * @param  Account  $account
-     * @return void
-     */
-    private function deleteCreditTransaction(Account $account): void
-    {
-        Log::debug('Will delete credit transaction.');
-        $liabilityType    = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
-        $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                              ->where('transactions.account_id', $account->id)
-                                              ->where('transaction_journals.transaction_type_id', $liabilityType->id)
-                                              ->first(['transaction_journals.*']);
-        if (null !== $liabilityJournal) {
-            $group   = $liabilityJournal->transactionGroup;
-            $service = new TransactionGroupDestroyService();
-            $service->destroy($group);
-            Log::debug(sprintf('Deleted liability credit group #%d', $group->id));
-            return;
-        }
-        Log::debug('No liability credit journal found.');
-    }
-
-
-    /**
-     *
-     */
-    private function markAsExecuted(): void
-    {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
-    }
-
     /**
      * @param  Account  $account
      * @return bool
@@ -267,6 +192,28 @@ class UpgradeLiabilitiesEight extends Command
         return true;
     }
 
+    /**
+     * @param  Account  $account
+     * @return void
+     */
+    private function deleteCreditTransaction(Account $account): void
+    {
+        Log::debug('Will delete credit transaction.');
+        $liabilityType    = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
+        $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                              ->where('transactions.account_id', $account->id)
+                                              ->where('transaction_journals.transaction_type_id', $liabilityType->id)
+                                              ->first(['transaction_journals.*']);
+        if (null !== $liabilityJournal) {
+            $group   = $liabilityJournal->transactionGroup;
+            $service = new TransactionGroupDestroyService();
+            $service->destroy($group);
+            Log::debug(sprintf('Deleted liability credit group #%d', $group->id));
+            return;
+        }
+        Log::debug('No liability credit journal found.');
+    }
+
     /**
      * @param  Account  $account
      * @return void
@@ -295,4 +242,62 @@ class UpgradeLiabilitiesEight extends Command
         }
         Log::warning('Did not find opening balance.');
     }
+
+    /**
+     * @param $account
+     * @return int
+     */
+    private function deleteTransactions($account): int
+    {
+        $count    = 0;
+        $journals = TransactionJournal::leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                      ->where('transactions.account_id', $account->id)->get(['transaction_journals.*']);
+        Log::debug(sprintf('Found %d journals to analyse.', $journals->count()));
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $delete = false;
+            /** @var Transaction $source */
+            $source = $journal->transactions()->where('amount', '<', 0)->first();
+            /** @var Transaction $dest */
+            $dest = $journal->transactions()->where('amount', '>', 0)->first();
+
+            // if source is this liability and destination is expense, remove transaction.
+            // if source is revenue and destination is liability, remove transaction.
+            if ((int)$source->account_id === (int)$account->id && $dest->account->accountType->type === AccountType::EXPENSE) {
+                $delete = true;
+            }
+            if ((int)$dest->account_id === (int)$account->id && $source->account->accountType->type === AccountType::REVENUE) {
+                $delete = true;
+            }
+
+            // overruled. No transaction will be deleted, ever.
+            // code is kept in place so i can revisit my reasoning.
+            $delete = false;
+
+            if ($delete) {
+                Log::debug(
+                    sprintf(
+                        'Deleted %s journal #%d ("%s") (%s %s).',
+                        $journal->transactionType->type,
+                        $journal->id,
+                        $journal->description,
+                        $journal->transactionCurrency->code,
+                        $dest->amount
+                    )
+                );
+                $service = app(TransactionGroupDestroyService::class);
+                $service->destroy($journal->transactionGroup);
+                $count++;
+            }
+        }
+        return $count;
+    }
+
+    /**
+     *
+     */
+    private function markAsExecuted(): void
+    {
+        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+    }
 }