Merge pull request #10401 from firefly-iii/release-1748835078

🤖 Automatically merge the PR into the develop branch.

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

@@ -53,6 +53,9 @@ return $config->setRules(
         'statement_indentation'         => true,
         'void_return'                   => true,
 
+        // about importing statements
+        'global_namespace_import' => ['import_classes' => true, 'import_constants' => true, 'import_functions' => true],
+
         // disabled rules
         'native_function_invocation'    => false, // annoying
         'php_unit_data_provider_name'   => false, // bloody annoying long test names
@@ -61,7 +64,7 @@ return $config->setRules(
         'comment_to_phpdoc'             => false, // breaks phpstan lines in combination with PHPStorm.
         'type_declaration_spaces'       => false,
         'cast_spaces'                   => false,
-        'phpdoc_to_comment' => false, // do not overrule single line comment style, breaks phpstan.
+        'phpdoc_to_comment'             => false, // do not overrule single line comment style, breaks phpstan.
 
         // complex rules
         'array_syntax'                  => ['syntax' => 'short'],

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

@@ -1256,23 +1256,24 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.5",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "e51498ea18570c062e7df29d05a7003585b19b88"
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88",
-                "reference": "e51498ea18570c062e7df29d05a7003585b19b88",
+                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^6.4|^7.0"
+                "symfony/string": "^7.2"
             },
             "conflict": {
                 "symfony/dependency-injection": "<6.4",
@@ -1329,7 +1330,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.5"
+                "source": "https://github.com/symfony/console/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -1345,20 +1346,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-12T08:11:12+00:00"
+            "time": "2025-05-24T10:34:04+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -1371,7 +1372,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -1396,7 +1397,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.5.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -1412,20 +1413,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1"
+                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1",
-                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d",
+                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d",
                 "shasum": ""
             },
             "require": {
@@ -1476,7 +1477,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/v7.2.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -1492,20 +1493,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2025-04-22T09:11:45+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
                 "shasum": ""
             },
             "require": {
@@ -1519,7 +1520,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -1552,7 +1553,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -1568,11 +1569,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -1618,7 +1619,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.2.0"
+                "source": "https://github.com/symfony/filesystem/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -1638,16 +1639,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.2.2",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
+                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
-                "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d",
+                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d",
                 "shasum": ""
             },
             "require": {
@@ -1682,7 +1683,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.2.2"
+                "source": "https://github.com/symfony/finder/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -1698,20 +1699,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-30T19:00:17+00:00"
+            "time": "2024-12-30T19:00:26+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50"
+                "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
-                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/afb9a8038025e5dbc657378bfab9198d75f10fca",
+                "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca",
                 "shasum": ""
             },
             "require": {
@@ -1749,7 +1750,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.2.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -1765,11 +1766,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-20T11:17:29+00:00"
+            "time": "2025-04-04T13:12:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1828,7 +1829,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -1848,7 +1849,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -1906,7 +1907,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -1926,7 +1927,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1987,7 +1988,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2007,19 +2008,20 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
                 "shasum": ""
             },
             "require": {
+                "ext-iconv": "*",
                 "php": ">=7.2"
             },
             "provide": {
@@ -2067,7 +2069,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2083,20 +2085,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-12-23T08:48:59+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
@@ -2147,7 +2149,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2163,11 +2165,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -2223,7 +2225,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2243,16 +2245,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.2.5",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d"
+                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d",
-                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d",
+                "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
+                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
                 "shasum": ""
             },
             "require": {
@@ -2284,7 +2286,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.5"
+                "source": "https://github.com/symfony/process/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2300,20 +2302,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-13T12:21:46+00:00"
+            "time": "2025-04-17T09:11:12+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
                 "shasum": ""
             },
             "require": {
@@ -2331,7 +2333,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -2367,7 +2369,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -2383,11 +2385,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2025-04-25T09:37:31+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v7.2.4",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -2429,7 +2431,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.2.4"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2449,16 +2451,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
                 "shasum": ""
             },
             "require": {
@@ -2516,7 +2518,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.2.0"
+                "source": "https://github.com/symfony/string/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2532,7 +2534,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T13:31:26+00:00"
+            "time": "2025-04-20T20:19:01+00:00"
         }
     ],
     "packages-dev": [],

.ci/rector.php

@@ -0,0 +1,80 @@
+<?php
+
+
+/*
+ * rector.php
+ * Copyright (c) 2025 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);
+
+use Rector\Config\RectorConfig;
+use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
+use Rector\Transform\Rector\String_\StringToClassConstantRector;
+use RectorLaravel\Set\LaravelLevelSetList;
+
+
+return RectorConfig::configure()
+    ->withSkip([
+        ChangeOrIfContinueToMultiContinueRector::class,
+        StringToClassConstantRector::class => [
+            __DIR__ . '/../app/Http/Controllers/Auth/LoginController.php',
+        ],
+        __DIR__.'/../bootstrap/cache/*'
+    ])
+    ->withPaths([
+        __DIR__ . '/../app',
+        __DIR__ . '/../bootstrap',
+        __DIR__ . '/../config',
+        __DIR__ . '/../public',
+        __DIR__ . '/../resources/lang/en_US',
+        __DIR__ . '/../routes',
+        __DIR__ . '/../tests',
+    ])
+    ->withSets([
+        LaravelLevelSetList::UP_TO_LARAVEL_120,
+    ])
+//    ->withConfiguredRule(ReplaceServiceContainerCallArgRector::class, [
+//        new ReplaceServiceContainerCallArg('log', new ClassConstFetch(new Name('Illuminate\Support\Facades\Log'), 'class')),
+//    ])
+    // uncomment to reach your current PHP version
+    ->withPhpSets()
+    ->withPreparedSets(
+        codingStyle: false, // leave false
+        privatization: false, // leave false.
+        naming: false, // leave false
+        instanceOf: true,
+        earlyReturn: true,
+        strictBooleans: true,
+        carbon: true,
+        rectorPreset: true,
+        phpunitCodeQuality: true,
+        doctrineCodeQuality: true,
+        symfonyCodeQuality: true,
+        symfonyConfigs: true
+
+    )
+    ->withComposerBased(
+        twig: true,
+        doctrine: true,
+        phpunit: true,
+        symfony: true)
+    ->withTypeCoverageLevel(0)
+    ->withDeadCodeLevel(0)
+    ->withCodeQualityLevel(0)
+    ->withImportNames(removeUnusedImports: true);// import statements instead of full classes.

.ci/rector.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+#
+# phpstan.sh
+# Copyright (c) 2021 james@firefly-iii.org
+#
+# This file is part of Firefly III (https://github.com/firefly-iii).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Install composer packages
+#composer install --no-scripts --no-ansi
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+echo $1
+
+if [ "$1" == "--dry-run" ]; then
+    echo "Running rector in dry run."
+    $SCRIPT_DIR/../vendor/bin/rector --config $SCRIPT_DIR/rector.php --dry-run
+    exit $?
+fi
+
+$SCRIPT_DIR/../vendor/bin/rector --config $SCRIPT_DIR/rector.php

.env.example

@@ -289,20 +289,13 @@ ALLOW_WEBHOOKS=false
 #
 # You can set this variable from a file by appending it with _FILE
 #
-STATIC_CRON_TOKEN=
+STATIC_CRON_TOKEN=PLEASE_REPLACE_WITH_32_CHAR_CODE
 
 # 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 lots 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.
 
-# Set this to true to build all locales supported by Firefly III.
-# This may take quite some time (several minutes) and is generally not recommended.
-# If you wish to change or alter the list of locales, start your Docker container with
-# `docker run -v locale.gen:/etc/locale.gen -e DKR_BUILD_LOCALE=true`
-# and make sure your preferred locales are in your own locale.gen.
-DKR_BUILD_LOCALE=false
-
 # 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

.github/pull_request_template.md

@@ -21,5 +21,3 @@ Changes in this pull request:
 -
 -
 -
-
-@JC5

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v2.0.0
+      - uses: github/command@v2.0.1
         id: command
         with:
           allowed_contexts: "issue"

.github/workflows/sonarcloud.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - develop
 env:
   DB_CONNECTION: sqlite
   APP_KEY: TestTestTestTestTestTestTestTest
@@ -51,7 +50,10 @@ jobs:
           wget -q https://github.com/firefly-iii/test-fixtures/raw/refs/heads/main/test-database.sqlite -O storage/database/database.sqlite
 
       - name: "Upgrades the database to the latest version"
-        run: php artisan firefly-iii:upgrade-database
+        run: |
+          php artisan firefly-iii:upgrade-database
+          chmod 600 storage/oauth-public.key
+          chmod 600 storage/oauth-private.key
 
       - name: "Integrity Database Report"
         run: php artisan firefly-iii:report-integrity
@@ -63,7 +65,7 @@ jobs:
         run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
 
       - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: SonarSource/sonarqube-scan-action@v5.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

THANKS.md

@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
 ## 2025
+- Denis Iskandarov
 - =
 - Lompi
 - Jose Diaz-Gonzalez

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

@@ -43,6 +43,7 @@ use Illuminate\Support\Facades\Log;
 class AccountController extends Controller
 {
     use AccountFilter;
+
     // this array only exists to test if the constructor will use it properly.
     protected array $accepts = ['application/json', 'application/vnd.api+json'];
 

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

@@ -65,13 +65,11 @@ class BillController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchBill($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Bill $item) {
-                return [
-                    'id'     => (string) $item->id,
-                    'name'   => $item->name,
-                    'active' => $item->active,
-                ];
-            }
+            static fn (Bill $item) => [
+                'id'     => (string) $item->id,
+                'name'   => $item->name,
+                'active' => $item->active,
+            ]
         );
 
         return response()->api($filtered->toArray());

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

@@ -65,12 +65,10 @@ class BudgetController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchBudget($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Budget $item) {
-                return [
-                    'id'   => (string) $item->id,
-                    'name' => $item->name,
-                ];
-            }
+            static fn (Budget $item) => [
+                'id'   => (string) $item->id,
+                'name' => $item->name,
+            ]
         );
 
         return response()->api($filtered->toArray());

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

@@ -65,12 +65,10 @@ class CategoryController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Category $item) {
-                return [
-                    'id'   => (string) $item->id,
-                    'name' => $item->name,
-                ];
-            }
+            static fn (Category $item) => [
+                'id'   => (string) $item->id,
+                'name' => $item->name,
+            ]
         );
 
         return response()->api($filtered->toArray());

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
+use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -39,11 +40,10 @@ use Illuminate\Support\Collection;
  */
 class TransactionController extends Controller
 {
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
     private TransactionGroupRepositoryInterface $groupRepository;
     private JournalRepositoryInterface          $repository;
 
-    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
-
     /**
      * TransactionController constructor.
      */
@@ -103,7 +103,7 @@ class TransactionController extends Controller
         if (is_numeric($data['query'])) {
             // search for group, not journal.
             $firstResult = $this->groupRepository->find((int) $data['query']);
-            if (null !== $firstResult) {
+            if ($firstResult instanceof TransactionGroup) {
                 // group may contain multiple journals, each a result:
                 foreach ($firstResult->transactionJournals as $journal) {
                     $result->push($journal);

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

@@ -24,10 +24,11 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Chart;
 
+use FireflyIII\Models\TransactionCurrency;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\DateRequest;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
+use FireflyIII\Api\V1\Requests\Data\DateRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
@@ -48,8 +49,8 @@ class AccountController extends Controller
     use ApiSupport;
     use CollectsAccountsFromFilter;
 
-    private AccountRepositoryInterface $repository;
     private ChartData                  $chartData;
+    private AccountRepositoryInterface $repository;
 
     /**
      * AccountController constructor.
@@ -93,6 +94,47 @@ class AccountController extends Controller
         return response()->json($this->chartData->render());
     }
 
+    /**
+     * @throws FireflyException
+     */
+    private function renderAccountData(array $params, Account $account): void
+    {
+        $currency     = $this->repository->getAccountCurrency($account);
+        if (!$currency instanceof TransactionCurrency) {
+            $currency = $this->default;
+        }
+        $currentSet   = [
+            'label'                   => $account->name,
+
+            // the currency that belongs to the account.
+            'currency_id'             => (string) $currency->id,
+            'currency_code'           => $currency->code,
+            'currency_symbol'         => $currency->symbol,
+            'currency_decimal_places' => $currency->decimal_places,
+
+            // the default currency of the user (could be the same!)
+            'date'                    => $params['start']->toAtomString(),
+            'start'                   => $params['start']->toAtomString(),
+            'end'                     => $params['end']->toAtomString(),
+            'period'                  => '1D',
+            'entries'                 => [],
+        ];
+        $currentStart = clone $params['start'];
+        $range        = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
+
+        $previous     = array_values($range)[0]['balance'];
+        while ($currentStart <= $params['end']) {
+            $format                        = $currentStart->format('Y-m-d');
+            $label                         = $currentStart->toAtomString();
+            $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
+            $previous                      = $balance;
+
+            $currentStart->addDay();
+            $currentSet['entries'][$label] = $balance;
+        }
+        $this->chartData->add($currentSet);
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/charts/getChartAccountOverview
@@ -162,45 +204,4 @@ class AccountController extends Controller
 
         return response()->json($chartData);
     }
-
-    /**
-     * @throws FireflyException
-     */
-    private function renderAccountData(array $params, Account $account): void
-    {
-        $currency     = $this->repository->getAccountCurrency($account);
-        if (null === $currency) {
-            $currency = $this->default;
-        }
-        $currentSet   = [
-            'label'                          => $account->name,
-
-            // the currency that belongs to the account.
-            'currency_id'                    => (string) $currency->id,
-            'currency_code'                  => $currency->code,
-            'currency_symbol'                => $currency->symbol,
-            'currency_decimal_places'        => $currency->decimal_places,
-
-            // the default currency of the user (could be the same!)
-            'date'                           => $params['start']->toAtomString(),
-            'start'                          => $params['start']->toAtomString(),
-            'end'                            => $params['end']->toAtomString(),
-            'period'                         => '1D',
-            'entries'                        => [],
-        ];
-        $currentStart = clone $params['start'];
-        $range        = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
-
-        $previous     = array_values($range)[0]['balance'];
-        while ($currentStart <= $params['end']) {
-            $format                        = $currentStart->format('Y-m-d');
-            $label                         = $currentStart->toAtomString();
-            $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
-            $previous                      = $balance;
-
-            $currentStart->addDay();
-            $currentSet['entries'][$label] = $balance;
-        }
-        $this->chartData->add($currentSet);
-    }
 }

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

@@ -193,7 +193,7 @@ class BudgetController extends Controller
             // var_dump($return);
             /** @var array $journal */
             foreach ($currentBudgetArray['transaction_journals'] as $journal) {
-                $return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], $journal['amount']);
+                $return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], (string) $journal['amount']);
             }
         }
 
@@ -245,13 +245,13 @@ class BudgetController extends Controller
         }
         $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
         if (1 === count($result)) {
-            $compare = bccomp($limit->amount, app('steam')->positive($result[$limitCurrencyId]['spent']));
+            $compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));
             if (1 === $compare) {
                 // convert this amount into the native currency:
-                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, $result[$limitCurrencyId]['spent']);
+                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']);
             }
             if ($compare <= 0) {
-                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, $result[$limitCurrencyId]['spent']));
+                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']));
             }
         }
 

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

@@ -96,7 +96,7 @@ class CategoryController extends Controller
             $currencyId              = (int) $journal['currency_id'];
             $currency                = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
             $currencies[$currencyId] = $currency;
-            $categoryName            = null === $journal['category_name'] ? (string) trans('firefly.no_category') : $journal['category_name'];
+            $categoryName            = $journal['category_name'] ?? (string) trans('firefly.no_category');
             $amount                  = app('steam')->positive($journal['amount']);
             $key                     = sprintf('%s-%s', $categoryName, $currency->code);
             // create arrays
@@ -114,14 +114,12 @@ class CategoryController extends Controller
             ];
 
             // add monies
-            $return[$key]['amount']  = bcadd($return[$key]['amount'], $amount);
+            $return[$key]['amount']  = bcadd($return[$key]['amount'], (string) $amount);
         }
         $return     = array_values($return);
 
         // order by amount
-        usort($return, static function (array $a, array $b) {
-            return (float) $a['amount'] < (float) $b['amount'] ? 1 : -1;
-        });
+        usort($return, static fn (array $a, array $b) => (float) $a['amount'] < (float) $b['amount'] ? 1 : -1);
 
         return response()->json($this->clean($return));
     }

app/Api/V1/Controllers/Controller.php

@@ -40,7 +40,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -62,15 +62,15 @@ abstract class Controller extends BaseController
     use ValidatesRequests;
     use ValidatesUserGroupTrait;
 
-    protected const string CONTENT_TYPE      = 'application/vnd.api+json';
-    protected const string JSON_CONTENT_TYPE = 'application/json';
+    protected const string CONTENT_TYPE            = 'application/vnd.api+json';
+    protected const string JSON_CONTENT_TYPE       = 'application/json';
+    protected array               $accepts         = ['application/json', 'application/vnd.api+json'];
 
     /** @var array<int, string> */
-    protected array        $allowedSort;
-    protected ParameterBag $parameters;
-    protected bool        $convertToNative   = false;
-    protected array $accepts                 = ['application/json', 'application/vnd.api+json'];
+    protected array               $allowedSort;
+    protected bool                $convertToNative = false;
     protected TransactionCurrency $nativeCurrency;
+    protected ParameterBag        $parameters;
 
     /**
      * Controller constructor.
@@ -124,9 +124,9 @@ abstract class Controller extends BaseController
             try {
                 $date = request()->query->get($field);
             } catch (BadRequestException $e) {
-                app('log')->error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
-                app('log')->error($e->getMessage());
-                app('log')->error($e->getTraceAsString());
+                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
+                Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
                 $value = null;
             }
             $obj  = null;
@@ -135,7 +135,7 @@ abstract class Controller extends BaseController
                     $obj = Carbon::parse((string) $date);
                 } catch (InvalidFormatException $e) {
                     // don't care
-                    app('log')->warning(
+                    Log::warning(
                         sprintf(
                             'Ignored invalid date "%s" in API controller parameter check: %s',
                             substr((string) $date, 0, 20),
@@ -153,9 +153,9 @@ abstract class Controller extends BaseController
             try {
                 $value = request()->query->get($integer);
             } catch (BadRequestException $e) {
-                app('log')->error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
-                app('log')->error($e->getMessage());
-                app('log')->error($e->getTraceAsString());
+                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
+                Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
                 $value = null;
             }
             if (null !== $value) {
@@ -193,9 +193,9 @@ abstract class Controller extends BaseController
         try {
             $param = (string) request()->query->get('sort');
         } catch (BadRequestException $e) {
-            app('log')->error('Request field "sort" contains a non-scalar value. Value set to NULL.');
-            app('log')->error($e->getMessage());
-            app('log')->error($e->getTraceAsString());
+            Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             $param = '';
         }
         if ('' === $param) {

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

@@ -30,6 +30,8 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
 
+use function Safe\date;
+
 /**
  * Class ExportController
  */
@@ -88,7 +90,7 @@ class ExportController extends Controller
             ->header('Expires', '0')
             ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
             ->header('Pragma', 'public')
-            ->header('Content-Length', (string) strlen($data[$key]))
+            ->header('Content-Length', (string) strlen((string) $data[$key]))
         ;
 
         return $response;

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

@@ -160,7 +160,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) $journal['amount']);
                     $response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose.
                 }
 
@@ -172,7 +172,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
-                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
+                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], (string) $journal['foreign_amount']);
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose.
                 }
             }

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

@@ -75,7 +75,7 @@ class PeriodController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
         }
 

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

@@ -100,7 +100,7 @@ class TagController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }
@@ -154,7 +154,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) app('steam')->positive($journal['amount']));
                     $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
@@ -167,8 +167,8 @@ class TagController extends Controller
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
-                        $response[$foreignKey]['difference'],
-                        app('steam')->positive($journal['foreign_amount'])
+                        (string) $response[$foreignKey]['difference'],
+                        (string) app('steam')->positive($journal['foreign_amount'])
                     );
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                 }

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

@@ -75,7 +75,7 @@ class PeriodController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }

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

@@ -99,7 +99,7 @@ class TagController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }
@@ -153,7 +153,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) app('steam')->positive($journal['amount']));
                     $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
@@ -166,8 +166,8 @@ class TagController extends Controller
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
-                        $response[$foreignKey]['difference'],
-                        app('steam')->positive($journal['foreign_amount'])
+                        (string) $response[$foreignKey]['difference'],
+                        (string) app('steam')->positive($journal['foreign_amount'])
                     );
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
+use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -39,10 +40,8 @@ class DestroyController extends Controller
 {
     use ValidatesUserGroupTrait;
 
-    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
-
     public const string RESOURCE_KEY = 'exchange-rates';
-
+    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
     private ExchangeRateRepositoryInterface $repository;
 
     public function __construct()
@@ -61,11 +60,11 @@ class DestroyController extends Controller
     public function destroy(DestroyRequest $request, TransactionCurrency $from, TransactionCurrency $to): JsonResponse
     {
         $date = $request->getDate();
-        if (null === $date) {
+        if (!$date instanceof Carbon) {
             throw new ValidationException('Date is required');
         }
         $rate = $this->repository->getSpecificRateOnDate($from, $to, $date);
-        if (null === $rate) {
+        if (!$rate instanceof CurrencyExchangeRate) {
             throw new NotFoundHttpException();
         }
         $this->repository->deleteRate($rate);

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
+use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreRequest;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
@@ -61,11 +62,11 @@ class StoreController extends Controller
 
         // already has rate?
         $object      = $this->repository->getSpecificRateOnDate($from, $to, $date);
-        if (null !== $object) {
+        if ($object instanceof CurrencyExchangeRate) {
             // just update it, no matter.
             $rate = $this->repository->updateExchangeRate($object, $rate, $date);
         }
-        if (null === $object) {
+        if (!$object instanceof CurrencyExchangeRate) {
             // store new
             $rate = $this->repository->storeExchangeRate($from, $to, $rate, $date);
         }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
+use Exception;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\RuleGroup\TestRequest;
 use FireflyIII\Api\V1\Requests\Models\RuleGroup\TriggerRequest;
@@ -128,7 +129,7 @@ class TriggerController extends Controller
      *
      * Execute the given rule group on a set of existing transactions.
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function triggerGroup(TriggerRequest $request, RuleGroup $group): JsonResponse
     {

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

@@ -50,9 +50,8 @@ class StoreController extends Controller
 {
     use TransactionFilter;
 
-    private TransactionGroupRepositoryInterface $groupRepository;
-
     protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
+    private TransactionGroupRepositoryInterface $groupRepository;
 
     /**
      * TransactionController constructor.

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

@@ -72,21 +72,24 @@ class UpdateController extends Controller
     public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
     {
         app('log')->debug('Now in update routine for transaction group');
-        $data             = $request->getAll();
-        $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
-        $manager          = $this->getManager();
+        $data              = $request->getAll();
+        $oldHash           = $this->groupRepository->getCompareHash($transactionGroup);
+        $transactionGroup  = $this->groupRepository->update($transactionGroup, $data);
+        $newHash           = $this->groupRepository->getCompareHash($transactionGroup);
+        $manager           = $this->getManager();
 
         app('preferences')->mark();
-        $applyRules       = $data['apply_rules'] ?? true;
-        $fireWebhooks     = $data['fire_webhooks'] ?? true;
-        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks));
+        $applyRules        = $data['apply_rules'] ?? true;
+        $fireWebhooks      = $data['fire_webhooks'] ?? true;
+        $runRecalculations = $oldHash !== $newHash;
+        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks, $runRecalculations));
 
         /** @var User $admin */
-        $admin            = auth()->user();
+        $admin             = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector        = app(GroupCollectorInterface::class);
+        $collector         = app(GroupCollectorInterface::class);
         $collector
             ->setUser($admin)
             // filter on transaction group.
@@ -95,20 +98,20 @@ class UpdateController extends Controller
             ->withAPIInformation()
         ;
 
-        $selectedGroup    = $collector->getGroups()->first();
+        $selectedGroup     = $collector->getGroups()->first();
         if (null === $selectedGroup) {
             throw new NotFoundHttpException();
         }
 
         // enrich
-        $enrichment       = new TransactionGroupEnrichment();
+        $enrichment        = new TransactionGroupEnrichment();
         $enrichment->setUser($admin);
-        $selectedGroup    = $enrichment->enrichSingle($selectedGroup);
+        $selectedGroup     = $enrichment->enrichSingle($selectedGroup);
 
         /** @var TransactionGroupTransformer $transformer */
-        $transformer      = app(TransactionGroupTransformer::class);
+        $transformer       = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource         = new Item($selectedGroup, $transformer, 'transactions');
+        $resource          = new Item($selectedGroup, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }

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

@@ -24,11 +24,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -74,15 +75,15 @@ class DestroyController extends Controller
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             // access denied:
             $messages = ['currency_code' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         if ($this->repository->currencyInUse($currency)) {
             $messages = ['currency_code' => '200006: Currency in use.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         if ($this->repository->isFallbackCurrency($currency)) {
             $messages = ['currency_code' => '200026: Currency is fallback.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
 
         $this->repository->destroy($currency);

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

@@ -177,9 +177,7 @@ class ListController extends Controller
 
         // filter and paginate list:
         $collection  = $unfiltered->filter(
-            static function (Bill $bill) use ($currency) {
-                return $bill->transaction_currency_id === $currency->id;
-            }
+            static fn (Bill $bill) => $bill->transaction_currency_id === $currency->id
         );
         $count       = $collection->count();
         $bills       = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionLink;
 
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionLink\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -81,7 +82,7 @@ class StoreController extends Controller
         $data              = $request->getAll();
         $inward            = $this->journalRepository->find($data['inward_id'] ?? 0);
         $outward           = $this->journalRepository->find($data['outward_id'] ?? 0);
-        if (null === $inward || null === $outward) {
+        if (!$inward instanceof TransactionJournal || !$outward instanceof TransactionJournal) {
             throw new FireflyException('200024: Source or destination does not exist.');
         }
         $data['direction'] = 'inward';

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -81,7 +82,7 @@ class StoreController extends Controller
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             // access denied:
             $messages = ['name' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         $data        = $request->getAll();
         // if currency ID is 0, find the currency by the code:

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -85,7 +86,7 @@ class UpdateController extends Controller
 
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             $messages = ['name' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
 
         $data        = $request->getAll();

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Summary;
 
+use Exception;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DateRequest;
@@ -43,6 +44,7 @@ use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -90,7 +92,7 @@ class BasicController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/summary/getBasicSummary
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function basic(DateRequest $request): JsonResponse
     {
@@ -104,10 +106,10 @@ class BasicController extends Controller
         $billData     = $this->getSubscriptionInformation($start, $end);
         $spentData    = $this->getLeftToSpendInfo($start, $end);
         $netWorthData = $this->getNetWorthInfo($end);
-        //                $balanceData  = [];
-        //                $billData     = [];
+        //                        $balanceData  = [];
+        //                        $billData     = [];
         //                $spentData    = [];
-        //                $netWorthData = [];
+        //                        $netWorthData = [];
         $total        = array_merge($balanceData, $billData, $spentData, $netWorthData);
 
         // give new keys
@@ -190,14 +192,14 @@ class BasicController extends Controller
 
                     // if it is the native currency already.
                     if ($entry['currency_id'] === $default->id) {
-                        $sums[$default->id]['sum'] = bcadd($entry['sum'], $sums[$default->id]['sum']);
+                        $sums[$default->id]['sum'] = bcadd((string) $entry['sum'], $sums[$default->id]['sum']);
 
                         // don't forget to add it to newExpenses and newIncome
                         if (0 === $index) {
-                            $newExpenses[$default->id]['sum'] = bcadd($newExpenses[$default->id]['sum'], $entry['sum']);
+                            $newExpenses[$default->id]['sum'] = bcadd($newExpenses[$default->id]['sum'], (string) $entry['sum']);
                         }
                         if (1 === $index) {
-                            $newIncomes[$default->id]['sum'] = bcadd($newIncomes[$default->id]['sum'], $entry['sum']);
+                            $newIncomes[$default->id]['sum'] = bcadd($newIncomes[$default->id]['sum'], (string) $entry['sum']);
                         }
 
                         continue;
@@ -228,7 +230,7 @@ class BasicController extends Controller
                         'currency_decimal_places' => $entry['currency_decimal_places'],
                         'sum'                     => '0',
                     ];
-                    $sums[$currencyId]['sum'] = bcadd($sums[$currencyId]['sum'], $entry['sum']);
+                    $sums[$currencyId]['sum'] = bcadd($sums[$currencyId]['sum'], (string) $entry['sum']);
                 }
             }
         }
@@ -361,7 +363,7 @@ class BasicController extends Controller
                     if (0 === $index) {
                         // paid amount
                         if ($currencyId === $this->nativeCurrency->id) {
-                            $newPaidAmount[0]['sum'] = bcadd($newPaidAmount[0]['sum'], $item['sum']);
+                            $newPaidAmount[0]['sum'] = bcadd($newPaidAmount[0]['sum'], (string) $item['sum']);
 
                             continue;
                         }
@@ -373,7 +375,7 @@ class BasicController extends Controller
                     }
                     // unpaid amount
                     if ($currencyId === $this->nativeCurrency->id) {
-                        $newUnpaidAmount[0]['sum'] = bcadd($newUnpaidAmount[0]['sum'], $item['sum']);
+                        $newUnpaidAmount[0]['sum'] = bcadd($newUnpaidAmount[0]['sum'], (string) $item['sum']);
 
                         continue;
                     }
@@ -396,7 +398,7 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($paidAmount as $info) {
-            $amount   = bcmul($info['sum'], '-1');
+            $amount   = bcmul((string) $info['sum'], '-1');
             $return[] = [
                 'key'                     => sprintf('bills-paid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $info['symbol']]),
@@ -415,7 +417,7 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($unpaidAmount as $info) {
-            $amount   = bcmul($info['sum'], '-1');
+            $amount   = bcmul((string) $info['sum'], '-1');
             $return[] = [
                 'key'                     => sprintf('bills-unpaid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $info['symbol']]),
@@ -466,7 +468,7 @@ class BasicController extends Controller
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
     {
@@ -482,7 +484,7 @@ class BasicController extends Controller
 
         // first, create an entry for each entry in the "available" array.
         /** @var array $availableBudget */
-        foreach ($available as $currencyId =>  $availableBudget) {
+        foreach ($available as $currencyId => $availableBudget) {
             $currencies[$currencyId] ??= $this->currencyRepos->find($currencyId);
             $return[$currencyId] = [
                 'key'                     => sprintf('left-to-spend-in-%s', $currencies[$currencyId]->code),
@@ -512,7 +514,7 @@ class BasicController extends Controller
                 continue;
             }
             $spentInCurrency     = $row['sum'];
-            $leftToSpend         = bcadd($amount, $spentInCurrency);
+            $leftToSpend         = bcadd($amount, (string) $spentInCurrency);
             $perDay              = '0';
             if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
                 $perDay = bcdiv($leftToSpend, (string) $days);
@@ -539,26 +541,63 @@ class BasicController extends Controller
                 ),
             ];
         }
+        unset($leftToSpend);
         if (0 === count($return)) {
-            $currency              = $this->nativeCurrency;
-            $return[$currency->id] = [
-                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
-                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => '0',
-                'no_available_budgets'    => true,
-                'currency_id'             => (string) $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
-                'local_icon'              => 'money',
-                'sub_title'               => app('amount')->formatFlat(
-                    $currency->symbol,
-                    $currency->decimal_places,
-                    '0',
-                    false
-                ),
-            ];
+            // a small trick to get every expense in this period, regardless of budget.
+            $spent = $this->opsRepository->sumExpenses($start, $end, null, new Collection());
+            foreach ($spent as $row) {
+                // either an amount was budgeted or 0 is available.
+                $currencyId          = (int) $row['currency_id'];
+                $spentInCurrency     = $row['sum'];
+                $perDay              = '0';
+                if (0 !== $days && -1 === bccomp((string) $spentInCurrency, '0')) {
+                    $perDay = bcdiv((string) $spentInCurrency, (string) $days);
+                }
+
+                Log::debug(sprintf('Spent %s %s', $row['currency_code'], $row['sum']));
+
+                $return[$currencyId] = [
+                    'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
+                    'title'                   => trans('firefly.spent'),
+                    'no_available_budgets'    => true,
+                    'monetary_value'          => $spentInCurrency,
+                    'currency_id'             => (string) $row['currency_id'],
+                    'currency_code'           => $row['currency_code'],
+                    'currency_symbol'         => $row['currency_symbol'],
+                    'currency_decimal_places' => $row['currency_decimal_places'],
+                    'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $spentInCurrency, false),
+                    'local_icon'              => 'money',
+                    'sub_title'               => app('amount')->formatFlat(
+                        $row['currency_symbol'],
+                        $row['currency_decimal_places'],
+                        $perDay,
+                        false
+                    ),
+                ];
+            }
+
+            //            $amount = '0';
+            //            // $days
+            //            // fill in by money spent, just count it.
+            //            $currency              = $this->nativeCurrency;
+            //            $return[$currency->id] = [
+            //                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
+            //                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
+            //                'monetary_value'          => '0',
+            //                'no_available_budgets'    => true,
+            //                'currency_id'             => (string) $currency->id,
+            //                'currency_code'           => $currency->code,
+            //                'currency_symbol'         => $currency->symbol,
+            //                'currency_decimal_places' => $currency->decimal_places,
+            //                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
+            //                'local_icon'              => 'money',
+            //                'sub_title'               => app('amount')->formatFlat(
+            //                    $currency->symbol,
+            //                    $currency->decimal_places,
+            //                    '0',
+            //                    false
+            //                ),
+            //            ];
         }
 
         return array_values($return);
@@ -593,7 +632,7 @@ class BasicController extends Controller
                 continue;
             }
             $amount   = $data['balance'];
-            if (0 === bccomp($amount, '0')) {
+            if (0 === bccomp((string) $amount, '0')) {
                 continue;
             }
             // return stuff
@@ -636,15 +675,14 @@ class BasicController extends Controller
      */
     protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
     {
-        $result = false;
         if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
         // start and end in the past? use $end
         if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
 
-        return $result;
+        return false;
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\System;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\System\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -158,7 +159,7 @@ class ConfigurationController extends Controller
         $rules     = ['value' => 'required'];
         if (!$this->repository->hasRole(auth()->user(), 'owner')) {
             $messages = ['value' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         $data      = $request->getAll();
         $shortName = str_replace('configuration.', '', $name);

app/Api/V1/Middleware/ApiDemoUser.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Middleware;
 
+use Closure;
 use FireflyIII\User;
 use Illuminate\Http\Request;
 
@@ -36,7 +37,7 @@ class ApiDemoUser
      *
      * @return mixed
      */
-    public function handle(Request $request, \Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         /** @var null|User $user */
         $user = $request->user();

app/Api/V1/Requests/Chart/ChartRequest.php

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Chart;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class ChartRequest
@@ -85,7 +85,7 @@ class ChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,12 +24,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data\Bulk;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class MoveTransactionsRequest
@@ -74,7 +74,7 @@ class MoveTransactionsRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

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

@@ -24,6 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data\Bulk;
 
+use Illuminate\Contracts\Validation\Validator;
+use JsonException;
 use FireflyIII\Enums\ClauseType;
 use FireflyIII\Rules\IsValidBulkClause;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +33,8 @@ 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 function Safe\json_decode;
 
 /**
  * Class TransactionRequest
@@ -50,7 +53,7 @@ class TransactionRequest extends FormRequest
             $data = [
                 'query' => json_decode($this->get('query'), true, 8, JSON_THROW_ON_ERROR),
             ];
-        } catch (\JsonException $e) {
+        } catch (JsonException $e) {
             // dont really care. the validation should catch invalid json.
             app('log')->error($e->getMessage());
         }
@@ -74,7 +77,7 @@ class TransactionRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Account;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Location;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -35,7 +36,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -144,7 +144,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -58,9 +58,7 @@ class StoreRequest extends FormRequest
     {
         $models = config('firefly.valid_attachment_models');
         $models = array_map(
-            static function (string $className) {
-                return str_replace('FireflyIII\Models\\', '', $className);
-            },
+            static fn (string $className) => str_replace('FireflyIII\Models\\', '', $className),
             $models
         );
         $models = implode(',', $models);

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

@@ -60,9 +60,7 @@ class UpdateRequest extends FormRequest
     {
         $models = config('firefly.valid_attachment_models');
         $models = array_map(
-            static function (string $className) {
-                return str_replace('FireflyIII\Models\\', '', $className);
-            },
+            static fn (string $className) => str_replace('FireflyIII\Models\\', '', $className),
             $models
         );
         $models = implode(',', $models);

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\AvailableBudget;
 
+use Illuminate\Contracts\Validation\Validator;
 use Carbon\Carbon;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class Request
@@ -90,7 +90,7 @@ class Request extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,13 +24,15 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Bill;
 
+use Illuminate\Contracts\Validation\Validator;
+use ValueError;
+use TypeError;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -109,7 +111,7 @@ class StoreRequest extends FormRequest
 
                 try {
                     $result = bccomp($min, $max);
-                } catch (\ValueError $e) {
+                } catch (ValueError $e) {
                     Log::error($e->getMessage());
                     $validator->errors()->add('amount_min', (string) trans('validation.generic_invalid'));
                     $validator->errors()->add('amount_max', (string) trans('validation.generic_invalid'));
@@ -124,12 +126,12 @@ class StoreRequest extends FormRequest
 
         try {
             $failed = $validator->fails();
-        } catch (\TypeError $e) {
+        } catch (TypeError $e) {
             Log::error($e->getMessage());
             $failed = false;
         }
         if ($failed) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Bill;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Bill;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -110,7 +110,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Budget;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -94,7 +94,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Budget;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Budget;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -32,7 +33,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -106,7 +106,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;
 
+use Illuminate\Contracts\Validation\Validator;
 use Carbon\Carbon;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -96,7 +96,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/CurrencyExchangeRate/DestroyRequest.php

@@ -45,7 +45,7 @@ class DestroyRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date'  => 'required|date|after:1900-01-01|before:2099-12-31',
+            'date' => 'required|date|after:1900-01-01|before:2099-12-31',
         ];
     }
 }

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

@@ -40,16 +40,16 @@ class StoreRequest extends FormRequest
         return $this->getCarbonDate('date');
     }
 
-    public function getRate(): string
-    {
-        return (string) $this->get('rate');
-    }
-
     public function getFromCurrency(): TransactionCurrency
     {
         return TransactionCurrency::where('code', $this->get('from'))->first();
     }
 
+    public function getRate(): string
+    {
+        return (string) $this->get('rate');
+    }
+
     public function getToCurrency(): TransactionCurrency
     {
         return TransactionCurrency::where('code', $this->get('to'))->first();

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

@@ -50,8 +50,8 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date'  => 'date|after:1900-01-01|before:2099-12-31',
-            'rate'  => 'required|numeric|gt:0',
+            'date' => 'date|after:1900-01-01|before:2099-12-31',
+            'rate' => 'required|numeric|gt:0',
         ];
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -32,7 +33,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -126,7 +126,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Recurrence;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -35,7 +36,6 @@ use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -193,7 +193,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Recurrence;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
@@ -36,7 +37,6 @@ use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -208,7 +208,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -148,7 +148,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Rule;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidActionExpression;
@@ -32,7 +33,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -168,7 +168,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Transaction;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
@@ -39,7 +40,6 @@ use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -83,87 +83,87 @@ class StoreRequest extends FormRequest
         foreach ($this->get('transactions') as $transaction) {
             $object   = new NullArrayObject($transaction);
             $return[] = [
-                'type'                    => $this->clearString($object['type']),
-                'date'                    => $this->dateFromValue($object['date']),
-                'order'                   => $this->integerFromValue((string) $object['order']),
+                'type'                  => $this->clearString($object['type']),
+                'date'                  => $this->dateFromValue($object['date']),
+                'order'                 => $this->integerFromValue((string) $object['order']),
 
-                'currency_id'             => $this->integerFromValue((string) $object['currency_id']),
-                'currency_code'           => $this->clearString((string) $object['currency_code']),
+                'currency_id'           => $this->integerFromValue((string) $object['currency_id']),
+                'currency_code'         => $this->clearString((string) $object['currency_code']),
 
                 // location
-                'latitude'                => $this->floatFromValue((string) $object['latitude']),
-                'longitude'               => $this->floatFromValue((string) $object['longitude']),
-                'zoom_level'              => $this->integerFromValue((string) $object['zoom_level']),
+                'latitude'              => $this->floatFromValue((string) $object['latitude']),
+                'longitude'             => $this->floatFromValue((string) $object['longitude']),
+                'zoom_level'            => $this->integerFromValue((string) $object['zoom_level']),
 
                 // foreign currency info:
-                'foreign_currency_id'     => $this->integerFromValue((string) $object['foreign_currency_id']),
-                'foreign_currency_code'   => $this->clearString((string) $object['foreign_currency_code']),
+                'foreign_currency_id'   => $this->integerFromValue((string) $object['foreign_currency_id']),
+                'foreign_currency_code' => $this->clearString((string) $object['foreign_currency_code']),
 
                 // amount and foreign amount. Cannot be 0.
-                'amount'                  => $this->clearString((string) $object['amount']),
-                'foreign_amount'          => $this->clearString((string) $object['foreign_amount']),
+                'amount'                => $this->clearString((string) $object['amount']),
+                'foreign_amount'        => $this->clearString((string) $object['foreign_amount']),
 
                 // description.
-                'description'             => $this->clearString($object['description']),
+                'description'           => $this->clearString($object['description']),
 
                 // source of transaction. If everything is null, assume cash account.
-                'source_id'               => $this->integerFromValue((string) $object['source_id']),
-                'source_name'             => $this->clearString((string) $object['source_name']),
-                'source_iban'             => $this->clearIban((string) $object['source_iban']),
-                'source_number'           => $this->clearString((string) $object['source_number']),
-                'source_bic'              => $this->clearString((string) $object['source_bic']),
+                'source_id'             => $this->integerFromValue((string) $object['source_id']),
+                'source_name'           => $this->clearString((string) $object['source_name']),
+                'source_iban'           => $this->clearIban((string) $object['source_iban']),
+                'source_number'         => $this->clearString((string) $object['source_number']),
+                'source_bic'            => $this->clearString((string) $object['source_bic']),
 
                 // destination of transaction. If everything is null, assume cash account.
-                'destination_id'          => $this->integerFromValue((string) $object['destination_id']),
-                'destination_name'        => $this->clearString((string) $object['destination_name']),
-                'destination_iban'        => $this->clearIban((string) $object['destination_iban']),
-                'destination_number'      => $this->clearString((string) $object['destination_number']),
-                'destination_bic'         => $this->clearString((string) $object['destination_bic']),
+                'destination_id'        => $this->integerFromValue((string) $object['destination_id']),
+                'destination_name'      => $this->clearString((string) $object['destination_name']),
+                'destination_iban'      => $this->clearIban((string) $object['destination_iban']),
+                'destination_number'    => $this->clearString((string) $object['destination_number']),
+                'destination_bic'       => $this->clearString((string) $object['destination_bic']),
 
                 // budget info
-                'budget_id'               => $this->integerFromValue((string) $object['budget_id']),
-                'budget_name'             => $this->clearString((string) $object['budget_name']),
+                'budget_id'             => $this->integerFromValue((string) $object['budget_id']),
+                'budget_name'           => $this->clearString((string) $object['budget_name']),
 
                 // category info
-                'category_id'             => $this->integerFromValue((string) $object['category_id']),
-                'category_name'           => $this->clearString((string) $object['category_name']),
+                'category_id'           => $this->integerFromValue((string) $object['category_id']),
+                'category_name'         => $this->clearString((string) $object['category_name']),
 
                 // journal bill reference. Optional. Will only work for withdrawals
-                'bill_id'                 => $this->integerFromValue((string) $object['bill_id']),
-                'bill_name'               => $this->clearString((string) $object['bill_name']),
+                'bill_id'               => $this->integerFromValue((string) $object['bill_id']),
+                'bill_name'             => $this->clearString((string) $object['bill_name']),
 
                 // piggy bank reference. Optional. Will only work for transfers
-                'piggy_bank_id'           => $this->integerFromValue((string) $object['piggy_bank_id']),
-                'piggy_bank_name'         => $this->clearString((string) $object['piggy_bank_name']),
+                'piggy_bank_id'         => $this->integerFromValue((string) $object['piggy_bank_id']),
+                'piggy_bank_name'       => $this->clearString((string) $object['piggy_bank_name']),
 
                 // some other interesting properties
-                'reconciled'              => $this->convertBoolean((string) $object['reconciled']),
-                'notes'                   => $this->clearStringKeepNewlines((string) $object['notes']),
-                'tags'                    => $this->arrayFromValue($object['tags']),
+                'reconciled'            => $this->convertBoolean((string) $object['reconciled']),
+                'notes'                 => $this->clearStringKeepNewlines((string) $object['notes']),
+                'tags'                  => $this->arrayFromValue($object['tags']),
 
                 // all custom fields:
-                'internal_reference'      => $this->clearString((string) $object['internal_reference']),
-                'external_id'             => $this->clearString((string) $object['external_id']),
-                'original_source'         => sprintf('ff3-v%s', config('firefly.version')),
-                'recurrence_id'           => $this->integerFromValue($object['recurrence_id']),
-                'bunq_payment_id'         => $this->clearString((string) $object['bunq_payment_id']),
-                'external_url'            => $this->clearString((string) $object['external_url']),
+                'internal_reference'    => $this->clearString((string) $object['internal_reference']),
+                'external_id'           => $this->clearString((string) $object['external_id']),
+                'original_source'       => sprintf('ff3-v%s', config('firefly.version')),
+                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
+                'bunq_payment_id'       => $this->clearString((string) $object['bunq_payment_id']),
+                'external_url'          => $this->clearString((string) $object['external_url']),
 
-                'sepa_cc'                 => $this->clearString((string) $object['sepa_cc']),
-                'sepa_ct_op'              => $this->clearString((string) $object['sepa_ct_op']),
-                'sepa_ct_id'              => $this->clearString((string) $object['sepa_ct_id']),
-                'sepa_db'                 => $this->clearString((string) $object['sepa_db']),
-                'sepa_country'            => $this->clearString((string) $object['sepa_country']),
-                'sepa_ep'                 => $this->clearString((string) $object['sepa_ep']),
-                'sepa_ci'                 => $this->clearString((string) $object['sepa_ci']),
-                'sepa_batch_id'           => $this->clearString((string) $object['sepa_batch_id']),
+                'sepa_cc'               => $this->clearString((string) $object['sepa_cc']),
+                'sepa_ct_op'            => $this->clearString((string) $object['sepa_ct_op']),
+                'sepa_ct_id'            => $this->clearString((string) $object['sepa_ct_id']),
+                'sepa_db'               => $this->clearString((string) $object['sepa_db']),
+                'sepa_country'          => $this->clearString((string) $object['sepa_country']),
+                'sepa_ep'               => $this->clearString((string) $object['sepa_ep']),
+                'sepa_ci'               => $this->clearString((string) $object['sepa_ci']),
+                'sepa_batch_id'         => $this->clearString((string) $object['sepa_batch_id']),
                 // custom date fields. Must be Carbon objects. Presence is optional.
-                'interest_date'           => $this->dateFromValue($object['interest_date']),
-                'book_date'               => $this->dateFromValue($object['book_date']),
-                'process_date'            => $this->dateFromValue($object['process_date']),
-                'due_date'                => $this->dateFromValue($object['due_date']),
-                'payment_date'            => $this->dateFromValue($object['payment_date']),
-                'invoice_date'            => $this->dateFromValue($object['invoice_date']),
+                'interest_date'         => $this->dateFromValue($object['interest_date']),
+                'book_date'             => $this->dateFromValue($object['book_date']),
+                'process_date'          => $this->dateFromValue($object['process_date']),
+                'due_date'              => $this->dateFromValue($object['due_date']),
+                'payment_date'          => $this->dateFromValue($object['payment_date']),
+                'invoice_date'          => $this->dateFromValue($object['invoice_date']),
             ];
         }
 
@@ -300,7 +300,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Transaction;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Rules\BelongsUser;
@@ -37,7 +38,6 @@ use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -359,7 +359,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -80,7 +80,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -80,7 +80,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\System;
 
+use Carbon\Carbon;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -58,7 +59,7 @@ class CronRequest extends FormRequest
             $data['date'] = $this->getCarbonDate('date');
         }
         // catch NULL.
-        if (null === $data['date']) {
+        if (!$data['date'] instanceof Carbon) {
             $data['date'] = today(config('app.timezone'));
         }
 

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

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\System;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UserUpdateRequest
@@ -99,7 +99,7 @@ class UserUpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -90,7 +90,7 @@ class AccountController extends Controller
             'meta'  => [
                 'type'                    => $account->accountType->type,
                 // TODO is multi currency property.
-                'currency_id'             => null === $currency ? null : (string) $currency->id,
+                'currency_id'             => $currency instanceof TransactionCurrency ? (string) $currency->id : null,
                 'currency_code'           => $currency?->code,
                 'currency_symbol'         => $currency?->symbol,
                 'currency_decimal_places' => $currency?->decimal_places,

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

@@ -61,13 +61,11 @@ class CategoryController extends Controller
         $queryParameters = $request->getParameters();
         $result          = $this->repository->searchCategory($queryParameters['query'], $queryParameters['size']);
         $filtered        = $result->map(
-            static function (Category $item) {
-                return [
-                    'id'    => (string) $item->id,
-                    'title' => $item->name,
-                    'meta'  => [],
-                ];
-            }
+            static fn (Category $item) => [
+                'id'    => (string) $item->id,
+                'title' => $item->name,
+                'meta'  => [],
+            ]
         );
 
         return response()->json($filtered);

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

@@ -61,15 +61,13 @@ class TagController extends Controller
         $queryParameters = $request->getParameters();
         $result          = $this->repository->searchTag($queryParameters['query']);
         $filtered        = $result->map(
-            static function (Tag $item) {
-                return [
-                    'id'    => (string) $item->id,
-                    'title' => $item->tag,
-                    'value' => (string) $item->id,
-                    'label' => $item->tag,
-                    'meta'  => [],
-                ];
-            }
+            static fn (Tag $item) => [
+                'id'    => (string) $item->id,
+                'title' => $item->tag,
+                'value' => (string) $item->id,
+                'label' => $item->tag,
+                'meta'  => [],
+            ]
         );
 
         return response()->json($filtered);

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

@@ -94,7 +94,7 @@ class AccountController extends Controller
     private function renderAccountData(array $params, Account $account): void
     {
         $currency       = $this->repository->getAccountCurrency($account);
-        if (null === $currency) {
+        if (!$currency instanceof TransactionCurrency) {
             $currency = $this->default;
         }
         $currentSet     = [

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

@@ -212,13 +212,13 @@ class BudgetController extends Controller
             foreach ($currentBudgetArray['transaction_journals'] as $journal) {
                 // convert the amount to the native currency.
                 $rate                                = $converter->getCurrencyRate($this->currencies[$currencyId], $this->currency, $journal['date']);
-                $convertedAmount                     = bcmul($journal['amount'], $rate);
+                $convertedAmount                     = bcmul((string) $journal['amount'], $rate);
                 if ($journal['foreign_currency_id'] === $this->currency->id) {
                     $convertedAmount = $journal['foreign_amount'];
                 }
 
-                $return[$currencyId]['spent']        = bcadd($return[$currencyId]['spent'], $journal['amount']);
-                $return[$currencyId]['native_spent'] = bcadd($return[$currencyId]['native_spent'], $convertedAmount);
+                $return[$currencyId]['spent']        = bcadd($return[$currencyId]['spent'], (string) $journal['amount']);
+                $return[$currencyId]['native_spent'] = bcadd($return[$currencyId]['native_spent'], (string) $convertedAmount);
             }
         }
         $converter->summarize();
@@ -275,15 +275,15 @@ class BudgetController extends Controller
         }
         $result               = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
         if (1 === count($result)) {
-            $compare = bccomp($limit->amount, app('steam')->positive($result[$limitCurrencyId]['spent']));
+            $compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));
             if (1 === $compare) {
                 // convert this amount into the native currency:
-                $result[$limitCurrencyId]['left']        = bcadd($limit->amount, $result[$limitCurrencyId]['spent']);
-                $result[$limitCurrencyId]['native_left'] = bcadd($convertedLimitAmount, $result[$limitCurrencyId]['native_spent']);
+                $result[$limitCurrencyId]['left']        = bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']);
+                $result[$limitCurrencyId]['native_left'] = bcadd($convertedLimitAmount, (string) $result[$limitCurrencyId]['native_spent']);
             }
             if ($compare <= 0) {
-                $result[$limitCurrencyId]['overspent']        = app('steam')->positive(bcadd($limit->amount, $result[$limitCurrencyId]['spent']));
-                $result[$limitCurrencyId]['native_overspent'] = app('steam')->positive(bcadd($convertedLimitAmount, $result[$limitCurrencyId]['native_spent']));
+                $result[$limitCurrencyId]['overspent']        = app('steam')->positive(bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']));
+                $result[$limitCurrencyId]['native_overspent'] = app('steam')->positive(bcadd($convertedLimitAmount, (string) $result[$limitCurrencyId]['native_spent']));
             }
         }
         $converter->summarize();

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

@@ -100,7 +100,7 @@ class CategoryController extends Controller
             $currencyId                    = (int) $journal['currency_id'];
             $currency                      = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
             $currencies[$currencyId]       = $currency;
-            $categoryName                  = null === $journal['category_name'] ? (string) trans('firefly.no_category') : $journal['category_name'];
+            $categoryName                  = $journal['category_name'] ?? (string) trans('firefly.no_category');
             $amount                        = app('steam')->positive($journal['amount']);
             $nativeAmount                  = $converter->convert($default, $currency, $journal['date'], $amount);
             $key                           = sprintf('%s-%s', $categoryName, $currency->code);
@@ -128,15 +128,13 @@ class CategoryController extends Controller
             ];
 
             // add monies
-            $return[$key]['amount']        = bcadd($return[$key]['amount'], $amount);
-            $return[$key]['native_amount'] = bcadd($return[$key]['native_amount'], $nativeAmount);
+            $return[$key]['amount']        = bcadd($return[$key]['amount'], (string) $amount);
+            $return[$key]['native_amount'] = bcadd($return[$key]['native_amount'], (string) $nativeAmount);
         }
         $return     = array_values($return);
 
         // order by native amount
-        usort($return, static function (array $a, array $b) {
-            return (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1;
-        });
+        usort($return, static fn (array $a, array $b) => (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1);
         $converter->summarize();
 
         return response()->json($this->clean($return));

app/Api/V2/Controllers/Controller.php

@@ -33,7 +33,6 @@ use FireflyIII\Transformers\AbstractTransformer;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -56,8 +55,8 @@ class Controller extends BaseController
 
     protected const string CONTENT_TYPE     = 'application/vnd.api+json';
     protected array        $acceptedRoles   = [UserRoleEnum::READ_ONLY];
-    protected ParameterBag $parameters;
     protected bool         $convertToNative = false;
+    protected ParameterBag $parameters;
 
     public function __construct()
     {
@@ -118,7 +117,7 @@ class Controller extends BaseController
                     app('log')->warning(sprintf('Ignored invalid date "%s" in API v2 controller parameter check: %s', substr((string) $date, 0, 20), $e->getMessage()));
                 }
                 // out of range? set to null.
-                if (null !== $obj && ($obj->year <= 1900 || $obj->year > 2099)) {
+                if ($obj instanceof Carbon && ($obj->year <= 1900 || $obj->year > 2099)) {
                     app('log')->warning(sprintf('Refuse to use date "%s" in API v2 controller parameter check: %s', $field, $obj->toAtomString()));
                     $obj = null;
                 }

app/Api/V2/Controllers/Model/Transaction/UpdateController.php

@@ -65,28 +65,29 @@ class UpdateController extends Controller
     public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
     {
         app('log')->debug('Now in update routine for transaction group [v2]!');
-        $data             = $request->getAll();
-        $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
-        $applyRules       = $data['apply_rules'] ?? true;
-        $fireWebhooks     = $data['fire_webhooks'] ?? true;
+        $data              = $request->getAll();
+        $transactionGroup  = $this->groupRepository->update($transactionGroup, $data);
+        $applyRules        = $data['apply_rules'] ?? true;
+        $fireWebhooks      = $data['fire_webhooks'] ?? true;
+        $runRecalculations = true;
 
-        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks));
+        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks, $runRecalculations));
         app('preferences')->mark();
 
         /** @var User $admin */
-        $admin            = auth()->user();
+        $admin             = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector        = app(GroupCollectorInterface::class);
+        $collector         = app(GroupCollectorInterface::class);
         $collector->setUser($admin)->setTransactionGroup($transactionGroup);
 
-        $selectedGroup    = $collector->getGroups()->first();
+        $selectedGroup     = $collector->getGroups()->first();
         if (null === $selectedGroup) {
             throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
         }
 
-        $transformer      = new TransactionGroupTransformer();
+        $transformer       = new TransactionGroupTransformer();
         $transformer->setParameters($this->parameters);
 
         return response()->api($this->jsonApiObject('transactions', $selectedGroup, $transformer))->header('Content-Type', self::CONTENT_TYPE);

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Controllers\Summary;
 
+use Exception;
 use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
@@ -92,7 +93,7 @@ class BasicController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/summary/getBasicSummary
      *
-     * @throws \Exception
+     * @throws Exception
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
@@ -174,8 +175,8 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($paidAmount as $info) {
-            $amount       = bcmul($info['sum'], '-1');
-            $nativeAmount = bcmul($info['native_sum'], '-1');
+            $amount       = bcmul((string) $info['sum'], '-1');
+            $nativeAmount = bcmul((string) $info['native_sum'], '-1');
             $return[]     = [
                 'key'                     => sprintf('bills-paid-in-%s', $info['currency_code']),
                 'value'                   => $amount,
@@ -198,8 +199,8 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($unpaidAmount as $info) {
-            $amount       = bcmul($info['sum'], '-1');
-            $nativeAmount = bcmul($info['native_sum'], '-1');
+            $amount       = bcmul((string) $info['sum'], '-1');
+            $nativeAmount = bcmul((string) $info['native_sum'], '-1');
             $return[]     = [
                 'key'                     => sprintf('bills-unpaid-in-%s', $info['currency_code']),
                 'value'                   => $amount,
@@ -279,8 +280,8 @@ class BasicController extends Controller
                     if ((int) $journal['foreign_currency_id'] === $default->id) {
                         $amountNative = $journal['foreign_amount'];
                     }
-                    $spent                   = bcadd($spent, $amount);
-                    $spentNative             = bcadd($spentNative, $amountNative);
+                    $spent                   = bcadd($spent, (string) $amount);
+                    $spentNative             = bcadd($spentNative, (string) $amountNative);
                 }
                 app('log')->debug(sprintf('Total spent in budget "%s" is %s', $budget['name'], $spent));
             }
@@ -398,15 +399,14 @@ class BasicController extends Controller
      */
     protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
     {
-        $result = false;
         if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
         // start and end in the past? use $end
         if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
 
-        return $result;
+        return false;
     }
 }

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Controllers\Transaction\List;
 
+use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Model\Transaction\ListRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -62,11 +63,11 @@ class AccountController extends Controller
 
         $start     = $request->getStartDate();
         $end       = $request->getEndDate();
-        if (null !== $start) {
+        if ($start instanceof Carbon) {
             app('log')->debug(sprintf('Set start date to %s', $start->toIso8601String()));
             $collector->setStart($start);
         }
-        if (null !== $end) {
+        if ($end instanceof Carbon) {
             app('log')->debug(sprintf('Set end date to %s', $start->toIso8601String()));
             $collector->setEnd($end);
         }

app/Api/V2/Request/Chart/BalanceChartRequest.php

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Chart;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class BalanceChartRequest
@@ -84,7 +84,7 @@ class BalanceChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Chart/ChartRequest.php

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Chart;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class ChartRequest
@@ -86,7 +86,7 @@ class ChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Chart/DashboardChartRequest.php

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Chart;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class DashboardChartRequest
@@ -83,7 +83,7 @@ class DashboardChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Model/Transaction/InfiniteListRequest.php

@@ -53,7 +53,7 @@ class InfiniteListRequest extends FormRequest
 
         $start = $this->getStartDate();
         $end   = $this->getEndDate();
-        if (null !== $start && null !== $end) {
+        if ($start instanceof Carbon && $end instanceof Carbon) {
             $array['start'] = $start->format('Y-m-d');
             $array['end']   = $end->format('Y-m-d');
         }

app/Api/V2/Request/Model/Transaction/ListRequest.php

@@ -49,7 +49,7 @@ class ListRequest extends FormRequest
 
         $start = $this->getStartDate();
         $end   = $this->getEndDate();
-        if (null !== $start && null !== $end) {
+        if ($start instanceof Carbon && $end instanceof Carbon) {
             $array['start'] = $start->format('Y-m-d');
             $array['end']   = $end->format('Y-m-d');
         }

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Model\Transaction;
 
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Rules\BelongsUserGroup;
@@ -40,7 +41,6 @@ use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class StoreRequest
@@ -311,7 +311,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Model/Transaction/UpdateRequest.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Model\Transaction;
 
+use Illuminate\Contracts\Validation\Validator;
+use Override;
 use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
@@ -37,7 +39,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -64,6 +65,7 @@ class UpdateRequest extends Request
      *
      * @throws FireflyException
      */
+    #[Override]
     public function getAll(): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
@@ -247,6 +249,7 @@ class UpdateRequest extends Request
     /**
      * The rules that the incoming request must be matched against.
      */
+    #[Override]
     public function rules(): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
@@ -330,6 +333,7 @@ class UpdateRequest extends Request
     /**
      * Configure the validator instance.
      */
+    #[Override]
     public function withValidator(Validator $validator): void
     {
         app('log')->debug('Now in withValidator');
@@ -361,7 +365,7 @@ class UpdateRequest extends Request
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

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

@@ -24,6 +24,7 @@ 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;
@@ -39,7 +40,7 @@ class AutoSum
     /**
      * @throws FireflyException
      */
-    public function autoSum(Collection $objects, \Closure $getCurrency, \Closure $getSum): array
+    public function autoSum(Collection $objects, Closure $getCurrency, Closure $getSum): array
     {
         $return = [];
 

app/Console/Commands/Correction/CorrectsAmounts.php

@@ -42,6 +42,7 @@ use FireflyIII\Support\Facades\Amount;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use ValueError;
 
 class CorrectsAmounts extends Command
 {
@@ -75,6 +76,65 @@ class CorrectsAmounts extends Command
         return 0;
     }
 
+    private function correctTransfers(): void
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $type       = TransactionType::where('type', TransactionTypeEnum::TRANSFER->value)->first();
+        $journals   = TransactionJournal::where('transaction_type_id', $type->id)->get();
+
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $repository->setUser($journal->user);
+            $native         = Amount::getNativeCurrencyByUserGroup($journal->userGroup);
+
+            /** @var null|Transaction $source */
+            $source         = $journal->transactions()->where('amount', '<', 0)->first();
+
+            /** @var null|Transaction $destination */
+            $destination    = $journal->transactions()->where('amount', '>', 0)->first();
+            if (null === $source || null === $destination) {
+                continue;
+            }
+            if (null === $source->foreign_currency_id || null === $destination->foreign_currency_id) {
+                continue;
+            }
+            $sourceAccount  = $source->account;
+            $destAccount    = $destination->account;
+            if (null === $sourceAccount || null === $destAccount) {
+                continue;
+            }
+            $sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $native;
+            $destCurrency   = $repository->getAccountCurrency($destAccount) ?? $native;
+
+            if ($sourceCurrency->id === $destCurrency->id) {
+                Log::debug('Both accounts have the same currency. Removing foreign currency info.');
+                $source->foreign_currency_id      = null;
+                $source->foreign_amount           = null;
+                $source->save();
+                $destination->foreign_currency_id = null;
+                $destination->foreign_amount      = null;
+                $destination->save();
+
+                continue;
+            }
+
+            // validate source
+            if ($destCurrency->id !== $source->foreign_currency_id) {
+                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $source->id, $source->foreignCurrency->code, $destCurrency->code));
+                $source->foreign_currency_id = $destCurrency->id;
+                $source->save();
+            }
+
+            // validate destination:
+            if ($sourceCurrency->id !== $destination->foreign_currency_id) {
+                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $destination->id, $destination->foreignCurrency->code, $sourceCurrency->code));
+                $destination->foreign_currency_id = $sourceCurrency->id;
+                $destination->save();
+            }
+        }
+    }
+
     private function fixAutoBudgets(): void
     {
         $count = AutoBudget::where('amount', '<', 0)->update(['amount' => DB::raw('amount * -1')]);
@@ -175,7 +235,7 @@ class CorrectsAmounts extends Command
     {
         try {
             $check = bccomp((string) $item->trigger_value, '0');
-        } catch (\ValueError $e) {
+        } catch (ValueError) {
             $this->friendlyError(sprintf('Rule #%d contained invalid %s-trigger "%s". The trigger has been removed, and the rule is disabled.', $item->rule_id, $item->trigger_type, $item->trigger_value));
             $item->rule->active = false;
             $item->rule->save();
@@ -192,63 +252,4 @@ class CorrectsAmounts extends Command
 
         return false;
     }
-
-    private function correctTransfers(): void
-    {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app(AccountRepositoryInterface::class);
-        $type       = TransactionType::where('type', TransactionTypeEnum::TRANSFER->value)->first();
-        $journals   = TransactionJournal::where('transaction_type_id', $type->id)->get();
-
-        /** @var TransactionJournal $journal */
-        foreach ($journals as $journal) {
-            $repository->setUser($journal->user);
-            $native         = Amount::getNativeCurrencyByUserGroup($journal->userGroup);
-
-            /** @var null|Transaction $source */
-            $source         = $journal->transactions()->where('amount', '<', 0)->first();
-
-            /** @var null|Transaction $destination */
-            $destination    = $journal->transactions()->where('amount', '>', 0)->first();
-            if (null === $source || null === $destination) {
-                continue;
-            }
-            if (null === $source->foreign_currency_id || null === $destination->foreign_currency_id) {
-                continue;
-            }
-            $sourceAccount  = $source->account;
-            $destAccount    = $destination->account;
-            if (null === $sourceAccount || null === $destAccount) {
-                continue;
-            }
-            $sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $native;
-            $destCurrency   = $repository->getAccountCurrency($destAccount) ?? $native;
-
-            if ($sourceCurrency->id === $destCurrency->id) {
-                Log::debug('Both accounts have the same currency. Removing foreign currency info.');
-                $source->foreign_currency_id      = null;
-                $source->foreign_amount           = null;
-                $source->save();
-                $destination->foreign_currency_id = null;
-                $destination->foreign_amount      = null;
-                $destination->save();
-
-                continue;
-            }
-
-            // validate source
-            if ($destCurrency->id !== $source->foreign_currency_id) {
-                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $source->id, $source->foreignCurrency->code, $destCurrency->code));
-                $source->foreign_currency_id = $destCurrency->id;
-                $source->save();
-            }
-
-            // validate destination:
-            if ($sourceCurrency->id !== $destination->foreign_currency_id) {
-                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $destination->id, $destination->foreignCurrency->code, $sourceCurrency->code));
-                $destination->foreign_currency_id = $sourceCurrency->id;
-                $destination->save();
-            }
-        }
-    }
 }

app/Console/Commands/Correction/CorrectsCurrencies.php

@@ -115,9 +115,7 @@ class CorrectsCurrencies extends Command
         $found           = array_values(
             array_filter(
                 $found,
-                static function (int $currencyId) {
-                    return 0 !== $currencyId;
-                }
+                static fn (int $currencyId) => 0 !== $currencyId
             )
         );
 

app/Console/Commands/Correction/CorrectsDatabase.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Schema;
 
 class CorrectsDatabase extends Command
 {
@@ -40,7 +41,7 @@ class CorrectsDatabase extends Command
     public function handle(): int
     {
         // if table does not exist, return false
-        if (!\Schema::hasTable('users')) {
+        if (!Schema::hasTable('users')) {
             $this->friendlyError('No "users"-table, will not continue.');
 
             return 1;

app/Console/Commands/Correction/CorrectsGroupAccounts.php

@@ -58,7 +58,8 @@ class CorrectsGroupAccounts extends Command
         $handler = new UpdatedGroupEventHandler();
         foreach ($groups as $groupId) {
             $group = TransactionGroup::find($groupId);
-            $event = new UpdatedTransactionGroup($group, true, true);
+            // TODO in theory the "unifyAccounts" method could lead to the need for run recalculations.
+            $event = new UpdatedTransactionGroup($group, true, true, false);
             $handler->unifyAccounts($event);
         }
 

app/Console/Commands/Correction/CorrectsIbans.php

@@ -43,7 +43,7 @@ class CorrectsIbans extends Command
      */
     public function handle(): int
     {
-        $accounts = Account::whereNotNull('iban')->get();
+        $accounts = Account::with('accountMeta')->get();
         $this->filterIbans($accounts);
         $this->countAndCorrectIbans($accounts);
 
@@ -54,14 +54,26 @@ class CorrectsIbans extends Command
     {
         /** @var Account $account */
         foreach ($accounts as $account) {
-            $iban    = (string) $account->iban;
-            $newIban = app('steam')->filterSpaces($iban);
+            $iban          = (string) $account->iban;
+            $newIban       = app('steam')->filterSpaces($iban);
             if ('' !== $iban && $iban !== $newIban) {
                 $account->iban = $newIban;
                 $account->save();
                 $this->friendlyInfo(sprintf('Removed spaces from IBAN of account #%d', $account->id));
                 ++$this->count;
             }
+            // same for account number:
+            $accountNumber = $account->accountMeta->where('name', 'account_number')->first();
+            if (null !== $accountNumber) {
+                $number    = (string) $accountNumber->value;
+                $newNumber = app('steam')->filterSpaces($number);
+                if ('' !== $number && $number !== $newNumber) {
+                    $accountNumber->value = $newNumber;
+                    $accountNumber->save();
+                    $this->friendlyInfo(sprintf('Removed spaces from account number of account #%d', $account->id));
+                    ++$this->count;
+                }
+            }
         }
     }
 

app/Console/Commands/Correction/CorrectsLongDescriptions.php

@@ -48,8 +48,8 @@ class CorrectsLongDescriptions extends Command
 
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            if (strlen($journal->description) > self::MAX_LENGTH) {
-                $journal->description = substr($journal->description, 0, self::MAX_LENGTH);
+            if (strlen((string) $journal->description) > self::MAX_LENGTH) {
+                $journal->description = substr((string) $journal->description, 0, self::MAX_LENGTH);
                 $journal->save();
                 $this->friendlyWarning(sprintf('Truncated description of transaction journal #%d', $journal->id));
                 ++$count;
@@ -61,7 +61,7 @@ class CorrectsLongDescriptions extends Command
         /** @var TransactionGroup $group */
         foreach ($groups as $group) {
             if (strlen((string) $group->title) > self::MAX_LENGTH) {
-                $group->title = substr($group->title, 0, self::MAX_LENGTH);
+                $group->title = substr((string) $group->title, 0, self::MAX_LENGTH);
                 $group->save();
                 $this->friendlyWarning(sprintf('Truncated description of transaction group #%d', $group->id));
                 ++$count;

app/Console/Commands/Correction/CorrectsNativeAmounts.php

@@ -38,8 +38,8 @@ use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\UserGroup;
-use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Console\Command;
@@ -128,9 +128,7 @@ class CorrectsNativeAmounts extends Command
         $repository->setUserGroup($userGroup);
         $set        = $repository->getPiggyBanks();
         $set        = $set->filter(
-            static function (PiggyBank $piggyBank) use ($currency) {
-                return $currency->id !== $piggyBank->transaction_currency_id;
-            }
+            static fn (PiggyBank $piggyBank) => $currency->id !== $piggyBank->transaction_currency_id
         );
         foreach ($set as $piggyBank) {
             $piggyBank->encrypted = false;

app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php

@@ -76,7 +76,7 @@ class CorrectsOpeningBalanceCurrencies extends Command
     {
         // get the asset account for this opening balance:
         $account = $this->getAccount($journal);
-        if (null === $account) {
+        if (!$account instanceof Account) {
             $message = sprintf('Transaction journal #%d has no valid account. Can\'t fix this line.', $journal->id);
             app('log')->warning($message);
             $this->friendlyError($message);

app/Console/Commands/Correction/CorrectsRecurringTransactions.php

@@ -100,7 +100,7 @@ class CorrectsRecurringTransactions extends Command
         $destination = $transaction->destinationAccount;
         $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)) {
+        if (null !== $link && strtolower((string) $type->type) !== strtolower($link)) {
             $this->friendlyWarning(
                 sprintf('Recurring transaction #%d should be a "%s" but is a "%s" and will be corrected.', $recurrence->id, $link, $type->type)
             );

app/Console/Commands/Correction/CorrectsTransactionTypes.php

@@ -115,9 +115,7 @@ class CorrectsTransactionTypes extends Command
     private function getSourceAccount(TransactionJournal $journal): Account
     {
         $collection  = $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount < 0;
-            }
+            static fn (Transaction $transaction) => $transaction->amount < 0
         );
         if (0 === $collection->count()) {
             throw new FireflyException(sprintf('300001: Journal #%d has no source transaction.', $journal->id));
@@ -144,9 +142,7 @@ class CorrectsTransactionTypes extends Command
     private function getDestinationAccount(TransactionJournal $journal): Account
     {
         $collection  = $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount > 0;
-            }
+            static fn (Transaction $transaction) => $transaction->amount > 0
         );
         if (0 === $collection->count()) {
             throw new FireflyException(sprintf('300004: Journal #%d has no destination transaction.', $journal->id));

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -25,13 +25,17 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use ValueError;
+use stdClass;
 
 class CorrectsUnevenAmount extends Command
 {
@@ -47,7 +51,12 @@ class CorrectsUnevenAmount extends Command
     public function handle(): int
     {
         $this->count = 0;
+        // convert transfers with foreign currency info where the amount is NOT uneven (it should be)
         $this->convertOldStyleTransfers();
+
+        // convert old-style transactions between assets and liabilities.
+        $this->convertOldStyleTransactions();
+
         $this->fixUnevenAmounts();
         $this->matchCurrencies();
         if (true === config('firefly.feature_flags.running_balance_column')) {
@@ -72,8 +81,6 @@ class CorrectsUnevenAmount extends Command
         ;
         $count        = 0;
 
-        Log::debug(sprintf('Found %d potential journal(s)', $transactions->count()));
-
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
             /** @var null|TransactionJournal $journal */
@@ -115,17 +122,22 @@ class CorrectsUnevenAmount extends Command
                 ++$count;
             }
         }
+        if (0 === $count) {
+            return;
+        }
+        $this->friendlyPositive(sprintf('Fixed %d transfer(s) with unbalanced amounts.', $count));
     }
 
     private function fixUnevenAmounts(): void
     {
+        Log::debug('fixUnevenAmounts()');
         $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 */
+        /** @var stdClass $entry */
         foreach ($journals as $entry) {
             $sum = (string) $entry->the_sum;
             if (!is_numeric($sum)
@@ -147,13 +159,13 @@ class CorrectsUnevenAmount extends Command
 
             try {
                 $res = bccomp($sum, '0');
-            } catch (\ValueError $e) {
+            } catch (ValueError $e) {
                 $this->friendlyError(sprintf('Could not bccomp("%s", "0").', $sum));
                 Log::error($e->getMessage());
                 Log::error($e->getTraceAsString());
             }
             if (0 !== $res) {
-                $this->fixJournal($entry->transaction_journal_id);
+                $this->fixJournal((int) $entry->transaction_journal_id);
             }
         }
     }
@@ -184,7 +196,7 @@ class CorrectsUnevenAmount extends Command
             return;
         }
 
-        $amount              = bcmul('-1', $source->amount);
+        $amount              = bcmul('-1', (string) $source->amount);
 
         // fix amount of destination:
         /** @var null|Transaction $destination */
@@ -207,8 +219,8 @@ class CorrectsUnevenAmount extends Command
         }
 
         // may still be able to salvage this journal if it is a transfer with foreign currency info
-        if ($this->isForeignCurrencyTransfer($journal)) {
-            Log::debug(sprintf('Can skip foreign currency transfer #%d.', $journal->id));
+        if ($this->isForeignCurrencyTransfer($journal) || $this->isBetweenAssetAndLiability($journal)) {
+            Log::debug(sprintf('Can skip foreign currency transfer / asset+liability transaction #%d.', $journal->id));
 
             return;
         }
@@ -249,9 +261,9 @@ class CorrectsUnevenAmount extends Command
         //        Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true)));
         //        Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int)  $source->foreign_currency_id, true)));
 
-        if (0 === bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount))
+        if (0 === bccomp((string) app('steam')->positive($source->amount), (string) app('steam')->positive($destination->foreign_amount))
             && $source->transaction_currency_id === $destination->foreign_currency_id
-            && 0 === bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount))
+            && 0 === bccomp((string) app('steam')->positive($destination->amount), (string) app('steam')->positive($source->foreign_amount))
             && (int) $destination->transaction_currency_id === (int) $source->foreign_currency_id
         ) {
             return true;
@@ -271,13 +283,13 @@ class CorrectsUnevenAmount extends Command
 
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            if (!$this->isForeignCurrencyTransfer($journal)) {
+            if (!$this->isForeignCurrencyTransfer($journal) && !$this->isBetweenAssetAndLiability($journal)) {
                 Transaction::where('transaction_journal_id', $journal->id)->update(['transaction_currency_id' => $journal->transaction_currency_id]);
                 ++$count;
 
                 continue;
             }
-            Log::debug(sprintf('Can skip foreign currency transfer #%d.', $journal->id));
+            Log::debug(sprintf('Can skip foreign currency transfer or transaction between asset and liability #%d.', $journal->id));
         }
         if (0 === $count) {
             return;
@@ -285,4 +297,155 @@ class CorrectsUnevenAmount extends Command
 
         $this->friendlyPositive(sprintf('Fixed %d journal(s) with mismatched currencies.', $journals->count()));
     }
+
+    private function isBetweenAssetAndLiability(TransactionJournal $journal): bool
+    {
+        /** @var Transaction $sourceTransaction */
+        $sourceTransaction      = $journal->transactions()->where('amount', '<', 0)->first();
+
+        /** @var Transaction $destinationTransaction */
+        $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
+        if (null === $sourceTransaction || null === $destinationTransaction) {
+            Log::warning('Either transaction is false, stop.');
+
+            return false;
+        }
+        if (null === $sourceTransaction->foreign_amount || null === $destinationTransaction->foreign_amount) {
+            Log::warning('Either foreign amount is false, stop.');
+
+            return false;
+        }
+
+        $source                 = $sourceTransaction->account;
+        $destination            = $destinationTransaction->account;
+
+        if (null === $source || null === $destination) {
+            Log::warning('Either is false, stop.');
+
+            return false;
+        }
+        $sourceTypes            = [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
+
+        // source is liability, destination is asset
+        if (in_array($source->accountType->type, $sourceTypes, true) && AccountTypeEnum::ASSET->value === $destination->accountType->type) {
+            Log::debug('Source is a liability account, destination is an asset account, return TRUE.');
+
+            return true;
+        }
+        // source is asset, destination is liability
+        if (in_array($destination->accountType->type, $sourceTypes, true) && AccountTypeEnum::ASSET->value === $source->accountType->type) {
+            Log::debug('Destination is a liability account, source is an asset account, return TRUE.');
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private function convertOldStyleTransactions(): void
+    {
+
+        /** @var AccountRepositoryInterface $repository */
+        $repository   = app(AccountRepositoryInterface::class);
+        Log::debug('convertOldStyleTransactions()');
+        $count        = 0;
+        $transactions = Transaction::distinct()
+            ->leftJoin('transaction_journals', 'transaction_journals.id', 'transactions.transaction_journal_id')
+            ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
+            ->leftJoin('accounts', 'accounts.id', 'transactions.account_id')
+            ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+            ->whereNot('transaction_types.type', TransactionTypeEnum::TRANSFER->value)
+            ->whereNotNull('foreign_currency_id')
+            ->whereNotNull('foreign_amount')
+            ->whereIn('account_types.type', [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::LOAN->value])
+            ->get(['transactions.transaction_journal_id'])
+        ;
+
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            /** @var null|TransactionJournal $journal */
+            $journal        = TransactionJournal::find($transaction->transaction_journal_id);
+            $repository->setUser($journal->user);
+            if (null === $journal) {
+                Log::debug('Found no journal, continue.');
+
+                continue;
+            }
+            if (!$this->isBetweenAssetAndLiability($journal)) {
+                Log::debug('Not between asset and liability, continue.');
+
+                continue;
+            }
+            $source         = $journal->transactions()->where('amount', '<', 0)->first();
+            $destination    = $journal->transactions()->where('amount', '>', 0)->first();
+            $sourceAccount  = $source->account;
+            $destAccount    = $destination->account;
+            $sourceCurrency = $repository->getAccountCurrency($sourceAccount);
+            $destCurrency   = $repository->getAccountCurrency($destAccount);
+            if (null === $source || null === $destination) {
+                Log::debug('Either transaction is NULL, continue.');
+
+                continue;
+            }
+            if (0 === bccomp((string) $source->amount, (string) $source->foreign_amount) && 0 === bccomp((string) $source->foreign_amount, (string) $source->amount)) {
+                Log::debug('Already fixed, continue.');
+
+                continue;
+            }
+            // source transaction. Switch info when does not match.
+            if ((int) $source->transaction_currency_id !== (int) $sourceCurrency->id) {
+                Log::debug(sprintf('Ready to swap data in transaction #%d.', $source->id));
+                // swap amounts.
+                $amount                          = $source->amount;
+                $currency                        = $source->transaction_currency_id;
+                $source->amount                  = $source->foreign_amount;
+                $source->transaction_currency_id = $source->foreign_currency_id;
+                $source->foreign_amount          = $amount;
+                $source->foreign_currency_id     = $currency;
+                $source->saveQuietly();
+                $source->refresh();
+                //                Log::debug(sprintf('source->amount                  = %s', $source->amount));
+                //                Log::debug(sprintf('source->transaction_currency_id = %s', $source->transaction_currency_id));
+                //                Log::debug(sprintf('source->foreign_amount          = %s', $source->foreign_amount));
+                //                Log::debug(sprintf('source->foreign_currency_id     = %s', $source->foreign_currency_id));
+                ++$count;
+            }
+            // same but for destination
+            if ((int) $destination->transaction_currency_id !== (int) $destCurrency->id) {
+                ++$count;
+                Log::debug(sprintf('Ready to swap data in transaction #%d.', $destination->id));
+                // swap amounts.
+                $amount                               = $destination->amount;
+                $currency                             = $destination->transaction_currency_id;
+                $destination->amount                  = $destination->foreign_amount;
+                $destination->transaction_currency_id = $destination->foreign_currency_id;
+                $destination->foreign_amount          = $amount;
+                $destination->foreign_currency_id     = $currency;
+                $destination->balance_dirty           = true;
+                $destination->saveQuietly();
+                $destination->refresh();
+                //                Log::debug(sprintf('destination->amount                  = %s', $destination->amount));
+                //                Log::debug(sprintf('destination->transaction_currency_id = %s', $destination->transaction_currency_id));
+                //                Log::debug(sprintf('destination->foreign_amount          = %s', $destination->foreign_amount));
+                //                Log::debug(sprintf('destination->foreign_currency_id     = %s', $destination->foreign_currency_id));
+            }
+
+
+            //            // only fix the destination transaction
+            //            $destination->foreign_currency_id     = $source->transaction_currency_id;
+            //            $destination->foreign_amount          = app('steam')->positive($source->amount);
+            //            $destination->transaction_currency_id = $source->foreign_currency_id;
+            //            $destination->amount                  = app('steam')->positive($source->foreign_amount);
+            //            $destination->balance_dirty           = true;
+            //            $source->balance_dirty                = true;
+            //            $destination->save();
+            //            $source->save();
+            //            $this->friendlyWarning(sprintf('Corrected foreign amounts of transaction #%d.', $journal->id));
+        }
+        if (0 === $count) {
+            return;
+        }
+
+        $this->friendlyPositive(sprintf('Fixed %d journal(s) with unbalanced amounts.', $count));
+    }
 }

app/Console/Commands/Correction/CreatesAccessTokens.php

@@ -28,6 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
+use Exception;
 
 class CreatesAccessTokens extends Command
 {
@@ -40,7 +41,7 @@ class CreatesAccessTokens extends Command
     /**
      * Execute the console command.
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function handle(): int
     {

app/Console/Commands/Correction/RemovesEmptyGroups.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use Illuminate\Console\Command;
+use Exception;
 
 class RemovesEmptyGroups extends Command
 {
@@ -38,7 +39,7 @@ class RemovesEmptyGroups extends Command
     /**
      * Execute the console command.
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function handle(): int
     {

app/Console/Commands/Correction/RemovesOrphanedTransactions.php

@@ -28,6 +28,8 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
+use Exception;
+use stdClass;
 
 /**
  * Deletes transactions where the journal has been deleted.
@@ -43,7 +45,7 @@ class RemovesOrphanedTransactions extends Command
     /**
      * Execute the console command.
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function handle(): int
     {
@@ -85,7 +87,7 @@ class RemovesOrphanedTransactions extends Command
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     private function deleteOrphanedTransactions(): void
     {
@@ -102,7 +104,7 @@ class RemovesOrphanedTransactions extends Command
             )
         ;
 
-        /** @var \stdClass $entry */
+        /** @var stdClass $entry */
         foreach ($set as $entry) {
             $transaction = Transaction::find((int) $entry->transaction_id);
             if (null !== $transaction) {

app/Console/Commands/Export/ExportsData.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Export;
 
+use FireflyIII\Models\TransactionJournal;
 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Console\Commands\VerifiesAccessToken;
@@ -35,6 +36,10 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use Exception;
+use InvalidArgumentException;
+
+use function Safe\file_put_contents;
 
 class ExportsData extends Command
 {
@@ -139,7 +144,7 @@ class ExportsData extends Command
 
     /**
      * @throws FireflyException
-     * @throws \Exception
+     * @throws Exception
      */
     private function parseOptions(): array
     {
@@ -169,7 +174,7 @@ class ExportsData extends Command
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     private function getDateParameter(string $field): Carbon
     {
@@ -183,7 +188,7 @@ class ExportsData extends Command
         if (is_string($this->option($field))) {
             try {
                 $date = Carbon::createFromFormat('!Y-m-d', $this->option($field));
-            } catch (\InvalidArgumentException $e) {
+            } catch (InvalidArgumentException $e) {
                 app('log')->error($e->getMessage());
                 $this->friendlyError(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
                 $error = true;
@@ -201,7 +206,7 @@ class ExportsData extends Command
 
         if (true === $error && 'start' === $field) {
             $journal = $this->journalRepository->firstNull();
-            $date    = null === $journal ? today(config('app.timezone'))->subYear() : $journal->date;
+            $date    = $journal instanceof TransactionJournal ? $journal->date : today(config('app.timezone'))->subYear();
             $date->startOfDay();
 
             return $date;
@@ -273,7 +278,7 @@ class ExportsData extends Command
      */
     private function exportData(array $options, array $data): void
     {
-        $date = date('Y_m_d');
+        $date = Carbon::now()->format('Y_m_d');
         foreach ($data as $key => $content) {
             $file = sprintf('%s%s_%s.csv', $options['directory'], $date, $key);
             if (false === $options['force'] && file_exists($file)) {

app/Console/Commands/Integrity/ReportsEmptyObjects.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use Illuminate\Console\Command;
+use stdClass;
 
 class ReportsEmptyObjects extends Command
 {
@@ -66,7 +67,7 @@ class ReportsEmptyObjects extends Command
             ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
         ;
 
-        /** @var \stdClass $entry */
+        /** @var stdClass $entry */
         foreach ($set as $entry) {
             $line = sprintf(
                 'User #%d (%s) has budget #%d ("%s") which has no transaction journals.',
@@ -92,7 +93,7 @@ class ReportsEmptyObjects extends Command
             ->get(['categories.id', 'categories.name', 'categories.user_id', 'users.email'])
         ;
 
-        /** @var \stdClass $entry */
+        /** @var stdClass $entry */
         foreach ($set as $entry) {
             $line = sprintf(
                 'User #%d (%s) has category #%d ("%s") which has no transaction journals.',
@@ -115,7 +116,7 @@ class ReportsEmptyObjects extends Command
             ->get(['tags.id', 'tags.tag', 'tags.user_id', 'users.email'])
         ;
 
-        /** @var \stdClass $entry */
+        /** @var stdClass $entry */
         foreach ($set as $entry) {
             $line = sprintf(
                 'User #%d (%s) has tag #%d ("%s") which has no transaction journals.',
@@ -142,7 +143,7 @@ class ReportsEmptyObjects extends Command
             )
         ;
 
-        /** @var \stdClass $entry */
+        /** @var stdClass $entry */
         foreach ($set as $entry) {
             $line = 'User #%d (%s) has account #%d ("%s") which has no transactions.';
             $line = sprintf($line, $entry->user_id, $entry->email, $entry->id, $entry->name);

app/Console/Commands/Integrity/ReportsIntegrity.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Integrity;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Schema;
 
 class ReportsIntegrity extends Command
 {
@@ -41,7 +42,7 @@ class ReportsIntegrity extends Command
     public function handle(): int
     {
         // if table does not exist, return false
-        if (!\Schema::hasTable('users')) {
+        if (!Schema::hasTable('users')) {
             return 1;
         }
         $commands = [

app/Console/Commands/Integrity/ValidatesEnvironmentVariables.php

@@ -30,13 +30,6 @@ class ValidatesEnvironmentVariables extends Command
 {
     use ShowsFriendlyMessages;
 
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature   = 'integrity:validates-environment-variables';
-
     /**
      * The console command description.
      *
@@ -44,6 +37,13 @@ class ValidatesEnvironmentVariables extends Command
      */
     protected $description = 'Makes sure you use the correct variables.';
 
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'integrity:validates-environment-variables';
+
     /**
      * Execute the console command.
      */

app/Console/Commands/System/CreatesDatabase.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Console\Commands\System;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 use PDO;
+use PDOException;
 
 class CreatesDatabase extends Command
 {
@@ -53,15 +54,15 @@ class CreatesDatabase extends Command
         $this->friendlyLine(sprintf('DSN is %s', $dsn));
 
         $options = [
-            \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
-            \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
-            \PDO::ATTR_EMULATE_PREPARES   => false,
+            PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
+            PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+            PDO::ATTR_EMULATE_PREPARES   => false,
         ];
 
         // when it fails, display error
         try {
-            $pdo = new \PDO($dsn, (string) env('DB_USERNAME'), (string) env('DB_PASSWORD'), $options);
-        } catch (\PDOException $e) {
+            $pdo = new PDO($dsn, (string) env('DB_USERNAME'), (string) env('DB_PASSWORD'), $options);
+        } catch (PDOException $e) {
             $this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));
 
             return 1;