Merge branch 'release/v6.0.17'

chore(deps): bump semver from 6.3.0 to 6.3.1

.ci/.env.ci

@@ -301,7 +301,6 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 USE_ENCRYPTION=false
-IS_HEROKU=false
 FIREFLY_III_LAYOUT=v1
 
 #

.ci/php-cs-fixer/.gitignore

@@ -1 +1,2 @@
 vendor
+.php-cs-fixer.cache

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

@@ -379,16 +379,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.16.0",
+            "version": "v3.21.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc"
+                "reference": "229b55b3eae4729a8e2a321441ba40fcb3720b86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/229b55b3eae4729a8e2a321441ba40fcb3720b86",
-                "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
+                "reference": "229b55b3eae4729a8e2a321441ba40fcb3720b86",
                 "shasum": ""
             },
             "require": {
@@ -398,7 +398,7 @@
                 "doctrine/lexer": "^2 || ^3",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^7.4 || ^8.0",
+                "php": "^8.0.1",
                 "sebastian/diff": "^4.0 || ^5.0",
                 "symfony/console": "^5.4 || ^6.0",
                 "symfony/event-dispatcher": "^5.4 || ^6.0",
@@ -463,7 +463,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.21.1"
             },
             "funding": [
                 {
@@ -471,7 +471,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-02T19:30:06+00:00"
+            "time": "2023-07-05T21:50:25+00:00"
         },
         {
             "name": "psr/cache",
@@ -677,16 +677,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "5.0.1",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02"
+                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/aae9a0a43bff37bd5d8d0311426c87bf36153f02",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
-                "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02",
+                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
                 "shasum": ""
             },
             "require": {
@@ -732,7 +732,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3"
             },
             "funding": [
                 {
@@ -740,27 +740,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T05:12:41+00:00"
+            "time": "2023-05-01T07:48:21+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.2.8",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b"
+                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/3582d68a64a86ec25240aaa521ec8bc2342b369b",
+                "url": "https://api.github.com/repos/symfony/console/zipball/8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
-                "reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b",
+                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/service-contracts": "^2.5|^3",
                 "symfony/string": "^5.4|^6.0"
             },
             "conflict": {
@@ -782,12 +782,6 @@
                 "symfony/process": "^5.4|^6.0",
                 "symfony/var-dumper": "^5.4|^6.0"
             },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -820,7 +814,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.2.8"
+                "source": "https://github.com/symfony/console/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -836,20 +830,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-29T21:42:15+00:00"
+            "time": "2023-05-29T12:49:39+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.2.1",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
                 "shasum": ""
             },
             "require": {
@@ -858,7 +852,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -887,7 +881,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.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -903,28 +897,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-01T10:25:55+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.2.8",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339"
+                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/04046f35fd7d72f9646e721fc2ecb8f9c67d3339",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
-                "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339",
+                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/event-dispatcher-contracts": "^2|^3"
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/service-contracts": "<2.5"
             },
             "provide": {
                 "psr/event-dispatcher-implementation": "1.0",
@@ -937,13 +932,9 @@
                 "symfony/error-handler": "^5.4|^6.0",
                 "symfony/expression-language": "^5.4|^6.0",
                 "symfony/http-foundation": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/service-contracts": "^2.5|^3",
                 "symfony/stopwatch": "^5.4|^6.0"
             },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -970,7 +961,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.8"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -986,33 +977,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-20T16:06:02+00:00"
+            "time": "2023-04-21T14:41:17+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.2.1",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd"
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "psr/event-dispatcher": "^1"
             },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -1049,7 +1037,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -1065,20 +1053,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-01T10:32:47+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.2.7",
+            "version": "v6.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "82b6c62b959f642d000456f08c6d219d749215b3"
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/82b6c62b959f642d000456f08c6d219d749215b3",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "reference": "82b6c62b959f642d000456f08c6d219d749215b3",
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
                 "shasum": ""
             },
             "require": {
@@ -1112,7 +1100,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.2.7"
+                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
             },
             "funding": [
                 {
@@ -1128,20 +1116,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-06-01T08:30:39+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.2.7",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb"
+                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/d9b01ba073c44cef617c7907ce2419f8d00d75e2",
-                "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb",
+                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2",
                 "shasum": ""
             },
             "require": {
@@ -1176,7 +1164,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.7"
+                "source": "https://github.com/symfony/finder/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -1192,25 +1180,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-16T09:57:23+00:00"
+            "time": "2023-04-02T01:25:41+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.2.7",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "aa0e85b53bbb2b4951960efd61d295907eacd629"
+                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/aa0e85b53bbb2b4951960efd61d295907eacd629",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd",
-                "reference": "aa0e85b53bbb2b4951960efd61d295907eacd629",
+                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "type": "library",
             "autoload": {
@@ -1243,7 +1231,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.2.7"
+                "source": "https://github.com/symfony/options-resolver/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -1259,7 +1247,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-05-12T14:21:09+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1755,16 +1743,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.2.8",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "75ed64103df4f6615e15a7fe38b8111099f47416"
+                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/75ed64103df4f6615e15a7fe38b8111099f47416",
+                "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628",
-                "reference": "75ed64103df4f6615e15a7fe38b8111099f47416",
+                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628",
                 "shasum": ""
             },
             "require": {
@@ -1796,7 +1784,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.2.8"
+                "source": "https://github.com/symfony/process/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -1812,20 +1800,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-09T16:20:02+00:00"
+            "time": "2023-05-19T08:06:44+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.2.1",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "a8c9cedf55f314f3a186041d19537303766df09a"
+                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a8c9cedf55f314f3a186041d19537303766df09a",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
-                "reference": "a8c9cedf55f314f3a186041d19537303766df09a",
+                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
                 "shasum": ""
             },
             "require": {
@@ -1835,13 +1823,10 @@
             "conflict": {
                 "ext-psr": "<1.1|>=2"
             },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -1881,7 +1866,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.2.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -1897,25 +1882,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-01T10:32:47+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.2.7",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f"
+                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
-                "reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
+                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/service-contracts": "^1|^2|^3"
+                "symfony/service-contracts": "^2.5|^3"
             },
             "type": "library",
             "autoload": {
@@ -1943,7 +1928,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.2.7"
+                "source": "https://github.com/symfony/stopwatch/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -1959,20 +1944,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-02-16T10:14:28+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.2.8",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef"
+                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
-                "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef",
+                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
                 "shasum": ""
             },
             "require": {
@@ -1983,13 +1968,13 @@
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.0"
+                "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
                 "symfony/error-handler": "^5.4|^6.0",
                 "symfony/http-client": "^5.4|^6.0",
                 "symfony/intl": "^6.2",
-                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
                 "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
@@ -2029,7 +2014,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.2.8"
+                "source": "https://github.com/symfony/string/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -2045,7 +2030,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-20T16:06:02+00:00"
+            "time": "2023-03-21T21:06:29+00:00"
         }
     ],
     "packages-dev": [],

.ci/phpcs.sh

@@ -30,7 +30,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # clean up php code
 cd $SCRIPT_DIR/php-cs-fixer
-composer update
+composer update --quiet
 rm -f .php-cs-fixer.cache
 PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
 cd $SCRIPT_DIR/..

.ci/phpmd.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+#
+# phpmd.sh
+# Copyright (c) 2023 james@firefly-iii.org
+#
+# This file is part of Firefly III (https://github.com/firefly-iii).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+cd $SCRIPT_DIR/phpmd
+composer update --quiet
+./vendor/bin/phpmd \
+  $SCRIPT_DIR/../app text phpmd.xml \
+  --exclude $SCRIPT_DIR/../app/resources/** \
+  --exclude $SCRIPT_DIR/../app/frontend/** \
+  --exclude $SCRIPT_DIR/../app/public/** \
+  --exclude $SCRIPT_DIR/../app/vendor/** \
+
+cd $SCRIPT_DIR/..
+
+exit 0

.ci/phpmd/.gitignore

@@ -0,0 +1 @@
+vendor

.ci/phpmd/composer.json

@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "phpmd/phpmd": "^2.13"
+    }
+}

.ci/phpmd/phpmd.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ phpmd.xml
+  ~ Copyright (c) 2023 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/>.
+  -->
+
+<ruleset name="pcsg-generated-ruleset"
+    xmlns="http://pmd.sf.net/ruleset/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+	<description>Bla bla</description>
+
+	<!--
+Commando vanuit firefly directory:
+phpmd database,app,tests html /gdrive-all/development/phpmd/phpmd.xml > public/report.html
+	-->
+
+	<!-- Import the entire controversial code rule set -->
+	<rule ref="rulesets/controversial.xml">
+		<exclude name="CamelCasePropertyName" />
+	</rule>
+
+	<!-- clean code -->
+	<rule ref="rulesets/codesize.xml" />
+	<rule ref="rulesets/design.xml" />
+	<rule ref="rulesets/naming.xml" />
+	<rule ref="rulesets/unusedcode.xml" />
+
+	<rule ref="rulesets/codesize.xml/CyclomaticComplexity">
+		<properties>
+			<property name="reportLevel" value="5"/>
+		</properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/NPathComplexity">
+		<properties>
+			<property name="minimum" value="128"/>
+		</properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
+		<properties>
+			<property name="minimum" value="40"/>
+		</properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/ExcessiveParameterList">
+		<properties>
+			<property name="minimum" value="5"/>
+		</properties>
+	</rule>
+
+	<!-- include clean code manually -->
+	<rule ref="rulesets/cleancode.xml/BooleanArgumentFlag" />
+	<rule ref="rulesets/cleancode.xml/ElseExpression" />
+
+	<!-- no this one -->
+	<!--<rule ref="rulesets/cleancode.xml/StaticAccess" />-->
+</ruleset>

.ci/phpunit.sh

@@ -59,3 +59,5 @@ fi
 
 # restore .env file
 mv $SCRIPT_DIR/../.env.backup $SCRIPT_DIR/../.env
+
+cd $SCRIPT_DIR/..

.deploy/heroku/.env.heroku

@@ -1,321 +0,0 @@
-# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
-# Never set it to "testing".
-APP_ENV=heroku
-
-# Set to true if you want to see debug information in error screens.
-APP_DEBUG=false
-
-# This should be your email address.
-# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
-SITE_OWNER=heroku@example.com
-
-# The encryption key for your sessions. Keep this very secure.
-# If you generate a new one all existing attachments must be considered LOST.
-# Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
-# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
-APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
-
-#
-# Firefly III will launch using this language (for new users and unauthenticated visitors)
-# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
-#
-# If text is still in English, remember that not everything may have been translated.
-DEFAULT_LANGUAGE=en_US
-
-# The locale defines how numbers are formatted.
-# by default this value is the same as whatever the language is.
-DEFAULT_LOCALE=equal
-
-# Change this value to your preferred time zone.
-# Example: Europe/Amsterdam
-# For a list of supported time zones, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-TZ=UTC
-
-# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
-# Set it to ** and reverse proxies work just fine.
-TRUSTED_PROXIES=**
-
-# The log channel defines where your log entries go to.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
-# A rotating log option is 'daily', creates 5 files that (surprise) rotate.
-# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
-
-# - Docker + versions <= 4.8.1.8 and before: use "stdout"
-# - Docker + versions >  4.8.1.8           : use "docker_out"
-# - Docker + versions >=  5.1.1            : use "stack"
-# - For everything else (als not Docker)   : use 'stack'
-
-LOG_CHANNEL=stdout
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=notice
-
-# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-# Use "pgsql" for PostgreSQL
-# Use "mysql" for MySQL and MariaDB.
-# Use "sqlite" for SQLite.
-DB_CONNECTION=pgsql
-
-
-# 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
-MYSQL_USE_SSL=false
-MYSQL_SSL_VERIFY_SERVER_CERT=true
-# You need to set at least of these options
-MYSQL_SSL_CAPATH=/etc/ssl/certs/
-MYSQL_SSL_CA=
-MYSQL_SSL_CERT=
-MYSQL_SSL_KEY=
-MYSQL_SSL_CIPHER=
-
-# PostgreSQL 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
-PGSQL_SSL_MODE=prefer
-PGSQL_SSL_ROOT_CERT=null
-PGSQL_SSL_CERT=null
-PGSQL_SSL_KEY=null
-PGSQL_SSL_CRL_FILE=null
-
-# If you're looking for performance improvements, you could install memcached.
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-# If you set either of these to 'redis', you might want to update these settings too
-# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
-# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
-
-# can be tcp, unix or http
-REDIS_SCHEME=tcp
-
-# use only when using 'unix' for REDIS_SCHEME. Leave empty otherwise.
-REDIS_PATH=
-
-# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
-REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
-
-REDIS_PASSWORD=null
-# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
-REDIS_DB="0"
-REDIS_CACHE_DB="1"
-
-# Cookie settings. Should not be necessary to change these.
-# If you use Docker or similar, you can set COOKIE_DOMAIN_FILE to set
-# the value from a file instead of from an environment variable
-COOKIE_PATH="/"
-COOKIE_DOMAIN=
-COOKIE_SECURE=false
-
-# If you want Firefly III to mail you, update these settings
-# For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MAIL_MAILER=log
-MAIL_HOST=null
-MAIL_PORT=2525
-MAIL_FROM=changeme@example.com
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-# Other mail drivers:
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-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
-
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MANDRILL_SECRET=
-SPARKPOST_SECRET=
-
-
-# Firefly III can send you the following messages
-SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=true
-
-# These messages contain (sensitive) transaction information:
-SEND_REPORT_JOURNALS=true
-
-# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-MAPBOX_API_KEY=
-
-# The map will default to this location:
-MAP_DEFAULT_LAT=51.983333
-MAP_DEFAULT_LONG=5.916667
-MAP_DEFAULT_ZOOM=6
-
-# Firefly III currently supports two provider for live Currency Exchange Rates:
-# "fixer", and "ratesapi".
-# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
-# built compatible with Fixer.IO, based on data published by European Central Bank, and doesn't require API key.
-CER_PROVIDER=ratesapi
-
-# If you have select "fixer" as default currency exchange rates,
-# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
-# the free API up to the point where you might as well offer nothing.
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-FIXER_API_KEY=
-
-# Firefly III has two options for user authentication. "eloquent" is the default,
-# and "ldap" for LDAP servers.
-# For full instructions on these settings please visit:
-# https://docs.firefly-iii.org/advanced-installation/authentication
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-LOGIN_PROVIDER=eloquent
-
-#
-# It's also possible to change the way users are authenticated. You could use Authelia for example.
-# Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard".
-#
-# If you do this please read the documentation for instructions and warnings:
-# https://docs.firefly-iii.org/advanced-installation/authentication
-#
-# This function is available in Firefly III v5.3.0 and higher.
-AUTHENTICATION_GUARD=web
-
-#
-# Likewise, it's impossible to log out users who's authentication is handled by an external system.
-# Enter a custom URL here that will force a logout (your authentication provider can tell you).
-# Setting this variable only works when AUTHENTICATION_GUARD != web
-#
-CUSTOM_LOGOUT_URL=
-
-# LDAP connection configuration
-# OpenLDAP, FreeIPA or ActiveDirectory
-# # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-ADLDAP_CONNECTION_SCHEME=OpenLDAP
-ADLDAP_AUTO_CONNECT=true
-
-# LDAP connection settings
-# You can set the following variables from a file by appending them with _FILE:
-# ADLDAP_CONTROLLERS, ADLDAP_PORT, ADLDAP_BASEDN
-ADLDAP_CONTROLLERS=
-ADLDAP_PORT=389
-ADLDAP_TIMEOUT=5
-ADLDAP_BASEDN=""
-ADLDAP_FOLLOW_REFFERALS=false
-
-# SSL/TLS settings
-ADLDAP_USE_SSL=false
-ADLDAP_USE_TLS=false
-ADLDAP_SSL_CACERTDIR=
-ADLDAP_SSL_CACERTFILE=
-ADLDAP_SSL_CERTFILE=
-ADLDAP_SSL_KEYFILE=
-ADLDAP_SSL_CIPHER_SUITE=
-ADLDAP_SSL_REQUIRE_CERT=
-
-# You can set the following variables from a file by appending them with _FILE:
-ADLDAP_ADMIN_USERNAME=
-ADLDAP_ADMIN_PASSWORD=
-
-# You can set the following variables from a file by appending them with _FILE:
-ADLDAP_ACCOUNT_PREFIX=
-ADLDAP_ACCOUNT_SUFFIX=
-
-
-# LDAP authentication settings.
-ADLDAP_PASSWORD_SYNC=false
-ADLDAP_LOGIN_FALLBACK=false
-
-ADLDAP_DISCOVER_FIELD=distinguishedname
-ADLDAP_AUTH_FIELD=distinguishedname
-
-# Will allow SSO if your server provides an AUTH_USER field.
-# You can set the following variables from a file by appending them with _FILE:
-WINDOWS_SSO_ENABLED=false
-WINDOWS_SSO_DISCOVER=samaccountname
-WINDOWS_SSO_KEY=AUTH_USER
-
-# field to sync as local username.
-# You can set the following variable from a file by appending it with _FILE:
-ADLDAP_SYNC_FIELD=userprincipalname
-
-# You can disable the X-Frame-Options header if it interferes with tools like
-# Organizr. This is at your own risk. Applications running in frames run the risk
-# of leaking information to their parent frame.
-DISABLE_FRAME_HEADER=false
-
-# You can disable the Content Security Policy header when you're using an ancient browser
-# or any version of Microsoft Edge / Internet Explorer (which amounts to the same thing really)
-# This leaves you with the risk of not being able to stop XSS bugs should they ever surface.
-# This is at your own risk.
-DISABLE_CSP_HEADER=false
-
-# If you wish to track your own behavior over Firefly III, set valid analytics tracker information here.
-# Nobody uses this except for me on the demo site. But hey, feel free to use this if you want to.
-# Do not prepend the TRACKER_URL with http:// or https://
-# The only tracker supported is Matomo.
-# You can set the following variables from a file by appending them with _FILE:
-TRACKER_SITE_ID=
-TRACKER_URL=
-
-# You can fine tune the start-up of a Docker container by editing these environment variables.
-# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
-# However if you know what you're doing you can significantly speed up container start times.
-# Set each value to true to enable, or false to disable.
-
-# Check if the SQLite database exists. Can be skipped if you're not using SQLite.
-# Won't significantly speed up things.
-DKR_CHECK_SQLITE=true
-
-# Run database creation and migration commands. Disable this only if you're 100% sure the DB exists
-# and is up to date.
-DKR_RUN_MIGRATION=true
-
-# Run database upgrade commands. Disable this only when you're 100% sure your DB is up-to-date
-# with the latest fixes (outside of migrations!)
-DKR_RUN_UPGRADE=true
-
-# Verify database integrity. Includes all data checks and verifications.
-# Disabling this makes Firefly III assume your DB is intact.
-DKR_RUN_VERIFY=true
-
-# Run database reporting commands. When disabled, Firefly III won't go over your data to report current state.
-# Disabling this should have no impact on data integrity or safety but it won't warn you of possible issues.
-DKR_RUN_REPORT=true
-
-# Generate OAuth2 keys.
-# When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
-# you had previously generated keys already and they're stored in your database for restoration.
-DKR_RUN_PASSPORT_INSTALL=true
-
-# Leave the following configuration vars as is.
-# Unless you like to tinker and know what you're doing.
-APP_NAME=FireflyIII
-ADLDAP_CONNECTION=default
-BROADCAST_DRIVER=log
-QUEUE_DRIVER=sync
-CACHE_PREFIX=firefly
-SEARCH_RESULT_LIMIT=50
-PUSHER_KEY=
-PUSHER_SECRET=
-PUSHER_ID=
-DEMO_USERNAME=
-DEMO_PASSWORD=
-USE_ENCRYPTION=false
-IS_HEROKU=false
-FIREFLY_III_LAYOUT=v1
-
-#
-# If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.
-# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
-# This configuration value WILL NOT HELP.
-#
-# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
-# So when configuring anything WEB related this variable doesn't do anything. Nothing
-#
-# If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
-#
-APP_URL=http://localhost

.deploy/heroku/.locales

@@ -1,30 +0,0 @@
-bg_BG
-ca_ES
-cs_CZ
-da_DK
-de_DE
-el_GR
-en_GB
-en_US
-es_ES
-fi_FI
-fr_FR
-hu_HU
-id_ID
-it_IT
-ja_JP
-nb_NO
-nl_NL
-pl_PL
-pt_BR
-pt_PT
-ro_RO
-ru_RU
-sk_SK
-sl_SI
-sv_SE
-tr_TR
-uk_UA
-vi_VN
-zh-hans_CN
-zh-hant_CN

.env.example

@@ -62,7 +62,7 @@ APP_LOG_LEVEL=notice
 AUDIT_LOG_LEVEL=info
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
+# For other database types, please see the FAQ: https://docs.firefly-iii.org/firefly-iii/faq/self-hosted/#i-want-to-use-sqlite
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 # Use "pgsql" for PostgreSQL
 # Use "mysql" for MySQL and MariaDB.
@@ -134,7 +134,7 @@ COOKIE_SECURE=false
 COOKIE_SAMESITE=lax
 
 # If you want Firefly III to email you, update these settings
-# For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
+# For instructions, see: https://docs.firefly-iii.org/firefly-iii/advanced-installation/email/#email
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAIL_MAILER=log
 MAIL_HOST=null
@@ -143,6 +143,7 @@ MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_SENDMAIL_COMMAND=
 
 # Other mail drivers:
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
@@ -163,9 +164,8 @@ SEND_ERROR_MESSAGE=true
 # These messages contain (sensitive) transaction information:
 SEND_REPORT_JOURNALS=true
 
-# Set this value to true if you want to set the location
+# Set this value to true if you want to set the location of certain things, like transactions.
-# of certain things, like transactions. Since this involves an external service, it's optional
+# Since this involves an external service, it's optional and disabled by default.
-# and disabled by default.
 ENABLE_EXTERNAL_MAP=false
 
 # Set this value to true if you want Firefly III to download currency exchange rates
@@ -188,7 +188,7 @@ MAP_DEFAULT_ZOOM=6
 # - 'web' (default, uses built in DB)
 # - 'remote_user_guard' for Authelia etc
 # Read more about these settings in the documentation.
-# https://docs.firefly-iii.org/advanced-installation/authentication
+# https://docs.firefly-iii.org/firefly-iii/advanced-installation/authentication
 #
 # LDAP is no longer supported :(
 #
@@ -241,7 +241,7 @@ ALLOW_WEBHOOKS=false
 #
 # The static cron job token can be useful when you use Docker and wish to manage cron jobs.
 # 1. Set this token to any 32-character value (this is important!).
-# 2. Use this token in the cron URL instead of a user's command line token.
+# 2. Use this token in the cron URL instead of a user's command line token that you can find in /profile
 #
 # For more info: https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/
 #
@@ -298,7 +298,6 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_HEROKU=false
 FIREFLY_III_LAYOUT=v1
 
 #

.github/code_of_conduct.md

@@ -2,7 +2,10 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making
+participation in our project and our community a harassment-free experience for everyone, regardless of age, body size,
+disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
 
 ## Our Standards
 
@@ -24,23 +27,35 @@ Examples of unacceptable behavior by participants include:
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take
+appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits,
+issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the
+project or its community. Examples of representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed representative at an online or offline
+event. Representation of a project may be further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at james@firefly-iii.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at
+james@firefly-iii.org. The project team will review and investigate all complaints, and will respond in a way that it
+deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the
+reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent
+repercussions as determined by other members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available
+at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
+
 [version]: http://contributor-covenant.org/version/1/4/

.github/contributing.md

@@ -1,3 +1,3 @@
-# [Contributing guidelines](https://docs.firefly-iii.org/other-pages/contributing)
+# [Contributing guidelines](https://docs.firefly-iii.org/firefly-iii/support/#contributing-code)
 
-[Contributing guidelines](https://docs.firefly-iii.org/other-pages/contributing)
+[Contributing guidelines](https://docs.firefly-iii.org/firefly-iii/support/#contributing-code)

.github/its_you_not_me.md

@@ -2,9 +2,11 @@
 
 Sometimes bugs reported to Firefly III are configuration and system problems on the user's side.
 
-If you run into any of the following problems, there's a good chance it's not a Firefly III issue, but a configuration issue.
+If you run into any of the following problems, there's a good chance it's not a Firefly III issue, but a configuration
+issue.
 
-- ⚠️ Firefly III can't connect to the database when starting or the password is wrong, even though you're sure it's correct.
+- ⚠️ Firefly III can't connect to the database when starting or the password is wrong, even though you're sure it's
+  correct.
 - ⚠️ Errors about a missing `APP_KEY` or other encryption/hash problems
 - ⚠️ You can't login due to `419` errors (page expired)
 - ⚠️ Any `500` error when starting Firefly III
@@ -13,4 +15,6 @@ If you run into any of the following problems, there's a good chance it's not a
 - ⚠️ Firefly III does not work behind your reverse proxy
 - ⚠️ You can't connect to the Data Importer due to 404's or authentication issues.
 
-If you run into an issue like this, please start a [discussion](https://github.com/firefly-iii/firefly-iii/discussions) or chat on [Gitter.im](https://gitter.im/firefly-iii/firefly-iii). There's a good chance it's not a bug but something we can fix rather quickly :+1:
+If you run into an issue like this, please start a [discussion](https://github.com/firefly-iii/firefly-iii/discussions)
+or chat on [Gitter.im](https://gitter.im/firefly-iii/firefly-iii). There's a good chance it's not a bug but something we
+can fix rather quickly :+1:

.github/support.md

@@ -9,7 +9,8 @@ First of all: thank you for reporting a bug instead of ditching the tool altoget
 1. Open bugs will have open issues, so search for one first.
 2. If your feature request is already there, vote on it with :+1: or :-1: reactions.
 3. Do NOT hijack old issues with the bug you found, open your own issue.
-4. If relevant, take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from your issue.
+4. If relevant, take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from your
+   issue.
 5. If relevant, read the [documentation](https://docs.firefly-iii.org/).
 
 Please follow these guidelines when opening new issues:
@@ -25,7 +26,8 @@ Only then [create a new issue](https://github.com/firefly-iii/firefly-iii/issues
 ## Issue closure and abandonment policy
 
 - Issues can be converted into discussions if it's not a bug or feature request.
-- Features that won't be implemented will be labelled "wontfix". [This isn't personal](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/).
+- Features that won't be implemented will be labelled "
+  wontfix". [This isn't personal](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/).
 - Issues can be closed if they're duplicates of other issues.
 - Issues can be closed if the answer is in the FAQ.
 - Issues will be closed automatically after 14 days.

.github/workflows/cleanup.yml

@@ -56,9 +56,12 @@ jobs:
             
             const workflows = [
               'cleanup.yml',
+              'closed-issues.yml',
               'depsreview.yaml',
               'laravel.yml',
               'lock.yml',
+              'qodana.yml',
+              'sonarcloud.yml',
               'stale.yml'
             ]
             

.github/workflows/closed-issues.yml

@@ -7,16 +7,16 @@ jobs:
   auto_comment:
     runs-on: ubuntu-latest
     steps:
-      -
+      - uses: aws-actions/closed-issue-message@v1
-        uses: aws-actions/closed-issue-message@v1
         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.
+            This issue is now 🔒 closed. Please be aware that closed issues are **not** watched.
             
-              - If the original bug is not actually fixed, please feel free to open a new issue. Please refer to this issue for clarity.
+            - If the original bug is not actually fixed, please feel free to open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose). Please refer to this issue for clarity.
-              - Follow-up questions can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
+            - Follow-up questions must be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
+            - Further replies to this issue will get **no response**.
             
-              Thank you for your consideration.
+            Thank you for your contributions.
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/qodana.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - develop
-  pull_request:
-    types: [ opened, synchronize, reopened ]
 jobs:
   qodana:
     runs-on: ubuntu-latest

.github/workflows/sonarcloud.yml

@@ -0,0 +1,47 @@
+name: Sonarcloud
+on:
+  pull_request: 
+  push:
+    branches:
+      - main
+      - develop
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP with Xdebug
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          coverage: xdebug
+
+      - name: Install Composer dependencies
+        run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
+
+      - name: Copy environment file
+        run: cp .env.example .env
+
+      - name: Generate app key
+        run: php artisan key:generate
+
+      - name: "Run tests with coverage"
+        run: composer coverage
+
+      - name: Fix code coverage paths
+        run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
+
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

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

app.json

@@ -1,65 +0,0 @@
-{
-  "name": "Firefly III",
-  "description": "A free and open source personal finances manager",
-  "repository": "https://github.com/firefly-iii/firefly-iii",
-  "website": "https://firefly-iii.org/",
-  "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/public/mstile-150x150.png",
-  "keywords": [
-    "finance",
-    "finances",
-    "manager",
-    "management",
-    "euro",
-    "dollar",
-    "laravel",
-    "money",
-    "currency",
-    "financials",
-    "financial",
-    "budgets",
-    "administration",
-    "tool",
-    "tooling",
-    "help",
-    "helper",
-    "assistant",
-    "planning",
-    "organizing",
-    "bills",
-    "personal finance",
-    "budgets",
-    "budgeting",
-    "budgeting tool",
-    "budgeting application",
-    "transactions",
-    "self hosted",
-    "self-hosted",
-    "transfers",
-    "management"
-  ],
-  "addons": [
-    {
-      "plan": "heroku-postgresql",
-      "options": {
-        "version": "12"
-      }
-    }
-  ],
-  "scripts": {
-    "postdeploy": "php artisan migrate:refresh --seed;php artisan firefly:instructions install"
-  },
-  "buildpacks": [
-    {
-      "url": "heroku/php"
-    },
-    {
-      "url": "https://github.com/heroku/heroku-buildpack-locale"
-    }
-  ],
-  "env": {
-    "APP_KEY": {
-      "description": "This key is used to create app cookies en secure attachments.",
-      "value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
-    }
-  }
-}

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

@@ -83,6 +83,7 @@ class AccountController extends Controller
 
         $return = [];
         $result = $this->repository->searchAccount((string)$query, $types, $data['limit']);
+        // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
         $defaultCurrency = app('amount')->getDefaultCurrency();
 
         /** @var Account $account */
@@ -92,7 +93,11 @@ class AccountController extends Controller
 
             if (in_array($account->accountType->type, $this->balanceTypes, true)) {
                 $balance         = app('steam')->balance($account, $date);
-                $nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false));
+                $nameWithBalance = sprintf(
+                    '%s (%s)',
+                    $account->name,
+                    app('amount')->formatAnything($currency, $balance, false)
+                );
             }
 
             $return[] = [
@@ -109,14 +114,14 @@ class AccountController extends Controller
         }
 
         // custom order.
-        $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
         usort(
             $return,
-            function ($a, $b) use ($order) {
+            function ($a, $b) {
-                $pos_a = array_search($a['type'], $order, true);
+                $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
-                $pos_b = array_search($b['type'], $order, true);
+                $posA  = array_search($a['type'], $order, true);
+                $posB  = array_search($b['type'], $order, true);
 
-                return $pos_a - $pos_b;
+                return $posA - $posB;
             }
         );
 

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

@@ -125,6 +125,7 @@ class AccountController extends Controller
                 'yAxisID'                 => 0, // 0, 1, 2
                 'entries'                 => [],
             ];
+            // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
             $currentStart = clone $start;
             $range        = app('steam')->balanceInRange($account, $start, clone $end);
             // 2022-10-11 this method no longer converts to float.

app/Api/V1/Controllers/Controller.php

@@ -110,7 +110,13 @@ abstract class Controller extends BaseController
                     $obj = Carbon::parse($date);
                 } catch (InvalidDateException | InvalidFormatException $e) {
                     // don't care
-                    app('log')->warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', substr($date, 0, 20), $e->getMessage()));
+                    app('log')->warning(
+                        sprintf(
+                            'Ignored invalid date "%s" in API controller parameter check: %s',
+                            substr($date, 0, 20),
+                            $e->getMessage()
+                        )
+                    );
                 }
             }
             $bag->set($field, $obj);
@@ -170,7 +176,6 @@ abstract class Controller extends BaseController
         return $bag;
     }
 
-
     /**
      * Method to help build URL's.
      *

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

@@ -279,6 +279,9 @@ class DestroyController extends Controller
         $tagRepository->destroyAll();
     }
 
+    /**
+     * @return void
+     */
     private function destroyObjectGroups(): void
     {
         /** @var ObjectGroupRepositoryInterface $repository */

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

@@ -29,6 +29,8 @@ use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class ExportController
@@ -74,6 +76,8 @@ class ExportController extends Controller
      *
      * @return LaravelResponse
      * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     private function returnExport(string $key): LaravelResponse
     {

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

@@ -37,12 +37,16 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Http\JsonResponse;
 
+/**
+ * Class PurgeController
+ */
 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

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

@@ -29,8 +29,8 @@ use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\AccountTransformer;
 use Illuminate\Http\JsonResponse;
-use League\Fractal\Resource\Item;
 use Illuminate\Support\Facades\Log;
+use League\Fractal\Resource\Item;
 use Preferences;
 
 /**

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

@@ -34,8 +34,8 @@ use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use League\Fractal\Resource\Item;
 use Illuminate\Support\Facades\Log;
+use League\Fractal\Resource\Item;
 
 /**
  * Class StoreController

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

@@ -96,6 +96,7 @@ class TriggerController extends Controller
             $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
         }
 
+
         // file the rule(s)
         $transactions = $ruleEngine->find();
         $count        = $transactions->count();
@@ -149,6 +150,7 @@ class TriggerController extends Controller
             $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
         }
 
+
         // fire the rule(s)
         $ruleEngine->fire();
 

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

@@ -35,9 +35,9 @@ use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
 use League\Fractal\Resource\Item;
-use Illuminate\Support\Facades\Log;
 use Validator;
 
 /**

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

@@ -32,8 +32,8 @@ use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use League\Fractal\Resource\Item;
 use Illuminate\Support\Facades\Log;
+use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

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

@@ -30,6 +30,9 @@ use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
+/**
+ * Class DestroyController
+ */
 class DestroyController extends Controller
 {
     private LinkTypeRepositoryInterface $repository;

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

@@ -37,6 +37,9 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class ShowController
+ */
 class ShowController extends Controller
 {
     private LinkTypeRepositoryInterface $repository;

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

@@ -35,6 +35,9 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class StoreController
+ */
 class StoreController extends Controller
 {
     use TransactionFilter;

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

@@ -34,6 +34,9 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class UpdateController
+ */
 class UpdateController extends Controller
 {
     private JournalRepositoryInterface  $journalRepository;

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

@@ -32,10 +32,9 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Pagination\LengthAwarePaginator;
-use JsonException;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountController
@@ -61,12 +60,12 @@ class AccountController extends Controller
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/search/searchAccounts
+     *
      * @param Request $request
      *
      * @return JsonResponse|Response
-     * @throws JsonException
      */
-    public function search(Request $request)
+    public function search(Request $request): JsonResponse | Response
     {
         Log::debug('Now in account search()');
         $manager = $this->getManager();

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

@@ -71,6 +71,8 @@ class TransactionController extends Controller
         $resource = new Collection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($groups));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+        $array = $manager->createData($resource)->toArray();
+
+        return response()->json($array)->header('Content-Type', self::CONTENT_TYPE);
     }
 }

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

@@ -240,44 +240,43 @@ class BasicController extends Controller
          * Since both this method and the chart use the exact same data, we can suffice
          * with calling the one method in the bill repository that will get this amount.
          */
-        $paidAmount   = $this->billRepository->getBillsPaidInRangePerCurrency($start, $end);
+        $paidAmount   = $this->billRepository->sumPaidInRange($start, $end);
-        $unpaidAmount = $this->billRepository->getBillsUnpaidInRangePerCurrency($start, $end);
+        $unpaidAmount = $this->billRepository->sumUnpaidInRange($start, $end);
+
         $return = [];
-        foreach ($paidAmount as $currencyId => $amount) {
+        /**
-            $amount   = bcmul($amount, '-1');
+         * @var array $info
-            $currency = $this->currencyRepos->find((int)$currencyId);
+         */
-            if (null === $currency) {
+        foreach ($paidAmount as $info) {
-                continue;
+            $amount   = bcmul($info['sum'], '-1');
-            }
             $return[] = [
-                'key'                     => sprintf('bills-paid-in-%s', $currency->code),
+                'key'                     => sprintf('bills-paid-in-%s', $info['code']),
-                'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $currency->symbol]),
+                'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $info['symbol']]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $currency->id,
+                'currency_id'             => $info['id'],
-                'currency_code'           => $currency->code,
+                'currency_code'           => $info['code'],
-                'currency_symbol'         => $currency->symbol,
+                'currency_symbol'         => $info['symbol'],
-                'currency_decimal_places' => $currency->decimal_places,
+                'currency_decimal_places' => $info['decimal_places'],
-                'value_parsed'            => app('amount')->formatAnything($currency, $amount, false),
+                'value_parsed'            => app('amount')->formatFlat($info['symbol'], $info['decimal_places'], $amount, false),
                 'local_icon'              => 'check',
                 'sub_title'               => '',
             ];
         }
 
-        foreach ($unpaidAmount as $currencyId => $amount) {
+        /**
-            $amount   = bcmul($amount, '-1');
+         * @var array $info
-            $currency = $this->currencyRepos->find((int)$currencyId);
+         */
-            if (null === $currency) {
+        foreach ($unpaidAmount as $info) {
-                continue;
+            $amount   = bcmul($info['sum'], '-1');
-            }
             $return[] = [
-                'key'                     => sprintf('bills-unpaid-in-%s', $currency->code),
+                'key'                     => sprintf('bills-unpaid-in-%s', $info['code']),
-                'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $currency->symbol]),
+                'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $info['symbol']]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $currency->id,
+                'currency_id'             => $info['id'],
-                'currency_code'           => $currency->code,
+                'currency_code'           => $info['code'],
-                'currency_symbol'         => $currency->symbol,
+                'currency_symbol'         => $info['symbol'],
-                'currency_decimal_places' => $currency->decimal_places,
+                'currency_decimal_places' => $info['decimal_places'],
-                'value_parsed'            => app('amount')->formatAnything($currency, $amount, false),
+                'value_parsed'            => app('amount')->formatFlat($info['symbol'], $info['decimal_places'], $amount, false),
                 'local_icon'              => 'calendar-o',
                 'sub_title'               => '',
             ];

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

@@ -138,7 +138,6 @@ class ConfigurationController extends Controller
      *
      * @return JsonResponse
      * @throws ContainerExceptionInterface
-     * @throws FireflyException
      * @throws NotFoundExceptionInterface
      */
     public function show(string $configKey): JsonResponse

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

@@ -28,6 +28,8 @@ use FireflyIII\Api\V1\Requests\System\CronRequest;
 use FireflyIII\Support\Http\Controllers\CronRunner;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class CronController
@@ -44,6 +46,8 @@ class CronController extends Controller
      * @param string      $token
      *
      * @return JsonResponse
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function cron(CronRequest $request, string $token): JsonResponse
     {
@@ -54,6 +58,10 @@ class CronController extends Controller
         $return                           = [];
         $return['recurring_transactions'] = $this->runRecurring($config['force'], $config['date']);
         $return['auto_budgets']           = $this->runAutoBudget($config['force'], $config['date']);
+        if (true === config('cer.enabled')) {
+            $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']);
+        }
+        $return['bill_warnings'] = $this->billWarningCronJob($config['force'], $config['date']);
 
         return response()->json($return);
     }

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

@@ -35,6 +35,9 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class MessageController
+ */
 class MessageController extends Controller
 {
     public const RESOURCE_KEY = 'webhook_messages';

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

@@ -122,10 +122,12 @@ class ShowController extends Controller
      *
      * @param Webhook          $webhook
      * @param TransactionGroup $group
+     *
      * @return JsonResponse
      */
     public function triggerTransaction(Webhook $webhook, TransactionGroup $group): JsonResponse
     {
+        app('log')->debug(sprintf('Now in triggerTransaction(%d, %d)', $webhook->id, $group->id));
         /** @var MessageGeneratorInterface $engine */
         $engine = app(MessageGeneratorInterface::class);
         $engine->setUser(auth()->user());
@@ -140,7 +142,9 @@ class ShowController extends Controller
         $engine->generateMessages();
 
         // trigger event to send them:
+        app('log')->debug('send event RequestedSendWebhookMessages');
         event(new RequestedSendWebhookMessages());
+
         return response()->json([], 204);
     }
 }

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

@@ -83,6 +83,7 @@ class MoveTransactionsRequest extends FormRequest
 
     /**
      * @param Validator $validator
+     *
      * @return void
      */
     private function validateMove(Validator $validator): void

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

@@ -30,9 +30,9 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\Api\Data\Bulk\ValidatesBulkTransactionQuery;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
 use JsonException;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class TransactionRequest

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

@@ -38,6 +38,9 @@ class ExportRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    /**
+     * @return array
+     */
     public function getAll(): array
     {
         $result     = [

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

@@ -33,7 +33,6 @@ use FireflyIII\Support\Request\AppendsLocationData;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class UpdateRequest
@@ -63,9 +62,9 @@ class UpdateRequest extends FormRequest
             'account_role'            => ['account_role', 'convertString'],
             'liability_type'          => ['liability_type', 'convertString'],
             'opening_balance'         => ['opening_balance', 'convertString'],
-            'opening_balance_date'    => ['opening_balance_date', 'date'],
+            'opening_balance_date'    => ['opening_balance_date', 'convertDateTime'],
             'cc_type'                 => ['credit_card_type', 'convertString'],
-            'cc_monthly_payment_date' => ['monthly_payment_date', 'convertString'],
+            'cc_monthly_payment_date' => ['monthly_payment_date', 'convertDateTime'],
             'notes'                   => ['notes', 'stringWithNewlines'],
             'interest'                => ['interest', 'convertString'],
             'interest_period'         => ['interest_period', 'convertString'],
@@ -77,6 +76,7 @@ class UpdateRequest extends FormRequest
             'liability_start_date'    => ['liability_start_date', 'date'],
         ];
         $data   = $this->getAllData($fields);
+
         return $this->appendLocationData($data, null);
     }
 

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

@@ -28,8 +28,8 @@ use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -105,8 +105,8 @@ class StoreRequest extends FormRequest
         $validator->after(
             static function (Validator $validator) {
                 $data = $validator->getData();
-                $min  = $data['amount_min'] ?? '0';
+                $min  = (string)($data['amount_min'] ?? '0');
-                $max  = $data['amount_max'] ?? '0';
+                $max  = (string)($data['amount_max'] ?? '0');
 
                 if (1 === bccomp($min, $max)) {
                     $validator->errors()->add('amount_min', (string)trans('validation.amount_min_over_max'));

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

@@ -79,9 +79,9 @@ class StoreRequest extends FormRequest
             'currency_code'      => 'exists:transaction_currencies,code',
             'notes'              => 'nullable|between:1,65536',
             // auto budget info
-            'auto_budget_type'   => 'in:reset,rollover,none',
+            'auto_budget_type'   => 'in:reset,rollover,adjusted,none',
-            'auto_budget_amount' => 'numeric|min:0|max:1000000000|required_if:auto_budget_type,reset|required_if:auto_budget_type,rollover',
+            'auto_budget_amount' => 'numeric|min:0|max:1000000000|required_if:auto_budget_type,reset|required_if:auto_budget_type,rollover|required_if:auto_budget_type,adjusted',
-            'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly|required_if:auto_budget_type,reset|required_if:auto_budget_type,rollover',
+            'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly|required_if:auto_budget_type,reset|required_if:auto_budget_type,rollover|required_if:auto_budget_type,adjusted',
         ];
     }
 

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

@@ -67,6 +67,7 @@ class UpdateRequest extends FormRequest
                 'none'     => 0,
                 'reset'    => 1,
                 'rollover' => 2,
+                'adjusted' => 3,
             ];
             $allData['auto_budget_type'] = $types[$allData['auto_budget_type']] ?? 0;
         }
@@ -88,7 +89,7 @@ class UpdateRequest extends FormRequest
             'name'                      => sprintf('between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id),
             'active'                    => [new IsBoolean()],
             'notes'                     => 'nullable|between:1,65536',
-            'auto_budget_type'          => 'in:reset,rollover,none',
+            'auto_budget_type'          => 'in:reset,rollover,adjusted,none',
             'auto_budget_currency_id'   => 'exists:transaction_currencies,id',
             'auto_budget_currency_code' => 'exists:transaction_currencies,code',
             'auto_budget_amount'        => 'min:0|max:1000000000',

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

@@ -52,8 +52,8 @@ class UpdateRequest extends FormRequest
             'account_id'         => ['account_id', 'convertInteger'],
             'targetamount'       => ['target_amount', 'convertString'],
             'current_amount'     => ['current_amount', 'convertString'],
-            'startdate'          => ['start_date', 'date'],
+            'startdate'          => ['start_date', 'convertDateTime'],
-            'targetdate'         => ['target_date', 'convertString'],
+            'targetdate'         => ['target_date', 'convertDateTime'],
             'notes'              => ['notes', 'stringWithNewlines'],
             'order'              => ['order', 'convertInteger'],
             'object_group_title' => ['object_group_title', 'convertString'],

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

@@ -57,8 +57,8 @@ class StoreRequest extends FormRequest
             'type'              => ['type', 'convertString'],
             'title'             => ['title', 'convertString'],
             'description'       => ['description', 'convertString'],
-            'first_date'        => ['first_date', 'date'],
+            'first_date'        => ['first_date', 'convertDateTime'],
-            'repeat_until'      => ['repeat_until', 'date'],
+            'repeat_until'      => ['repeat_until', 'convertDateTime'],
             'nr_of_repetitions' => ['nr_of_repetitions', 'convertInteger'],
             'apply_rules'       => ['apply_rules', 'boolean'],
             'active'            => ['active', 'boolean'],

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

@@ -58,8 +58,8 @@ class UpdateRequest extends FormRequest
         $fields       = [
             'title'             => ['title', 'convertString'],
             'description'       => ['description', 'convertString'],
-            'first_date'        => ['first_date', 'date'],
+            'first_date'        => ['first_date', 'convertDateTime'],
-            'repeat_until'      => ['repeat_until', 'date'],
+            'repeat_until'      => ['repeat_until', 'convertDateTime'],
             'nr_of_repetitions' => ['nr_of_repetitions', 'convertInteger'],
             'apply_rules'       => ['apply_rules', 'boolean'],
             'active'            => ['active', 'boolean'],
@@ -205,6 +205,11 @@ class UpdateRequest extends FormRequest
             function (Validator $validator) {
                 //$this->validateOneRecurrenceTransaction($validator);
                 //$this->validateOneRepetitionUpdate($validator);
+
+
+                /** @var Recurrence $recurrence */
+                $recurrence = $this->route()->parameter('recurrence');
+                $this->validateTransactionId($recurrence, $validator);
                 $this->validateRecurrenceRepetition($validator);
                 $this->validateRepetitionMoment($validator);
                 $this->validateForeignCurrencyInformation($validator);
@@ -212,4 +217,5 @@ class UpdateRequest extends FormRequest
             }
         );
     }
+
 }

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

@@ -35,8 +35,8 @@ use FireflyIII\Validation\CurrencyValidation;
 use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest

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

@@ -59,10 +59,10 @@ class UpdateRequest extends FormRequest
      * Get all data. Is pretty complex because of all the ??-statements.
      *
      * @return array
+     * @throws FireflyException
      */
     public function getAll(): array
     {
-
         Log::debug(sprintf('Now in %s', __METHOD__));
         $this->integerFields = [
             'order',
@@ -153,6 +153,7 @@ class UpdateRequest extends FormRequest
      * Get transaction data.
      *
      * @return array
+     * @throws FireflyException
      */
     private function getTransactionData(): array
     {
@@ -292,6 +293,7 @@ class UpdateRequest extends FormRequest
     /**
      * @param array $current
      * @param array $transaction
+     *
      * @return array
      */
     private function getFloatData(array $current, array $transaction): array
@@ -300,7 +302,7 @@ class UpdateRequest extends FormRequest
             if (array_key_exists($fieldName, $transaction)) {
                 $value = $transaction[$fieldName];
                 if (is_float($value)) {
-                    $current[$fieldName] = sprintf('%.24f', $value);
+                    $current[$fieldName] = sprintf('%.12f', $value);
                 }
                 if (!is_float($value)) {
                     $current[$fieldName] = (string)$value;
@@ -319,9 +321,10 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
+
         return [
             // basic fields for group:
-            'group_title'                           => 'between:1,1000',
+            'group_title'                           => 'between:1,1000|nullable',
             'apply_rules'                           => [new IsBoolean()],
 
             // transaction rules (in array for splits):
@@ -334,8 +337,8 @@ class UpdateRequest extends FormRequest
 
 
             // currency info
-            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id|nullable',
-            'transactions.*.currency_code'          => 'min:3|max:51|exists:transaction_currencies,code',
+            'transactions.*.currency_code'          => 'min:3|max:51|exists:transaction_currencies,code|nullable',
             'transactions.*.foreign_currency_id'    => 'nullable|numeric|exists:transaction_currencies,id',
             'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:51|exists:transaction_currencies,code',
 
@@ -355,9 +358,9 @@ class UpdateRequest extends FormRequest
             'transactions.*.destination_name'       => 'between:1,255|nullable',
 
             // budget, category, bill and piggy
-            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser()],
+            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
             'transactions.*.budget_name'            => ['between:1,255', 'nullable', new BelongsUser()],
-            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser()],
+            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
             'transactions.*.category_name'          => 'between:1,255|nullable',
             'transactions.*.bill_id'                => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
             'transactions.*.bill_name'              => ['between:1,255', 'nullable', new BelongsUser()],
@@ -365,7 +368,7 @@ class UpdateRequest extends FormRequest
             // other interesting fields
             'transactions.*.reconciled'             => [new IsBoolean()],
             'transactions.*.notes'                  => 'min:1|max:50000|nullable',
-            'transactions.*.tags'                   => 'between:0,255',
+            'transactions.*.tags'                   => 'between:0,255|nullable',
 
             // meta info fields
             'transactions.*.internal_reference'     => 'min:1|max:255|nullable',

app/Api/V1/Requests/User/PreferenceStoreRequest.php

@@ -27,6 +27,9 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
+/**
+ * Class PreferenceStoreRequest
+ */
 class PreferenceStoreRequest extends FormRequest
 {
     use ChecksLogin;

app/Api/V1/Requests/User/PreferenceUpdateRequest.php

@@ -28,6 +28,9 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
+/**
+ * Class PreferenceUpdateRequest
+ */
 class PreferenceUpdateRequest extends FormRequest
 {
     use ChecksLogin;

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

@@ -29,10 +29,9 @@ use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use JsonException;
 
@@ -43,8 +42,8 @@ class AccountController extends Controller
 {
     use AccountFilter;
 
-    private array                      $balanceTypes;
     private AdminAccountRepositoryInterface $adminRepository;
+    private array                           $balanceTypes;
     private AccountRepositoryInterface      $repository;
 
     /**
@@ -55,8 +54,6 @@ class AccountController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
                 $this->repository      = app(AccountRepositoryInterface::class);
                 $this->adminRepository = app(AdminAccountRepositoryInterface::class);
 
@@ -113,10 +110,10 @@ class AccountController extends Controller
         }
 
         // custom order.
-        $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
         usort(
             $return,
-            function ($a, $b) use ($order) {
+            function ($a, $b) {
+                $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
                 $pos_a = array_search($a['type'], $order, true);
                 $pos_b = array_search($b['type'], $order, true);
 

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

@@ -53,6 +53,7 @@ class AccountController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
+
                 return $next($request);
             }
         );
@@ -63,6 +64,7 @@ class AccountController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/charts/getChartAccountOverview
      *
      * @param DateRequest $request
+     *
      * @return JsonResponse
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface

app/Api/V2/Controllers/Controller.php

@@ -136,6 +136,7 @@ class Controller extends BaseController
      * @param string               $key
      * @param LengthAwarePaginator $paginator
      * @param AbstractTransformer  $transformer
+     *
      * @return array
      */
     final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
@@ -162,6 +163,7 @@ class Controller extends BaseController
      * @param string              $key
      * @param Model               $object
      * @param AbstractTransformer $transformer
+     *
      * @return array
      */
     final protected function jsonApiObject(string $key, Model $object, AbstractTransformer $transformer): array
@@ -174,6 +176,7 @@ class Controller extends BaseController
         $transformer->collectMetaData(new Collection([$object]));
 
         $resource = new Item($object, $transformer, $key);
+
         return $manager->createData($resource)->toArray();
     }
 }

app/Api/V2/Controllers/Model/Bill/SumController.php

@@ -48,6 +48,7 @@ class SumController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
+
                 return $next($request);
             }
         );
@@ -58,6 +59,7 @@ class SumController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/transactions-sum/getBillsPaidTrSum
      *
      * @param DateRequest $request
+     *
      * @return JsonResponse
      */
     public function paid(DateRequest $request): JsonResponse
@@ -75,6 +77,7 @@ class SumController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/transactions-sum/getBillsUnpaidTrSum
      *
      * @param DateRequest $request
+     *
      * @return JsonResponse
      */
     public function unpaid(DateRequest $request): JsonResponse

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

@@ -31,6 +31,9 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 
+/**
+ * Class ListController
+ */
 class ListController extends Controller
 {
     private BudgetRepositoryInterface $repository;
@@ -41,6 +44,7 @@ class ListController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BudgetRepositoryInterface::class);
+
                 return $next($request);
             }
         );
@@ -51,6 +55,7 @@ class ListController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/listBudgets
      *
      * @param Request $request
+     *
      * @return JsonResponse
      */
     public function index(Request $request): JsonResponse
@@ -61,6 +66,7 @@ class ListController extends Controller
 
         $paginator   = new LengthAwarePaginator($collection, $total, $this->pageSize, $this->parameters->get('page'));
         $transformer = new BudgetTransformer();
+
         return response()
             ->api($this->jsonApiList('budgets', $paginator, $transformer))
             ->header('Content-Type', self::CONTENT_TYPE);

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

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * ShowController.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,6 +21,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Model\Budget;
 
 use FireflyIII\Api\V2\Controllers\Controller;
@@ -42,12 +44,12 @@ class ShowController extends Controller
     /**
      *
      */
-    public function __construct()
+    public function __construct() {
-    {
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BudgetRepositoryInterface::class);
+
                 return $next($request);
             }
         );
@@ -58,8 +60,7 @@ class ShowController extends Controller
      * TODO add URL
      *
      */
-    public function budgeted(DateRequest $request, Budget $budget): JsonResponse
+    public function budgeted(DateRequest $request, Budget $budget): JsonResponse {
-    {
         $data      = $request->getAll();
         $result    = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));
@@ -72,8 +73,7 @@ class ShowController extends Controller
      * TODO add URL
      *
      */
-    public function spent(DateRequest $request, Budget $budget): JsonResponse
+    public function spent(DateRequest $request, Budget $budget): JsonResponse {
-    {
         $data      = $request->getAll();
         $result    = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));

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

@@ -48,6 +48,7 @@ class SumController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BudgetRepositoryInterface::class);
+
                 return $next($request);
             }
         );
@@ -58,6 +59,7 @@ class SumController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/getBudgetedForBudget
      *
      * @param DateRequest $request
+     *
      * @return JsonResponse
      */
     public function budgeted(DateRequest $request): JsonResponse
@@ -72,7 +74,9 @@ class SumController extends Controller
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/getSpentForBudget
+     *
      * @param DateRequest $request
+     *
      * @return JsonResponse
      */
     public function spent(DateRequest $request): JsonResponse

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

@@ -32,6 +32,9 @@ use FireflyIII\Transformers\V2\BudgetLimitTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 
+/**
+ * Class ListController
+ */
 class ListController extends Controller
 {
     private BudgetLimitRepositoryInterface $repository;
@@ -42,6 +45,7 @@ class ListController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BudgetLimitRepositoryInterface::class);
+
                 return $next($request);
             }
         );
@@ -60,6 +64,7 @@ class ListController extends Controller
 
         $paginator   = new LengthAwarePaginator($collection, $total, $this->pageSize, $this->parameters->get('page'));
         $transformer = new BudgetLimitTransformer();
+
         return response()
             ->api($this->jsonApiList('budget_limits', $paginator, $transformer))
             ->header('Content-Type', self::CONTENT_TYPE);

app/Api/V2/Controllers/NetWorthController.php

@@ -48,6 +48,7 @@ class NetWorthController extends Controller
             function ($request, $next) {
                 $this->netWorth = app(NetWorthInterface::class);
                 $this->netWorth->setUser(auth()->user());
+
                 return $next($request);
             }
         );
@@ -56,7 +57,9 @@ class NetWorthController extends Controller
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/net-worth/getNetWorth
+     *
      * @param SingleDateRequest $request
+     *
      * @return JsonResponse
      */
     public function get(SingleDateRequest $request): JsonResponse

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

@@ -24,6 +24,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Controllers\System;
 
+/**
+ * Class ConfigurationController
+ */
 class ConfigurationController
 {
 }

app/Api/V2/Controllers/System/DebugController.php

@@ -26,6 +26,9 @@ namespace FireflyIII\Api\V2\Controllers\System;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 
+/**
+ * Class DebugController
+ */
 class DebugController extends Controller
 {
 }

app/Api/V2/Controllers/System/PreferencesController.php

@@ -37,7 +37,9 @@ class PreferencesController extends Controller
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/preferences/getPreference
+     *
      * @param Preference $preference
+     *
      * @return JsonResponse
      */
     public function get(Preference $preference): JsonResponse

app/Api/V2/Controllers/Transaction/List/AccountController.php

@@ -46,6 +46,7 @@ class AccountController extends Controller
      *
      * @param ListRequest $request
      * @param Account     $account
+     *
      * @return JsonResponse
      */
     public function listTransactions(ListRequest $request, Account $account): JsonResponse

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -60,6 +60,7 @@ class AutocompleteRequest extends FormRequest
         $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
         /** @var User $user */
         $user = auth()->user();
+
         return [
             'types'             => $array,
             'query'             => $this->convertString('query'),

app/Api/V2/Response/Sum/AutoSum.php

@@ -25,12 +25,14 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Response\Sum;
 
 use Closure;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 
 /**
  * Class AutoSum
+ *
  * @deprecated
  */
 class AutoSum
@@ -39,7 +41,9 @@ class AutoSum
      * @param Collection $objects
      * @param Closure    $getCurrency
      * @param Closure    $getSum
+     *
      * @return array
+     * @throws FireflyException
      */
     public function autoSum(Collection $objects, Closure $getCurrency, Closure $getSum): array
     {
@@ -64,6 +68,6 @@ class AutoSum
         }
 
         var_dump(array_values($return));
-        exit;
+        throw new FireflyException('Not implemented');
     }
 }

app/Console/Commands/Correction/CorrectAmounts.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\AutoBudget;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\Bill;
@@ -39,22 +40,12 @@ use Illuminate\Console\Command;
  */
 class CorrectAmounts extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'This command makes sure positive and negative amounts are recorded correctly.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-amount-pos-neg';
 
     /**
-     * Execute the console command.
-     *
      * @return int
      */
     public function handle(): int
@@ -90,7 +81,8 @@ class CorrectAmounts extends Command
         $set   = AutoBudget::where('amount', '<', 0)->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All auto budget amounts are positive.');
+            $this->friendlyPositive('All auto budget amounts are positive.');
+
             return;
         }
         /** @var AutoBudget $item */
@@ -98,7 +90,7 @@ class CorrectAmounts extends Command
             $item->amount = app('steam')->positive((string)$item->amount);
             $item->save();
         }
-        $this->line(sprintf('Corrected %d auto budget amount(s).', $count));
+        $this->friendlyInfo(sprintf('Corrected %d auto budget amount(s).', $count));
     }
 
     /**
@@ -109,7 +101,8 @@ class CorrectAmounts extends Command
         $set   = AvailableBudget::where('amount', '<', 0)->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All available budget amounts are positive.');
+            $this->friendlyPositive('All available budget amounts are positive.');
+
             return;
         }
         /** @var AvailableBudget $item */
@@ -117,7 +110,7 @@ class CorrectAmounts extends Command
             $item->amount = app('steam')->positive((string)$item->amount);
             $item->save();
         }
-        $this->line(sprintf('Corrected %d available budget amount(s).', $count));
+        $this->friendlyInfo(sprintf('Corrected %d available budget amount(s).', $count));
     }
 
     /**
@@ -128,7 +121,8 @@ class CorrectAmounts extends Command
         $set   = Bill::where('amount_min', '<', 0)->orWhere('amount_max', '<', 0)->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All bill amounts are positive.');
+            $this->friendlyPositive('All bill amounts are positive.');
+
             return;
         }
         /** @var Bill $item */
@@ -137,6 +131,7 @@ class CorrectAmounts extends Command
             $item->amount_max = app('steam')->positive((string)$item->amount_max);
             $item->save();
         }
+        $this->friendlyInfo(sprintf('Corrected %d bill amount(s).', $count));
     }
 
     /**
@@ -147,7 +142,8 @@ class CorrectAmounts extends Command
         $set   = BudgetLimit::where('amount', '<', 0)->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All budget limit amounts are positive.');
+            $this->friendlyPositive('All budget limit amounts are positive.');
+
             return;
         }
         /** @var BudgetLimit $item */
@@ -155,7 +151,7 @@ class CorrectAmounts extends Command
             $item->amount = app('steam')->positive((string)$item->amount);
             $item->save();
         }
-        $this->line(sprintf('Corrected %d budget limit amount(s).', $count));
+        $this->friendlyInfo(sprintf('Corrected %d budget limit amount(s).', $count));
     }
 
     /**
@@ -166,7 +162,8 @@ class CorrectAmounts extends Command
         $set   = CurrencyExchangeRate::where('rate', '<', 0)->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All currency exchange rates are positive.');
+            $this->friendlyPositive('All currency exchange rates are positive.');
+
             return;
         }
         /** @var BudgetLimit $item */
@@ -174,7 +171,7 @@ class CorrectAmounts extends Command
             $item->rate = app('steam')->positive((string)$item->rate);
             $item->save();
         }
-        $this->line(sprintf('Corrected %d currency exchange rate(s).', $count));
+        $this->friendlyInfo(sprintf('Corrected %d currency exchange rate(s).', $count));
     }
 
     /**
@@ -185,7 +182,8 @@ class CorrectAmounts extends Command
         $set   = PiggyBankRepetition::where('currentamount', '<', 0)->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All piggy bank repetition amounts are positive.');
+            $this->friendlyPositive('All piggy bank repetition amounts are positive.');
+
             return;
         }
         /** @var PiggyBankRepetition $item */
@@ -193,7 +191,7 @@ class CorrectAmounts extends Command
             $item->currentamount = app('steam')->positive((string)$item->currentamount);
             $item->save();
         }
-        $this->line(sprintf('Corrected %d piggy bank repetition amount(s).', $count));
+        $this->friendlyInfo(sprintf('Corrected %d piggy bank repetition amount(s).', $count));
     }
 
     /**
@@ -204,7 +202,8 @@ class CorrectAmounts extends Command
         $set   = PiggyBank::where('targetamount', '<', 0)->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All piggy bank amounts are positive.');
+            $this->friendlyPositive('All piggy bank amounts are positive.');
+
             return;
         }
         /** @var PiggyBankRepetition $item */
@@ -212,7 +211,7 @@ class CorrectAmounts extends Command
             $item->targetamount = app('steam')->positive((string)$item->targetamount);
             $item->save();
         }
-        $this->line(sprintf('Corrected %d piggy bank amount(s).', $count));
+        $this->friendlyInfo(sprintf('Corrected %d piggy bank amount(s).', $count));
     }
 
     /**
@@ -225,7 +224,8 @@ class CorrectAmounts extends Command
                                       ->get();
         $count = $set->count();
         if (0 === $count) {
-            $this->info('Correct: All recurring transaction amounts are positive.');
+            $this->friendlyPositive('All recurring transaction amounts are positive.');
+
             return;
         }
         /** @var PiggyBankRepetition $item */
@@ -234,7 +234,7 @@ class CorrectAmounts extends Command
             $item->foreign_amount = app('steam')->positive((string)$item->foreign_amount);
             $item->save();
         }
-        $this->line(sprintf('Corrected %d recurring transaction amount(s).', $count));
+        $this->friendlyInfo(sprintf('Corrected %d recurring transaction amount(s).', $count));
     }
 
     /**
@@ -254,10 +254,11 @@ class CorrectAmounts extends Command
             }
         }
         if (0 === $fixed) {
-            $this->info('Correct: All rule trigger amounts are positive.');
+            $this->friendlyPositive('All rule trigger amounts are positive.');
+
             return;
         }
-        $this->line(sprintf('Corrected %d rule trigger amount(s).', $fixed));
+        $this->friendlyInfo(sprintf('Corrected %d rule trigger amount(s).', $fixed));
     }
 
 }

app/Console/Commands/Correction/CorrectDatabase.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use Artisan;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 use Schema;
 
@@ -34,17 +35,9 @@ use Schema;
  */
 class CorrectDatabase extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Will correct the integrity of your database, if necessary.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:correct-database';
 
     /**
@@ -52,10 +45,10 @@ class CorrectDatabase extends Command
      */
     public function handle(): int
     {
-        $this->line('Handle Firefly III database correction commands.');
         // if table does not exist, return false
         if (!Schema::hasTable('users')) {
-            $this->error('No "users"-table, will not continue.');
+            $this->friendlyError('No "users"-table, will not continue.');
+
             return 1;
         }
         $commands = [
@@ -83,10 +76,10 @@ class CorrectDatabase extends Command
             'firefly-iii:fix-frontpage-accounts',
             // new!
             'firefly-iii:unify-group-accounts',
-            'firefly-iii:trigger-credit-recalculation'
+            'firefly-iii:trigger-credit-recalculation',
         ];
         foreach ($commands as $command) {
-            $this->line(sprintf('Now executing command "%s"', $command));
+            $this->friendlyLine(sprintf('Now executing command "%s"', $command));
             $this->call($command);
         }
 

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
@@ -33,25 +33,16 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Console\Command;
-use JsonException;
+use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class CorrectOpeningBalanceCurrencies
  */
 class CorrectOpeningBalanceCurrencies extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Will make sure that opening balance transaction currencies match the account they\'re for.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-ob-currencies';
 
     /**
@@ -61,57 +52,55 @@ class CorrectOpeningBalanceCurrencies extends Command
      */
     public function handle(): int
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        $journals = $this->getJournals();
-        // get all OB journals:
-        $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                                 ->whereNull('transaction_journals.deleted_at')
-                                 ->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*']);
-
-        $this->line(sprintf('Going to verify %d opening balance transactions.', $set->count()));
         $count    = 0;
         /** @var TransactionJournal $journal */
-        foreach ($set as $journal) {
+        foreach ($journals as $journal) {
             $count += $this->correctJournal($journal);
         }
 
         if ($count > 0) {
             $message = sprintf('Corrected %d opening balance transaction(s).', $count);
-            Log::debug($message);
+            $this->friendlyInfo($message);
-            $this->line($message);
         }
         if (0 === $count) {
             $message = 'There was nothing to fix in the opening balance transactions.';
-            Log::debug($message);
+            $this->friendlyPositive($message);
-            $this->info($message);
         }
 
-        Log::debug(sprintf('Done with %s', __METHOD__));
-
         return 0;
     }
 
+    /**
+     * @return Collection
+     */
+    private function getJournals(): Collection
+    {
+        /** @var Collection */
+        return TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->whereNull('transaction_journals.deleted_at')
+                                 ->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*']);
+    }
+
     /**
      * @param TransactionJournal $journal
      *
      * @return int
-     * @throws FireflyException
-     * @throws JsonException
      */
     private function correctJournal(TransactionJournal $journal): int
     {
         // get the asset account for this opening balance:
         $account = $this->getAccount($journal);
         if (null === $account) {
-            $message = sprintf('Transaction journal #%d has no valid account. Cant fix this line.', $journal->id);
+            $message = sprintf('Transaction journal #%d has no valid account. Can\'t fix this line.', $journal->id);
             app('log')->warning($message);
-            $this->warn($message);
+            $this->friendlyError($message);
 
             return 0;
         }
-        $currency = $this->getCurrency($account);
 
         // update journal and all transactions:
-        return $this->setCurrency($journal, $currency);
+        return $this->setCorrectCurrency($account, $journal);
     }
 
     /**
@@ -130,33 +119,19 @@ class CorrectOpeningBalanceCurrencies extends Command
                 return $account;
             }
         }
+
         return null;
     }
 
     /**
      * @param Account            $account
-     *
-     * @return TransactionCurrency
-     * @throws JsonException
-     * @throws FireflyException
-     */
-    private function getCurrency(Account $account): TransactionCurrency
-    {
-        /** @var AccountRepositoryInterface $repos */
-        $repos = app(AccountRepositoryInterface::class);
-        $repos->setUser($account->user);
-
-        return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user);
-    }
-
-    /**
      * @param TransactionJournal $journal
-     * @param  TransactionCurrency  $currency
      *
      * @return int
      */
-    private function setCurrency(TransactionJournal $journal, TransactionCurrency $currency): int
+    private function setCorrectCurrency(Account $account, TransactionJournal $journal): int
     {
+        $currency = $this->getCurrency($account);
         $count    = 0;
         if ((int)$journal->transaction_currency_id !== (int)$currency->id) {
             $journal->transaction_currency_id = $currency->id;
@@ -175,4 +150,18 @@ class CorrectOpeningBalanceCurrencies extends Command
 
         return $count;
     }
+
+    /**
+     * @param Account $account
+     *
+     * @return TransactionCurrency
+     */
+    private function getCurrency(Account $account): TransactionCurrency
+    {
+        /** @var AccountRepositoryInterface $repos */
+        $repos = app(AccountRepositoryInterface::class);
+        $repos->setUser($account->user);
+
+        return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user);
+    }
 }

app/Console/Commands/Correction/CreateAccessTokens.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use Exception;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
@@ -33,6 +34,8 @@ use Illuminate\Console\Command;
  */
 class CreateAccessTokens extends Command
 {
+    use ShowsFriendlyMessages;
+
     /**
      * The console command description.
      *
@@ -58,7 +61,6 @@ class CreateAccessTokens extends Command
         /** @var UserRepositoryInterface $repository */
         $repository = app(UserRepositoryInterface::class);
 
-        $start = microtime(true);
         $count = 0;
         $users = $repository->all();
         /** @var User $user */
@@ -67,15 +69,13 @@ class CreateAccessTokens extends Command
             if (null === $pref) {
                 $token = $user->generateAccessToken();
                 app('preferences')->setForUser($user, 'access_token', $token);
-                $this->line(sprintf('Generated access token for user %s', $user->email));
+                $this->friendlyInfo(sprintf('Generated access token for user %s', $user->email));
                 ++$count;
             }
         }
         if (0 === $count) {
-            $this->info('All access tokens OK!');
+            $this->friendlyPositive('Verified access tokens.');
         }
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verify access tokens in %s seconds.', $end));
 
         return 0;
     }

app/Console/Commands/Correction/CreateLinkTypes.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\LinkType;
 use Illuminate\Console\Command;
 
@@ -31,6 +32,8 @@ use Illuminate\Console\Command;
  */
 class CreateLinkTypes extends Command
 {
+    use ShowsFriendlyMessages;
+
     /**
      * The console command description.
      *
@@ -51,7 +54,6 @@ class CreateLinkTypes extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
         $count = 0;
         $set   = [
             'Related'       => ['relates to', 'relates to'],
@@ -68,17 +70,14 @@ class CreateLinkTypes extends Command
                 $link->inward  = $values[1];
                 $link->outward = $values[0];
                 ++$count;
-                $this->line(sprintf('Created missing link type "%s"', $name));
+                $this->friendlyInfo(sprintf('Created missing link type "%s"', $name));
             }
             $link->editable = false;
             $link->save();
         }
         if (0 === $count) {
-            $this->info('All link types OK!');
+            $this->friendlyPositive('All link types are OK');
         }
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verified link types in %s seconds', $end));
-
         return 0;
     }
 }

app/Console/Commands/Correction/DeleteEmptyGroups.php

@@ -24,26 +24,18 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use Exception;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class DeleteEmptyGroups
  */
 class DeleteEmptyGroups extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Delete empty transaction groups.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:delete-empty-groups';
 
     /**
@@ -55,16 +47,13 @@ class DeleteEmptyGroups extends Command
      */
     public function handle(): int
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
-        $start = microtime(true);
         $groupIds
             = TransactionGroup::leftJoin('transaction_journals', 'transaction_groups.id', '=', 'transaction_journals.transaction_group_id')
                               ->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray();
 
         $total = count($groupIds);
-        Log::debug(sprintf('Count is %d', $total));
         if ($total > 0) {
-            $this->info(sprintf('Deleted %d empty transaction group(s).', $total));
+            $this->friendlyInfo(sprintf('Deleted %d empty transaction group(s).', $total));
 
             // again, chunks for SQLite.
             $chunks = array_chunk($groupIds, 500);
@@ -72,8 +61,9 @@ class DeleteEmptyGroups extends Command
                 TransactionGroup::whereNull('deleted_at')->whereIn('id', $chunk)->delete();
             }
         }
-        $end = round(microtime(true) - $start, 2);
+        if (0 === $total) {
-        $this->info(sprintf('Verified empty groups in %s seconds', $end));
+            $this->friendlyInfo('Verified there are no empty groups.');
+        }
 
         return 0;
     }

app/Console/Commands/Correction/DeleteEmptyJournals.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use DB;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
@@ -35,6 +36,8 @@ use Illuminate\Support\Facades\Log;
  */
 class DeleteEmptyJournals extends Command
 {
+    use ShowsFriendlyMessages;
+
     /**
      * The console command description.
      *
@@ -83,18 +86,22 @@ class DeleteEmptyJournals extends Command
 
 
                 Transaction::where('transaction_journal_id', (int)$row->transaction_journal_id)->delete();
-                $this->info(sprintf('Deleted transaction journal #%d because it had an uneven number of transactions.', $row->transaction_journal_id));
+                $this->friendlyWarning(
+                    sprintf('Deleted transaction journal #%d because it had an uneven number of transactions.', $row->transaction_journal_id)
+                );
                 $total++;
             }
         }
         if (0 === $total) {
-            $this->info('No uneven transaction journals.');
+            $this->friendlyPositive('No uneven transaction journals.');
         }
     }
 
+    /**
+     * @return void
+     */
     private function deleteEmptyJournals(): void
     {
-        $start = microtime(true);
         $count = 0;
         $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                                    ->groupBy('transaction_journals.id')
@@ -109,13 +116,11 @@ class DeleteEmptyJournals extends Command
             }
 
 
-            $this->info(sprintf('Deleted empty transaction journal #%d', $entry->id));
+            $this->friendlyInfo(sprintf('Deleted empty transaction journal #%d', $entry->id));
             ++$count;
         }
         if (0 === $count) {
-            $this->info('No empty transaction journals.');
+            $this->friendlyPositive('No empty transaction journals.');
-        }
+        }
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verified empty journals in %s seconds', $end));
     }
 }

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -24,10 +24,10 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use Exception;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 use stdClass;
 
 /**
@@ -35,6 +35,8 @@ use stdClass;
  */
 class DeleteOrphanedTransactions extends Command
 {
+    use ShowsFriendlyMessages;
+
     /**
      * The console command description.
      *
@@ -56,16 +58,16 @@ class DeleteOrphanedTransactions extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
         $this->deleteOrphanedJournals();
         $this->deleteOrphanedTransactions();
         $this->deleteFromOrphanedAccounts();
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verified orphans in %s seconds', $end));
 
         return 0;
     }
 
+    /**
+     * @return void
+     */
     private function deleteOrphanedJournals(): void
     {
         $set   = TransactionJournal::leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
@@ -74,15 +76,15 @@ class DeleteOrphanedTransactions extends Command
                                    ->get(['transaction_journals.id', 'transaction_journals.transaction_group_id']);
         $count = $set->count();
         if (0 === $count) {
-            $this->info('No orphaned journals.');
+            $this->friendlyPositive('No orphaned journals.');
+            return;
         }
-        if ($count > 0) {
+        $this->friendlyInfo(sprintf('Found %d orphaned journal(s).', $count));
-            $this->info(sprintf('Found %d orphaned journal(s).', $count));
         foreach ($set as $entry) {
             $journal = TransactionJournal::withTrashed()->find((int)$entry->id);
             if (null !== $journal) {
                 $journal->delete();
-                    $this->info(
+                $this->friendlyWarning(
                     sprintf(
                         'Journal #%d (part of deleted transaction group #%d) has been deleted as well.',
                         $entry->id,
@@ -92,7 +94,6 @@ class DeleteOrphanedTransactions extends Command
             }
         }
     }
-    }
 
     /**
      * @throws Exception
@@ -115,7 +116,7 @@ class DeleteOrphanedTransactions extends Command
             $transaction = Transaction::find((int)$entry->transaction_id);
             if (null !== $transaction) {
                 $transaction->delete();
-                $this->info(
+                $this->friendlyWarning(
                     sprintf(
                         'Transaction #%d (part of deleted transaction journal #%d) has been deleted as well.',
                         $entry->transaction_id,
@@ -126,7 +127,7 @@ class DeleteOrphanedTransactions extends Command
             }
         }
         if (0 === $count) {
-            $this->info('No orphaned transactions.');
+            $this->friendlyPositive('No orphaned transactions.');
         }
     }
 
@@ -148,7 +149,7 @@ class DeleteOrphanedTransactions extends Command
                 $journal->delete();
             }
             Transaction::where('transaction_journal_id', (int)$transaction->transaction_journal_id)->delete();
-            $this->line(
+            $this->friendlyWarning(
                 sprintf(
                     'Deleted transaction journal #%d because account #%d was already deleted.',
                     $transaction->transaction_journal_id,
@@ -158,7 +159,7 @@ class DeleteOrphanedTransactions extends Command
             $count++;
         }
         if (0 === $count) {
-            $this->info('No orphaned accounts.');
+            $this->friendlyPositive('No orphaned accounts.');
         }
     }
 }

app/Console/Commands/Correction/DeleteZeroAmount.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
@@ -32,6 +33,8 @@ use Illuminate\Console\Command;
  */
 class DeleteZeroAmount extends Command
 {
+    use ShowsFriendlyMessages;
+
     /**
      * The console command description.
      *
@@ -52,24 +55,20 @@ class DeleteZeroAmount extends Command
      */
     public function handle(): int
     {
-        $start    = microtime(true);
         $set      = Transaction::where('amount', 0)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
         $set      = array_unique($set);
         $journals = TransactionJournal::whereIn('id', $set)->get();
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            $this->info(sprintf('Deleted transaction journal #%d because the amount is zero (0.00).', $journal->id));
+            $this->friendlyWarning(sprintf('Deleted transaction journal #%d because the amount is zero (0.00).', $journal->id));
             $journal->delete();
 
             Transaction::where('transaction_journal_id', $journal->id)->delete();
         }
         if (0 === $journals->count()) {
-            $this->info('No zero-amount transaction journals.');
+            $this->friendlyPositive('No zero-amount transaction journals.');
         }
 
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verified zero-amount integrity in %s seconds', $end));
-
         return 0;
     }
 }

app/Console/Commands/Correction/EnableCurrencies.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Transaction;
@@ -30,24 +31,15 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class EnableCurrencies
  */
 class EnableCurrencies extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Enables all currencies in use.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:enable-currencies';
 
     /**
@@ -57,7 +49,6 @@ class EnableCurrencies extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
         $found = [];
         // get all meta entries
         /** @var Collection $meta */
@@ -94,22 +85,15 @@ class EnableCurrencies extends Command
                 }
             )
         );
-        $message = sprintf('%d different currencies are currently in use.', count($found));
-        $this->info($message);
-        Log::debug($message, $found);
-
         $disabled = TransactionCurrency::whereIn('id', $found)->where('enabled', false)->count();
         if ($disabled > 0) {
-            $this->info(sprintf('%d were (was) still disabled. This has been corrected.', $disabled));
+            $this->friendlyInfo(sprintf('%d currencies were (was) disabled while in use by transactions. This has been corrected.', $disabled));
         }
         if (0 === $disabled) {
-            $this->info('All currencies are correctly enabled or disabled.');
+            $this->friendlyPositive('All currencies are correctly enabled or disabled.');
         }
         TransactionCurrency::whereIn('id', $found)->update(['enabled' => true]);
 
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verified currencies in %s seconds.', $end));
-
         return 0;
     }
 }

app/Console/Commands/Correction/FixAccountOrder.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
@@ -32,17 +33,9 @@ use Illuminate\Console\Command;
  */
 class FixAccountOrder extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Make sure account order is correct.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-account-order';
 
     private AccountRepositoryInterface $repository;
@@ -55,7 +48,6 @@ class FixAccountOrder extends Command
     public function handle(): int
     {
         $this->stupidLaravel();
-        $start = microtime(true);
 
         $users = User::get();
         foreach ($users as $user) {
@@ -63,8 +55,7 @@ class FixAccountOrder extends Command
             $this->repository->resetAccountOrder();
         }
 
-        $end = round(microtime(true) - $start, 2);
+        $this->friendlyPositive('All accounts are ordered correctly');
-        $this->info(sprintf('Verifying account order took %s seconds', $end));
 
         return 0;
     }

app/Console/Commands/Correction/FixAccountTypes.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Factory\AccountFactory;
 use FireflyIII\Models\AccountType;
@@ -30,25 +31,17 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
-use JsonException;
 use Illuminate\Support\Facades\Log;
+use JsonException;
 
 /**
  * Class FixAccountTypes
  */
 class FixAccountTypes extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Make sure all journals have the correct from/to account types.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-account-types';
     private int            $count;
     private array          $expected;
@@ -63,27 +56,20 @@ class FixAccountTypes extends Command
     public function handle(): int
     {
         $this->stupidLaravel();
-        Log::debug('Now in fix-account-types');
-        $start          = microtime(true);
         $this->factory  = app(AccountFactory::class);
         $this->expected = config('firefly.source_dests');
         $journals       = TransactionJournal::with(['TransactionType', 'transactions', 'transactions.account', 'transactions.account.accounttype'])->get();
-        Log::debug(sprintf('Found %d journals to inspect.', $journals->count()));
         foreach ($journals as $journal) {
             $this->inspectJournal($journal);
         }
         if (0 === $this->count) {
-            Log::debug('No journals had to be fixed.');
+            $this->friendlyPositive('All account types are OK');
-            $this->info('All account types are OK!');
         }
         if (0 !== $this->count) {
             Log::debug(sprintf('%d journals had to be fixed.', $this->count));
-            $this->info(sprintf('Acted on %d transaction(s)!', $this->count));
+            $this->friendlyInfo(sprintf('Acted on %d transaction(s)', $this->count));
         }
 
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verifying account types took %s seconds', $end));
-
         return 0;
     }
 
@@ -103,13 +89,14 @@ class FixAccountTypes extends Command
      * @param TransactionJournal $journal
      *
      * @throws FireflyException
+     * @throws JsonException
      */
     private function inspectJournal(TransactionJournal $journal): void
     {
         $transactions = $journal->transactions()->count();
         if (2 !== $transactions) {
             Log::debug(sprintf('Journal has %d transactions, so can\'t fix.', $transactions));
-            $this->info(sprintf('Cannot inspect transaction journal #%d because it has %d transaction(s) instead of 2.', $journal->id, $transactions));
+            $this->friendlyError(sprintf('Cannot inspect transaction journal #%d because it has %d transaction(s) instead of 2.', $journal->id, $transactions));
 
             return;
         }
@@ -123,7 +110,7 @@ class FixAccountTypes extends Command
 
         if (!array_key_exists($type, $this->expected)) {
             Log::info(sprintf('No source/destination info for transaction type %s.', $type));
-            $this->info(sprintf('No source/destination info for transaction type %s.', $type));
+            $this->friendlyError(sprintf('No source/destination info for transaction type %s.', $type));
 
             return;
         }
@@ -184,7 +171,7 @@ class FixAccountTypes extends Command
                 $journal->transactionType()->associate($withdrawal);
                 $journal->save();
                 $message = sprintf('Converted transaction #%d from a transfer to a withdrawal.', $journal->id);
-                $this->info($message);
+                $this->friendlyInfo($message);
                 Log::debug($message);
                 // check it again:
                 $this->inspectJournal($journal);
@@ -197,7 +184,7 @@ class FixAccountTypes extends Command
                 $journal->transactionType()->associate($deposit);
                 $journal->save();
                 $message = sprintf('Converted transaction #%d from a transfer to a deposit.', $journal->id);
-                $this->info($message);
+                $this->friendlyInfo($message);
                 Log::debug($message);
                 // check it again:
                 $this->inspectJournal($journal);
@@ -218,7 +205,7 @@ class FixAccountTypes extends Command
                     $result->id,
                     $result->name
                 );
-                $this->info($message);
+                $this->friendlyWarning($message);
                 Log::debug($message);
                 $this->inspectJournal($journal);
                 break;
@@ -238,17 +225,17 @@ class FixAccountTypes extends Command
                     $result->id,
                     $result->name
                 );
-                $this->info($message);
+                $this->friendlyWarning($message);
                 Log::debug($message);
                 $this->inspectJournal($journal);
                 break;
             default:
                 $message = sprintf('The source account of %s #%d cannot be of type "%s".', $type, $journal->id, $source->account->accountType->type);
-                $this->info($message);
+                $this->friendlyError($message);
                 Log::debug($message);
 
                 $message = sprintf('The destination account of %s #%d cannot be of type "%s".', $type, $journal->id, $dest->account->accountType->type);
-                $this->info($message);
+                $this->friendlyError($message);
                 Log::debug($message);
 
                 break;

app/Console/Commands/Correction/FixFrontpageAccounts.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -36,17 +37,9 @@ use Illuminate\Console\Command;
  */
 class FixFrontpageAccounts extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Fixes a preference that may include deleted accounts or accounts of another type.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-frontpage-accounts';
 
     /**
@@ -56,8 +49,6 @@ class FixFrontpageAccounts extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
-
         $users = User::get();
         /** @var User $user */
         foreach ($users as $user) {
@@ -66,8 +57,7 @@ class FixFrontpageAccounts extends Command
                 $this->fixPreference($preference);
             }
         }
-        $end = round(microtime(true) - $start, 2);
+        $this->friendlyPositive('Account preferences are OK');
-        $this->info(sprintf('Verifying account preferences took %s seconds', $end));
 
         return 0;
     }

app/Console/Commands/Correction/FixGroupAccounts.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use DB;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Events\UpdatedTransactionGroup;
 use FireflyIII\Handlers\Events\UpdatedGroupEventHandler;
 use FireflyIII\Models\TransactionGroup;
@@ -36,17 +37,9 @@ use Illuminate\Console\Command;
  */
 class FixGroupAccounts extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Unify the source / destination accounts of split groups.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:unify-group-accounts';
 
     /**
@@ -72,7 +65,7 @@ class FixGroupAccounts extends Command
             $handler->unifyAccounts($event);
         }
 
-        $this->line('Updated inconsistent transaction groups.');
+        $this->friendlyPositive('Updated possible inconsistent transaction groups.');
 
         return 0;
     }

app/Console/Commands/Correction/FixIbans.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use Illuminate\Console\Command;
@@ -34,18 +35,11 @@ use Illuminate\Support\Collection;
  */
 class FixIbans extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Removes spaces from IBANs';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-ibans';
+    private int $count       = 0;
 
     /**
      * Execute the console command.
@@ -57,46 +51,16 @@ class FixIbans extends Command
         $accounts = Account::whereNotNull('iban')->get();
         $this->filterIbans($accounts);
         $this->countAndCorrectIbans($accounts);
+        if (0 === $this->count) {
+            $this->friendlyPositive('All IBANs are valid.');
+        }
 
         return 0;
     }
 
     /**
      * @param Collection $accounts
-     * @return void
+     *
-     */
-    private function countAndCorrectIbans(Collection $accounts): void
-    {
-        $set = [];
-        /** @var Account $account */
-        foreach($accounts as $account) {
-            $userId = (int)$account->user_id;
-            $set[$userId] = $set[$userId] ?? [];
-            $iban = (string)$account->iban;
-            $type = $account->accountType->type;
-            if(in_array($type, [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) {
-                $type = 'liabilities';
-            }
-            if(array_key_exists($iban, $set[$userId])) {
-                // iban already in use! two exceptions exist:
-                if(
-                    !(AccountType::EXPENSE === $set[$userId][$iban] && AccountType::REVENUE === $type) && // allowed combination
-                    !(AccountType::REVENUE === $set[$userId][$iban] && AccountType::EXPENSE === $type) // also allowed combination.
-                ) {
-                    $this->line(sprintf('IBAN "%s" is used more than once and will be removed from %s #%d ("%s")', $iban, $account->accountType->type, $account->id, $account->name));
-                    $account->iban = null;
-                    $account->save();
-                }
-            }
-
-            if(!array_key_exists($iban, $set[$userId])) {
-                $set[$userId][$iban] = $type;
-            }
-        }
-    }
-
-    /**
-     * @param  Collection  $accounts
      * @return void
      */
     private function filterIbans(Collection $accounts): void
@@ -109,9 +73,58 @@ class FixIbans extends Command
                 if ('' !== $iban) {
                     $account->iban = $iban;
                     $account->save();
-                    $this->line(sprintf('Removed spaces from IBAN of account #%d', $account->id));
+                    $this->friendlyInfo(sprintf('Removed spaces from IBAN of account #%d', $account->id));
+                    $this->count++;
                 }
             }
         }
     }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return void
+     */
+    private function countAndCorrectIbans(Collection $accounts): void
+    {
+        $set = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $userId       = (int)$account->user_id;
+            $set[$userId] = $set[$userId] ?? [];
+            $iban         = (string)$account->iban;
+            if ('' === $iban) {
+                continue;
+            }
+            $type = $account->accountType->type;
+            if (in_array($type, [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) {
+                $type = 'liabilities';
+            }
+            if (array_key_exists($iban, $set[$userId])) {
+                // iban already in use! two exceptions exist:
+                if (
+                    !(AccountType::EXPENSE === $set[$userId][$iban] && AccountType::REVENUE === $type)
+                    && // allowed combination
+                    !(AccountType::REVENUE === $set[$userId][$iban] && AccountType::EXPENSE === $type) // also allowed combination.
+                ) {
+                    $this->friendlyWarning(
+                        sprintf(
+                            'IBAN "%s" is used more than once and will be removed from %s #%d ("%s")',
+                            $iban,
+                            $account->accountType->type,
+                            $account->id,
+                            $account->name
+                        )
+                    );
+                    $account->iban = null;
+                    $account->save();
+                    $this->count++;
+                }
+            }
+
+            if (!array_key_exists($iban, $set[$userId])) {
+                $set[$userId][$iban] = $type;
+            }
+        }
+    }
 }

app/Console/Commands/Correction/FixLongDescriptions.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
@@ -33,18 +34,10 @@ use Illuminate\Console\Command;
  */
 class FixLongDescriptions extends Command
 {
+    use ShowsFriendlyMessages;
+
     private const MAX_LENGTH = 1000;
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
     protected $description = 'Fixes long descriptions in journals and groups.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-long-descriptions';
 
     /**
@@ -54,14 +47,15 @@ class FixLongDescriptions extends Command
      */
     public function handle(): int
     {
-        $start    = microtime(true);
         $journals = TransactionJournal::get(['id', 'description']);
+        $count    = 0;
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
             if (strlen($journal->description) > self::MAX_LENGTH) {
                 $journal->description = substr($journal->description, 0, self::MAX_LENGTH);
                 $journal->save();
-                $this->line(sprintf('Truncated description of transaction journal #%d', $journal->id));
+                $this->friendlyWarning(sprintf('Truncated description of transaction journal #%d', $journal->id));
+                $count++;
             }
         }
 
@@ -71,12 +65,13 @@ class FixLongDescriptions extends Command
             if (strlen((string)$group->title) > self::MAX_LENGTH) {
                 $group->title = substr($group->title, 0, self::MAX_LENGTH);
                 $group->save();
-                $this->line(sprintf('Truncated description of transaction group #%d', $group->id));
+                $this->friendlyWarning(sprintf('Truncated description of transaction group #%d', $group->id));
+                $count++;
             }
         }
-        $end = round(microtime(true) - $start, 2);
+        if (0 === $count) {
-        $this->info('Verified all transaction group and journal title lengths.');
+            $this->friendlyPositive('All transaction group and journal title lengths are within bounds.');
-        $this->info(sprintf('Took %s seconds.', $end));
+        }
 
         return 0;
     }

app/Console/Commands/Correction/FixPiggies.php

@@ -23,29 +23,21 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
 
 /**
- * Report (and fix) piggy banks. Make sure there are only transfers linked to piggy bank events.
+ * Report (and fix) piggy banks.
  *
  * Class FixPiggies
  */
 class FixPiggies extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Fixes common issues with piggy banks.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-piggies';
 
     /**
@@ -56,8 +48,7 @@ class FixPiggies extends Command
     public function handle(): int
     {
         $count = 0;
-        $start = microtime(true);
+        $set   = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal'])->get();
-        $set   = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
 
         /** @var PiggyBankEvent $event */
         foreach ($set as $event) {
@@ -73,26 +64,14 @@ class FixPiggies extends Command
                 $count++;
                 continue;
             }
-
-
-            $type = $journal->transactionType->type;
-            if (TransactionType::TRANSFER !== $type) {
-                $event->transaction_journal_id = null;
-                $event->save();
-                $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
-                $count++;
-            }
         }
         if (0 === $count) {
-            $this->line('All piggy bank events are correct.');
+            $this->friendlyPositive('All piggy bank events are OK.');
         }
         if (0 !== $count) {
-            $this->line(sprintf('Fixed %d piggy bank event(s).', $count));
+            $this->friendlyInfo(sprintf('Fixed %d piggy bank event(s).', $count));
         }
 
-        $end = round(microtime(true) - $start, 2);
-        $this->line(sprintf('Verified the content of %d piggy bank events in %s seconds.', $set->count(), $end));
-
         return 0;
     }
 }

app/Console/Commands/Correction/FixRecurringTransactions.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\TransactionType;
@@ -37,22 +38,13 @@ use Illuminate\Console\Command;
  */
 class FixRecurringTransactions extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Fixes recurring transactions with the wrong transaction type.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-recurring-transactions';
-    /** @var RecurringRepositoryInterface */
+    private int                          $count       = 0;
-    private $recurringRepos;
+    private RecurringRepositoryInterface $recurringRepos;
-    /** @var UserRepositoryInterface */
+    private UserRepositoryInterface      $userRepos;
-    private $userRepos;
 
     /**
      * Execute the console command.
@@ -61,11 +53,11 @@ class FixRecurringTransactions extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
         $this->stupidLaravel();
         $this->correctTransactions();
-        $end = round(microtime(true) - $start, 2);
+        if (0 === $this->count) {
-        $this->info(sprintf('Corrected recurring transactions in %s seconds.', $end));
+            $this->friendlyPositive('All recurring transactions are OK.');
+        }
 
         return 0;
     }
@@ -130,13 +122,14 @@ class FixRecurringTransactions extends Command
         $type        = $recurrence->transactionType;
         $link        = config(sprintf('firefly.account_to_transaction.%s.%s', $source->accountType->type, $destination->accountType->type));
         if (null !== $link && strtolower($type->type) !== strtolower($link)) {
-            $this->warn(
+            $this->friendlyWarning(
                 sprintf('Recurring transaction #%d should be a "%s" but is a "%s" and will be corrected.', $recurrence->id, $link, $type->type)
             );
             $transactionType = TransactionType::whereType($link)->first();
             if (null !== $transactionType) {
                 $recurrence->transaction_type_id = $transactionType->id;
                 $recurrence->save();
+                $this->count++;
             }
         }
     }

app/Console/Commands/Correction/FixTransactionTypes.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
@@ -37,17 +38,9 @@ use Illuminate\Support\Collection;
  */
 class FixTransactionTypes extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Make sure all transactions are of the correct type, based on source + dest.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-transaction-types';
 
     /**
@@ -57,7 +50,6 @@ class FixTransactionTypes extends Command
      */
     public function handle(): int
     {
-        $start    = microtime(true);
         $count    = 0;
         $journals = $this->collectJournals();
         /** @var TransactionJournal $journal */
@@ -67,13 +59,12 @@ class FixTransactionTypes extends Command
                 $count++;
             }
         }
-        $end = round(microtime(true) - $start, 2);
         if ($count > 0) {
-            $this->info(sprintf('Corrected transaction type of %d transaction journals in %s seconds.', $count, $end));
+            $this->friendlyInfo('Corrected transaction type of %d transaction journals.', $count);
 
             return 0;
         }
-        $this->line(sprintf('All transaction journals are of the correct transaction type (in %s seconds).', $end));
+        $this->friendlyPositive('All transaction journals are of the correct transaction type');
 
         return 0;
     }
@@ -101,13 +92,13 @@ class FixTransactionTypes extends Command
             $source      = $this->getSourceAccount($journal);
             $destination = $this->getDestinationAccount($journal);
         } catch (FireflyException $e) {
-            $this->error($e->getMessage());
+            $this->friendlyError($e->getMessage());
 
             return false;
         }
         $expectedType = (string)config(sprintf('firefly.account_to_transaction.%s.%s', $source->accountType->type, $destination->accountType->type));
         if ($expectedType !== $type) {
-            $this->line(
+            $this->friendlyWarning(
                 sprintf(
                     'Transaction journal #%d was of type "%s" but is corrected to "%s" (%s -> %s)',
                     $journal->id,

app/Console/Commands/Correction/FixUnevenAmount.php

@@ -24,10 +24,10 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use DB;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 use stdClass;
 
 /**
@@ -35,17 +35,9 @@ use stdClass;
  */
 class FixUnevenAmount extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Fix journals with uneven amounts.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-uneven-amount';
 
     /**
@@ -55,31 +47,41 @@ class FixUnevenAmount extends Command
      */
     public function handle(): int
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
-        $start = microtime(true);
         $count    = 0;
-        // get invalid journals
         $journals = DB::table('transactions')
                       ->groupBy('transaction_journal_id')
                       ->whereNull('deleted_at')
                       ->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
         /** @var stdClass $entry */
         foreach ($journals as $entry) {
+            $sum = (string)$entry->the_sum;
+            if (!is_numeric($sum) || '' === $sum || str_contains($sum, 'e') || str_contains($sum, ',')) {
+                $message = sprintf(
+                    'Journal #%d has an invalid sum ("%s"). No sure what to do.',
+                    $entry->transaction_journal_id,
+                    $entry->the_sum
+                );
+                $this->friendlyWarning($message);
+                app('log')->warning($message);
+                $count++;
+                continue;
+            }
             if (0 !== bccomp((string)$entry->the_sum, '0')) {
-                $message = sprintf('Sum of journal #%d is %s instead of zero.', $entry->transaction_journal_id, $entry->the_sum);
+                $message = sprintf(
-                $this->warn($message);
+                    'Sum of journal #%d is %s instead of zero.',
+                    $entry->transaction_journal_id,
+                    $entry->the_sum
+                );
+                $this->friendlyWarning($message);
                 app('log')->warning($message);
                 $this->fixJournal((int)$entry->transaction_journal_id);
                 $count++;
             }
         }
         if (0 === $count) {
-            $this->info('Amount integrity OK!');
+            $this->friendlyPositive('Database amount integrity is OK');
         }
 
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verified amount integrity in %s seconds', $end));
-
         return 0;
     }
 
@@ -97,7 +99,7 @@ class FixUnevenAmount extends Command
         $source = $journal->transactions()->where('amount', '<', 0)->first();
 
         if (null === $source) {
-            $this->error(
+            $this->friendlyError(
                 sprintf(
                     'Journal #%d ("%s") has no source transaction. It will be deleted to maintain database consistency.',
                     $journal->id ?? 0,
@@ -117,7 +119,7 @@ class FixUnevenAmount extends Command
         $destination = $journal->transactions()->where('amount', '>', 0)->first();
 
         if (null === $destination) {
-            $this->error(
+            $this->friendlyError(
                 sprintf(
                     'Journal #%d ("%s") has no destination transaction. It will be deleted to maintain database consistency.',
                     $journal->id ?? 0,
@@ -135,6 +137,6 @@ class FixUnevenAmount extends Command
         $destination->save();
 
         $message = sprintf('Corrected amount in transaction journal #%d', $param);
-        $this->line($message);
+        $this->friendlyInfo($message);
     }
 }

app/Console/Commands/Correction/RemoveBills.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
@@ -32,17 +33,9 @@ use Illuminate\Console\Command;
  */
 class RemoveBills extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Remove bills from transactions that shouldn\'t have one.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:remove-bills';
 
     /**
@@ -52,7 +45,6 @@ class RemoveBills extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
         /** @var TransactionType|null $withdrawal */
         $withdrawal = TransactionType::where('type', TransactionType::WITHDRAWAL)->first();
         if (null === $withdrawal) {
@@ -61,18 +53,14 @@ class RemoveBills extends Command
         $journals = TransactionJournal::whereNotNull('bill_id')->where('transaction_type_id', '!=', $withdrawal->id)->get();
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            $this->line(sprintf('Transaction journal #%d should not be linked to bill #%d.', $journal->id, $journal->bill_id));
+            $this->friendlyWarning(sprintf('Transaction journal #%d will be unlinked from bill #%d.', $journal->id, $journal->bill_id));
             $journal->bill_id = null;
             $journal->save();
         }
-        if (0 === $journals->count()) {
-            $this->info('All transaction journals have correct bill information.');
-        }
         if ($journals->count() > 0) {
-            $this->info('Fixed all transaction journals so they have correct bill information.');
+            $this->friendlyInfo('Fixed all transaction journals so they have correct bill information.');
         }
-        $end = round(microtime(true) - $start, 2);
+        $this->friendlyPositive('All bills and journals are OK');
-        $this->info(sprintf('Verified bills / journals in %s seconds', $end));
 
         return 0;
     }

app/Console/Commands/Correction/RenameMetaFields.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use DB;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
 /**
@@ -31,17 +32,9 @@ use Illuminate\Console\Command;
  */
 class RenameMetaFields extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Rename changed meta fields.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:rename-meta-fields';
 
     private int $count;
@@ -54,7 +47,6 @@ class RenameMetaFields extends Command
     public function handle(): int
     {
         $this->count = 0;
-        $start       = microtime(true);
 
         $changes = [
             'original-source' => 'original_source',
@@ -74,15 +66,11 @@ class RenameMetaFields extends Command
             $this->rename($original, $update);
         }
         if (0 === $this->count) {
-            $this->line('All meta fields are correct.');
+            $this->friendlyPositive('All meta fields are correct.');
         }
         if (0 !== $this->count) {
-            $this->line(sprintf('Renamed %d meta field(s).', $this->count));
+            $this->friendlyInfo(sprintf('Renamed %d meta field(s).', $this->count));
         }
-
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Renamed meta fields in %s seconds', $end));
-
         return 0;
     }
 

app/Console/Commands/Correction/TransferBudgets.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Correction;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
@@ -33,17 +34,9 @@ use Illuminate\Support\Facades\Log;
  */
 class TransferBudgets extends Command
 {
-    /**
+    use ShowsFriendlyMessages;
-     * The console command description.
+
-     *
-     * @var string
-     */
     protected $description = 'Removes budgets from transfers.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:fix-transfer-budgets';
 
     /**
@@ -53,7 +46,6 @@ class TransferBudgets extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
         $set   = TransactionJournal::distinct()
                                    ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
                                    ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
@@ -63,24 +55,20 @@ class TransferBudgets extends Command
         /** @var TransactionJournal $entry */
         foreach ($set as $entry) {
             $message = sprintf('Transaction journal #%d is a %s, so has no longer a budget.', $entry->id, $entry->transactionType->type);
-            $this->info($message);
+            $this->friendlyInfo($message);
             Log::debug($message);
             $entry->budgets()->sync([]);
             $count++;
         }
         if (0 === $count) {
             $message = 'No invalid budget/journal entries.';
-            Log::debug($message);
+            $this->friendlyPositive($message);
-            $this->info($message);
         }
         if (0 !== $count) {
             $message = sprintf('Corrected %d invalid budget/journal entries (entry).', $count);
             Log::debug($message);
-            $this->line($message);
+            $this->friendlyInfo($message);
         }
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Verified budget/journals in %s seconds.', $end));
-
         return 0;
     }
 }

app/Console/Commands/Correction/TriggerCreditCalculation.php

@@ -1,5 +1,26 @@
 <?php
 
+
+/*
+ * TriggerCreditCalculation.php
+ * Copyright (c) 2023 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\Console\Commands\Correction;
@@ -7,7 +28,6 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Models\Account;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class CorrectionSkeleton
@@ -15,17 +35,7 @@ use Illuminate\Support\Facades\Log;
  */
 class TriggerCreditCalculation extends Command
 {
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
     protected $description = 'Triggers the credit recalculation service for liabilities.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:trigger-credit-recalculation';
 
     /**
@@ -36,22 +46,26 @@ class TriggerCreditCalculation extends Command
     public function handle(): int
     {
         $this->processAccounts();
+
         return 0;
     }
 
+    /**
+     * @return void
+     */
     private function processAccounts(): void
     {
         $accounts = Account::leftJoin('account_types', 'accounts.account_type_id', 'account_types.id')
                            ->whereIn('account_types.type', config('firefly.valid_liabilities'))
                            ->get(['accounts.*']);
         foreach ($accounts as $account) {
-            Log::debug(sprintf('Processing account #%d ("%s")', $account->id, $account->name));
             $this->processAccount($account);
         }
     }
 
     /**
      * @param Account $account
+     *
      * @return void
      */
     private function processAccount(Account $account): void

app/Console/Commands/Export/ExportData.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Export;
 
 use Carbon\Carbon;
 use Exception;
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Console\Commands\VerifiesAccessToken;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
@@ -35,14 +36,17 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
-use InvalidArgumentException;
 use Illuminate\Support\Facades\Log;
+use InvalidArgumentException;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class ExportData
  */
 class ExportData extends Command
 {
+    use ShowsFriendlyMessages;
     use VerifiesAccessToken;
 
     /**
@@ -81,12 +85,14 @@ class ExportData extends Command
      *
      * @return int
      * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
         // verify access token
         if (!$this->verifyAccessToken()) {
-            $this->error('Invalid access token. Check /profile.');
+            $this->friendlyError('Invalid access token. Check /profile.');
 
             return 1;
         }
@@ -99,7 +105,7 @@ class ExportData extends Command
         try {
             $options = $this->parseOptions();
         } catch (FireflyException $e) {
-            $this->error(sprintf('Could not work with your options: %s', $e));
+            $this->friendlyError(sprintf('Could not work with your options: %s', $e));
 
             return 1;
         }
@@ -122,14 +128,14 @@ class ExportData extends Command
         $exporter->setExportPiggies($options['export']['piggies']);
         $data = $exporter->export();
         if (0 === count($data)) {
-            $this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org');
+            $this->friendlyError('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org');
         }
         $returnCode = 0;
         if (0 !== count($data)) {
             try {
                 $this->exportData($options, $data);
             } catch (FireflyException $e) {
-                $this->error(sprintf('Could not store data: %s', $e->getMessage()));
+                $this->friendlyError(sprintf('Could not store data: %s', $e->getMessage()));
 
                 $returnCode = 1;
             }
@@ -198,7 +204,7 @@ class ExportData extends Command
                 $date = Carbon::createFromFormat('!Y-m-d', $this->option($field));
             } catch (InvalidArgumentException $e) {
                 Log::error($e->getMessage());
-                $this->error(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
+                $this->friendlyError(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
                 $error = true;
             }
         }
@@ -288,11 +294,11 @@ class ExportData extends Command
                 throw new FireflyException(sprintf('File "%s" exists already. Use --force to overwrite.', $file));
             }
             if (true === $options['force'] && file_exists($file)) {
-                $this->warn(sprintf('File "%s" exists already but will be replaced.', $file));
+                $this->friendlyWarning(sprintf('File "%s" exists already but will be replaced.', $file));
             }
             // continue to write to file.
             file_put_contents($file, $content);
-            $this->info(sprintf('Wrote %s-export to file "%s".', $key, $file));
+            $this->friendlyPositive(sprintf('Wrote %s-export to file "%s".', $key, $file));
         }
     }
 }

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -24,31 +24,23 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Integrity;
 
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Models\UserRole;
 use FireflyIII\User;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class CreateGroupMemberships
  */
 class CreateGroupMemberships extends Command
 {
+    use ShowsFriendlyMessages;
+
     public const CONFIG_NAME = '560_create_group_memberships';
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
     protected $description = 'Update group memberships';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature   = 'firefly-iii:create-group-memberships';
 
     /**
@@ -59,12 +51,8 @@ class CreateGroupMemberships extends Command
      */
     public function handle(): int
     {
-        $start = microtime(true);
-
         $this->createGroupMemberships();
-
+        $this->friendlyPositive('Validated group memberships');
-        $end = round(microtime(true) - $start, 2);
-        $this->info(sprintf('Validated group memberships in %s seconds.', $end));
 
         return 0;
     }
@@ -78,14 +66,13 @@ class CreateGroupMemberships extends Command
         $users = User::get();
         /** @var User $user */
         foreach ($users as $user) {
-            Log::debug(sprintf('Manage group memberships for user #%d', $user->id));
             self::createGroupMembership($user);
-            Log::debug(sprintf('Done with user #%d', $user->id));
         }
     }
 
     /**
      * TODO move to helper.
+     *
      * @param User $user
      *
      * @throws FireflyException
@@ -96,7 +83,6 @@ class CreateGroupMemberships extends Command
         $userGroup = UserGroup::where('title', $user->email)->first();
         if (null === $userGroup) {
             $userGroup = UserGroup::create(['title' => $user->email]);
-            Log::debug(sprintf('Created new user group #%d ("%s")', $userGroup->id, $userGroup->title));
         }
 
         $userRole = UserRole::where('title', UserRole::OWNER)->first();
@@ -115,14 +101,10 @@ class CreateGroupMemberships extends Command
                     'user_group_id' => $userGroup->id,
                 ]
             );
-            Log::debug('Created new membership.');
         }
         if (null === $user->user_group_id) {
             $user->user_group_id = $userGroup->id;
             $user->save();
-            Log::debug('Put user in default group.');
+        }
-        }
-
-        Log::debug(sprintf('User #%d now has main group.', $user->id));
     }
 }