Bump mailersend/laravel-driver from 2.9.1 to 2.12.0

Bumps [mailersend/laravel-driver](https://github.com/mailersend/mailersend-laravel-driver) from 2.9.1 to 2.12.0.
- [Release notes](https://github.com/mailersend/mailersend-laravel-driver/releases)
- [Commits](https://github.com/mailersend/mailersend-laravel-driver/compare/v2.9.1...v2.12.0)

---
updated-dependencies:
- dependency-name: mailersend/laravel-driver
  dependency-version: 2.12.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

@@ -402,16 +402,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.89.2",
+            "version": "v3.92.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "7569658f91e475ec93b99bd5964b059ad1336dcf"
+                "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7569658f91e475ec93b99bd5964b059ad1336dcf",
-                "reference": "7569658f91e475ec93b99bd5964b059ad1336dcf",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
+                "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
                 "shasum": ""
             },
             "require": {
@@ -429,17 +429,17 @@
                 "react/socket": "^1.16",
                 "react/stream": "^1.4",
                 "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
-                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0",
-                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
                 "symfony/polyfill-mbstring": "^1.33",
                 "symfony/polyfill-php80": "^1.33",
                 "symfony/polyfill-php81": "^1.33",
                 "symfony/polyfill-php84": "^1.33",
-                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2",
-                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0"
+                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2 || ^8.0",
+                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
             },
             "require-dev": {
                 "facile-it/paraunit": "^1.3.1 || ^2.7",
@@ -451,8 +451,9 @@
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
                 "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2",
-                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2"
+                "symfony/polyfill-php85": "^1.33",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2 || ^8.0",
+                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2 || ^8.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -467,7 +468,7 @@
                     "PhpCsFixer\\": "src/"
                 },
                 "exclude-from-classmap": [
-                    "src/Fixer/Internal/*"
+                    "src/**/Internal/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -493,7 +494,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.89.2"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.3"
             },
             "funding": [
                 {
@@ -501,7 +502,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-11-06T21:12:50+00:00"
+            "time": "2025-12-18T10:45:02+00:00"
         },
         {
             "name": "psr/container",
@@ -805,16 +806,16 @@
         },
         {
             "name": "react/dns",
-            "version": "v1.13.0",
+            "version": "v1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/dns.git",
-                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
+                "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
-                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/7562c05391f42701c1fccf189c8225fece1cd7c3",
+                "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3",
                 "shasum": ""
             },
             "require": {
@@ -869,7 +870,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/dns/issues",
-                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
+                "source": "https://github.com/reactphp/dns/tree/v1.14.0"
             },
             "funding": [
                 {
@@ -877,20 +878,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-06-13T14:18:03+00:00"
+            "time": "2025-11-18T19:34:28+00:00"
         },
         {
             "name": "react/event-loop",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/event-loop.git",
-                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
+                "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
-                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
+                "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
                 "shasum": ""
             },
             "require": {
@@ -941,7 +942,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/event-loop/issues",
-                "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
+                "source": "https://github.com/reactphp/event-loop/tree/v1.6.0"
             },
             "funding": [
                 {
@@ -949,7 +950,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-11-13T13:48:05+00:00"
+            "time": "2025-11-17T20:46:25+00:00"
         },
         {
             "name": "react/promise",
@@ -1026,16 +1027,16 @@
         },
         {
             "name": "react/socket",
-            "version": "v1.16.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/socket.git",
-                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
+                "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
-                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/ef5b17b81f6f60504c539313f94f2d826c5faa08",
+                "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08",
                 "shasum": ""
             },
             "require": {
@@ -1094,7 +1095,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/socket/issues",
-                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
+                "source": "https://github.com/reactphp/socket/tree/v1.17.0"
             },
             "funding": [
                 {
@@ -1102,7 +1103,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-07-26T10:38:09+00:00"
+            "time": "2025-11-19T20:47:34+00:00"
         },
         {
             "name": "react/stream",
@@ -1251,47 +1252,39 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.6",
+            "version": "v8.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c28ad91448f86c5f6d9d2c70f0cf68bf135f252a"
+                "reference": "fcb73f69d655b48fcb894a262f074218df08bd58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c28ad91448f86c5f6d9d2c70f0cf68bf135f252a",
-                "reference": "c28ad91448f86c5f6d9d2c70f0cf68bf135f252a",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fcb73f69d655b48fcb894a262f074218df08bd58",
+                "reference": "fcb73f69d655b48fcb894a262f074218df08bd58",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/polyfill-mbstring": "~1.0",
+                "php": ">=8.4",
+                "symfony/polyfill-mbstring": "^1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^7.2"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<6.4",
-                "symfony/dotenv": "<6.4",
-                "symfony/event-dispatcher": "<6.4",
-                "symfony/lock": "<6.4",
-                "symfony/process": "<6.4"
+                "symfony/string": "^7.4|^8.0"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/process": "^6.4|^7.0",
-                "symfony/stopwatch": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0"
+                "symfony/config": "^7.4|^8.0",
+                "symfony/dependency-injection": "^7.4|^8.0",
+                "symfony/event-dispatcher": "^7.4|^8.0",
+                "symfony/http-foundation": "^7.4|^8.0",
+                "symfony/http-kernel": "^7.4|^8.0",
+                "symfony/lock": "^7.4|^8.0",
+                "symfony/messenger": "^7.4|^8.0",
+                "symfony/process": "^7.4|^8.0",
+                "symfony/stopwatch": "^7.4|^8.0",
+                "symfony/var-dumper": "^7.4|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -1325,7 +1318,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.6"
+                "source": "https://github.com/symfony/console/tree/v8.0.1"
             },
             "funding": [
                 {
@@ -1345,7 +1338,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-04T01:21:42+00:00"
+            "time": "2025-12-05T15:25:33+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1416,24 +1409,24 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.3.3",
+            "version": "v8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
+                "reference": "573f95783a2ec6e38752979db139f09fec033f03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
-                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/573f95783a2ec6e38752979db139f09fec033f03",
+                "reference": "573f95783a2ec6e38752979db139f09fec033f03",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
+                "php": ">=8.4",
                 "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<6.4",
+                "symfony/security-http": "<7.4",
                 "symfony/service-contracts": "<2.5"
             },
             "provide": {
@@ -1442,13 +1435,14 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/error-handler": "^6.4|^7.0",
-                "symfony/expression-language": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/config": "^7.4|^8.0",
+                "symfony/dependency-injection": "^7.4|^8.0",
+                "symfony/error-handler": "^7.4|^8.0",
+                "symfony/expression-language": "^7.4|^8.0",
+                "symfony/framework-bundle": "^7.4|^8.0",
+                "symfony/http-foundation": "^7.4|^8.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^6.4|^7.0"
+                "symfony/stopwatch": "^7.4|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -1476,7 +1470,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.3.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v8.0.0"
             },
             "funding": [
                 {
@@ -1496,7 +1490,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T11:49:31+00:00"
+            "time": "2025-10-30T14:17:19+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1576,25 +1570,25 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.3.6",
+            "version": "v8.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "e9bcfd7837928ab656276fe00464092cc9e1826a"
+                "reference": "d937d400b980523dc9ee946bb69972b5e619058d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e9bcfd7837928ab656276fe00464092cc9e1826a",
-                "reference": "e9bcfd7837928ab656276fe00464092cc9e1826a",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d937d400b980523dc9ee946bb69972b5e619058d",
+                "reference": "d937d400b980523dc9ee946bb69972b5e619058d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
+                "php": ">=8.4",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
             "require-dev": {
-                "symfony/process": "^6.4|^7.0"
+                "symfony/process": "^7.4|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -1622,7 +1616,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.3.6"
+                "source": "https://github.com/symfony/filesystem/tree/v8.0.1"
             },
             "funding": [
                 {
@@ -1642,27 +1636,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-05T09:52:27+00:00"
+            "time": "2025-12-01T09:13:36+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.5",
+            "version": "v8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "9f696d2f1e340484b4683f7853b273abff94421f"
+                "reference": "7598dd5770580fa3517ec83e8da0c9b9e01f4291"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9f696d2f1e340484b4683f7853b273abff94421f",
-                "reference": "9f696d2f1e340484b4683f7853b273abff94421f",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/7598dd5770580fa3517ec83e8da0c9b9e01f4291",
+                "reference": "7598dd5770580fa3517ec83e8da0c9b9e01f4291",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.4"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.4|^7.0"
+                "symfony/filesystem": "^7.4|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -1690,7 +1684,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.5"
+                "source": "https://github.com/symfony/finder/tree/v8.0.0"
             },
             "funding": [
                 {
@@ -1710,24 +1704,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-10-15T18:45:57+00:00"
+            "time": "2025-11-05T14:36:47+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.3.3",
+            "version": "v8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d"
+                "reference": "d2b592535ffa6600c265a3893a7f7fd2bad82dd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
-                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/d2b592535ffa6600c265a3893a7f7fd2bad82dd7",
+                "reference": "d2b592535ffa6600c265a3893a7f7fd2bad82dd7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
+                "php": ">=8.4",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -1761,7 +1755,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.3.3"
+                "source": "https://github.com/symfony/options-resolver/tree/v8.0.0"
             },
             "funding": [
                 {
@@ -1781,7 +1775,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-05T10:16:07+00:00"
+            "time": "2025-11-12T15:55:31+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2364,20 +2358,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.3.4",
+            "version": "v8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b"
+                "reference": "a0a750500c4ce900d69ba4e9faf16f82c10ee149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f24f8f316367b30810810d4eb30c543d7003ff3b",
-                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b",
+                "url": "https://api.github.com/repos/symfony/process/zipball/a0a750500c4ce900d69ba4e9faf16f82c10ee149",
+                "reference": "a0a750500c4ce900d69ba4e9faf16f82c10ee149",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.4"
             },
             "type": "library",
             "autoload": {
@@ -2405,7 +2399,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.3.4"
+                "source": "https://github.com/symfony/process/tree/v8.0.0"
             },
             "funding": [
                 {
@@ -2425,7 +2419,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:12:26+00:00"
+            "time": "2025-10-16T16:25:44+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -2516,20 +2510,20 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v7.3.0",
+            "version": "v8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd"
+                "reference": "67df1914c6ccd2d7b52f70d40cf2aea02159d942"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
-                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/67df1914c6ccd2d7b52f70d40cf2aea02159d942",
+                "reference": "67df1914c6ccd2d7b52f70d40cf2aea02159d942",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
+                "php": ">=8.4",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -2558,7 +2552,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.3.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v8.0.0"
             },
             "funding": [
                 {
@@ -2569,43 +2563,47 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-24T10:49:57+00:00"
+            "time": "2025-08-04T07:36:47+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.3.4",
+            "version": "v8.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f96476035142921000338bad71e5247fbc138872"
+                "reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f96476035142921000338bad71e5247fbc138872",
-                "reference": "f96476035142921000338bad71e5247fbc138872",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ba65a969ac918ce0cc3edfac6cdde847eba231dc",
+                "reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0"
+                "php": ">=8.4",
+                "symfony/polyfill-ctype": "^1.8",
+                "symfony/polyfill-intl-grapheme": "^1.33",
+                "symfony/polyfill-intl-normalizer": "^1.0",
+                "symfony/polyfill-mbstring": "^1.0"
             },
             "conflict": {
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/emoji": "^7.1",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/intl": "^6.4|^7.0",
+                "symfony/emoji": "^7.4|^8.0",
+                "symfony/http-client": "^7.4|^8.0",
+                "symfony/intl": "^7.4|^8.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.4|^7.0"
+                "symfony/var-exporter": "^7.4|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -2644,7 +2642,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.4"
+                "source": "https://github.com/symfony/string/tree/v8.0.1"
             },
             "funding": [
                 {
@@ -2664,7 +2662,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T14:36:48+00:00"
+            "time": "2025-12-01T09:13:36+00:00"
         }
     ],
     "packages-dev": [],
@@ -2675,5 +2673,5 @@
     "prefer-lowest": false,
     "platform": {},
     "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }

.env.example

@@ -188,39 +188,11 @@ MAILERSEND_API_KEY=
 # Firefly III can send you the following messages.
 SEND_ERROR_MESSAGE=true
 
-# These messages contain (sensitive) transaction information:
-SEND_REPORT_JOURNALS=true
-
-# Set this value to true if you want to set the location of certain things, like transactions.
-# Since this involves an external service, it's optional and disabled by default.
-ENABLE_EXTERNAL_MAP=false
-
-#
-# Enable or disable exchange rate conversion.
-#
-ENABLE_EXCHANGE_RATES=false
-
-# Set this value to true if you want Firefly III to download currency exchange rates
-# from the internet. These rates are hosted by the creator of Firefly III inside
-# an Azure Storage Container.
-# Not all currencies may be available. Rates may be wrong.
-ENABLE_EXTERNAL_RATES=false
-
 # The map will default to this location:
 MAP_DEFAULT_LAT=51.983333
 MAP_DEFAULT_LONG=5.916667
 MAP_DEFAULT_ZOOM=6
 
-#
-# Some objects have room for an URL, like transactions and webhooks.
-# By default, the following protocols are allowed:
-# http, https, ftp, ftps, mailto
-#
-# To change this, set your preferred comma separated set below.
-# Be sure to include http, https and other default ones if you need to.
-#
-VALID_URL_PROTOCOLS=
-
 #
 # Firefly III authentication settings
 #
@@ -275,21 +247,6 @@ DISABLE_CSP_HEADER=false
 TRACKER_SITE_ID=
 TRACKER_URL=
 
-#
-# You can automatically submit errors to the Firefly III developer using sentry.io
-#
-# This is entirely optional of course. If you run into errors, I will gladly accept GitHub
-# issues or a forwared email message.
-#
-# If you set this to true, your installation will try to contact sentry.io when it runs into errors.
-#
-REPORT_ERRORS_ONLINE=false
-
-#
-# Firefly III supports webhooks. These are security sensitive and must be enabled manually first.
-#
-ALLOW_WEBHOOKS=false
-
 #
 # The static cron job token can be useful when you use Docker and wish to manage cron jobs.
 # 1. Set this token to any 32-character value (this is important!).
@@ -323,25 +280,12 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 
-#
-# Disable or enable the running balance column data.
-# If you enable this, please also run "php artisan firefly-iii:correct-database"
-# This will take some time the first run.
-#
-USE_RUNNING_BALANCE=false
-
 #
 # The v2 layout is very experimental. If it breaks you get to keep both parts.
 # Be wary of data loss.
 #
 FIREFLY_III_LAYOUT=v1
 
-#
-# Which Query Parser implementation to use for the search engine and rules
-# 'new' is experimental, 'legacy' is the classic one
-#
-QUERY_PARSER_IMPLEMENTATION=new
-
 #
 # Please make sure this URL matches the external URL of your Firefly III installation.
 # It is used to validate specific requests and to generate URLs in emails.

.github/workflows/close-duplicates.yml

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

.github/workflows/depsreview.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout repository'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: 'Dependency review'

.github/workflows/label-actions.yml

@@ -18,4 +18,4 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/label-actions@v4
+      - uses: dessant/label-actions@v5

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
         env:
           version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Import GPG key

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

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Chart;
 
-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -32,11 +31,13 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Navigation;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -48,9 +49,9 @@ class AccountController extends Controller
     use CleansChartData;
     use CollectsAccountsFromFilter;
 
-    protected array $acceptedRoles            = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles                = [UserRoleEnum::READ_ONLY];
 
-    private array                  $chartData = [];
+    private array                      $chartData = [];
     private AccountRepositoryInterface $repository;
 
     /**
@@ -103,7 +104,7 @@ class AccountController extends Controller
         $currency          = $this->repository->getAccountCurrency($account);
         $currentStart      = clone $params['start'];
         $range             = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);
-
+        $period            = $params['period'] ?? '1D';
 
         $previous          = array_values($range)[0]['balance'];
         $pcPrevious        = null;
@@ -129,7 +130,7 @@ class AccountController extends Controller
             'end_date'                => $params['end']->toAtomString(),
             'type'                    => 'line',
             'yAxisID'                 => 0,
-            'period'                  => '1D',
+            'period'                  => $period,
             'entries'                 => [],
             'pc_entries'              => [],
         ];
@@ -141,7 +142,7 @@ class AccountController extends Controller
             $currentSet['primary_currency_decimal_places'] = $this->primaryCurrency->decimal_places;
             $pcPrevious                                    = array_values($range)[0]['pc_balance'];
         }
-
+        // create array of values to collect.
 
         while ($currentStart <= $params['end']) {
             $format                        = $currentStart->format('Y-m-d');
@@ -158,8 +159,8 @@ class AccountController extends Controller
                 $pcPrevious                       = $pcBalance;
                 $currentSet['pc_entries'][$label] = $pcBalance;
             }
-
-            $currentStart->addDay();
+            $currentStart                  = Navigation::addPeriod($currentStart, $period);
+            // $currentStart->addDay();
         }
         $this->chartData[] = $currentSet;
     }

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

@@ -42,6 +42,7 @@ use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\Steam;
 
 /**
  * Class BudgetController
@@ -286,7 +287,7 @@ class BudgetController extends Controller
         }
         if (null !== $limit && $this->convertToPrimary) {
             // convert and add all amounts.
-            $limit->amount = app('steam')->positive($amount);
+            $limit->amount = Steam::positive($amount);
             Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount));
         }
 

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

@@ -40,7 +40,7 @@ class IndexController extends Controller
 {
     use ValidatesUserGroupTrait;
 
-    public const string RESOURCE_KEY = 'currency_exchange_rates';
+    public const string RESOURCE_KEY = 'exchange-rates';
     protected array $acceptedRoles   = [UserRoleEnum::OWNER];
     private ExchangeRateRepositoryInterface $repository;
 

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

@@ -486,7 +486,7 @@ class BasicController extends Controller
                 'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
                 'value_parsed'            => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
                 'local_icon'              => 'money',
-                'sub_title'               => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
+                'sub_title'               => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, bcdiv($availableBudget, (string)$days), false),
             ];
         }
         foreach ($spent as $row) {

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

@@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\System\CronRequest;
 use FireflyIII\Support\Http\Controllers\CronRunner;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class CronController
@@ -50,7 +51,7 @@ class CronController extends Controller
         $return                           = [];
         $return['recurring_transactions'] = $this->runRecurring($config['force'], $config['date']);
         $return['auto_budgets']           = $this->runAutoBudget($config['force'], $config['date']);
-        if (true === config('cer.download_enabled')) {
+        if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data) {
             $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']);
         }
         $return['bill_notifications']     = $this->billWarningCronJob($config['force'], $config['date']);

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

@@ -38,6 +38,7 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class AttemptController
@@ -71,7 +72,7 @@ class AttemptController extends Controller
         if ($message->webhook_id !== $webhook->id) {
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User lists webhook attempts of webhook #%d and message #%d, but webhooks are DISABLED.', $webhook->id, $message->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -115,7 +116,7 @@ class AttemptController extends Controller
             throw new FireflyException('200041: Webhook message and webhook attempt are no match');
         }
 
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User views single webhook attempt #%d of webhook #%d and message #%d, but webhooks are DISABLED', $attempt->id, $webhook->id, $message->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

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

@@ -34,6 +34,7 @@ use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class DestroyController
@@ -63,7 +64,7 @@ class DestroyController extends Controller
      */
     public function destroy(Webhook $webhook): JsonResponse
     {
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to destroy webhook #%d. but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -93,7 +94,7 @@ class DestroyController extends Controller
             throw new FireflyException('200041: Webhook message and webhook attempt are no match');
         }
 
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to destroy webhook #%d, message #%d, attempt #%d, but webhooks are DISABLED.', $webhook->id, $message->id, $attempt->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -121,7 +122,7 @@ class DestroyController extends Controller
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
 
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to destroy webhook #%d, message #%d, but webhooks are DISABLED.', $webhook->id, $message->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

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

@@ -37,6 +37,7 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class MessageController
@@ -65,7 +66,7 @@ class MessageController extends Controller
      */
     public function index(Webhook $webhook): JsonResponse
     {
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to view messages of webhook #%d, but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -105,7 +106,7 @@ class MessageController extends Controller
         if ($message->webhook_id !== $webhook->id) {
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to view message #%d of webhook #%d, but webhooks are DISABLED.', $message->id, $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

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

@@ -42,6 +42,7 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class ShowController
@@ -72,7 +73,7 @@ class ShowController extends Controller
      */
     public function index(): JsonResponse
     {
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info('User tries to view all webhooks, but webhooks are DISABLED.');
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -114,7 +115,7 @@ class ShowController extends Controller
      */
     public function show(Webhook $webhook): JsonResponse
     {
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf('User tries to view webhook #%d, but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -146,7 +147,7 @@ class ShowController extends Controller
      */
     public function triggerTransaction(Webhook $webhook, TransactionGroup $group): JsonResponse
     {
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf('User tries to trigger webhook #%d on transaction group #%d, but webhooks are DISABLED.', $webhook->id, $group->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

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

@@ -34,6 +34,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class StoreController
@@ -63,7 +64,7 @@ class StoreController extends Controller
     public function store(CreateRequest $request): JsonResponse
     {
         $data        = $request->getData();
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info('User tries to store new webhook, but webhooks are DISABLED.', $data);
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

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

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class SubmitController
@@ -58,7 +59,7 @@ class SubmitController extends Controller
      */
     public function submit(Webhook $webhook): JsonResponse
     {
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf('User tries to submit webhook #%d, but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

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

@@ -35,6 +35,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class UpdateController
@@ -63,7 +64,7 @@ class UpdateController extends Controller
     public function update(Webhook $webhook, UpdateRequest $request): JsonResponse
     {
         $data        = $request->getData();
-        if (false === config('firefly.allow_webhooks')) {
+        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf('User tries to update webhook #%d, but webhooks are DISABLED.', $webhook->id), $data);
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php

@@ -23,15 +23,16 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Generic;
 
-use Override;
-use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Api\V1\Requests\ApiRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Rules\Account\IsValidAccountTypeList;
 use FireflyIII\Rules\TransactionType\IsValidTransactionTypeList;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use Illuminate\Contracts\Validation\Validator;
+use Override;
 use RuntimeException;
 
 class ObjectTypeApiRequest extends ApiRequest
@@ -88,7 +89,11 @@ class ObjectTypeApiRequest extends ApiRequest
 
                         // no break
                     case Account::class:
-                        $this->attributes->set('types', $this->mapAccountTypes($type));
+                        $types = $this->mapAccountTypes($type);
+
+                        // remove system account types because autocomplete doesn't need them.
+                        $types = array_values(array_diff($types, [AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::LIABILITY_CREDIT->value]));
+                        $this->attributes->set('types', $types);
 
                         break;
 

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

@@ -40,6 +40,7 @@ use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class StoreRequest
@@ -176,7 +177,7 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         Log::debug('Collect rules of TransactionStoreRequest');
-        $validProtocols = config('firefly.valid_url_protocols');
+        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
         $locationRules  = Location::requestRules([]);
 
         return [

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

@@ -38,6 +38,7 @@ use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class UpdateRequest
@@ -248,7 +249,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
-        $validProtocols = config('firefly.valid_url_protocols');
+        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         return [
             // basic fields for group:
@@ -339,6 +340,9 @@ class UpdateRequest extends FormRequest
                 // if more than one, verify that there are journal ID's present.
                 $this->validateJournalIds($validator, $transactionGroup);
 
+                // if more than one split, needs group title
+                $this->validateGroupDescription($validator);
+
                 // all transaction types must be equal:
                 $this->validateTransactionTypesForUpdate($validator);
 

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -31,6 +31,7 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\ValidatesWebhooks;
 use Illuminate\Foundation\Http\FormRequest;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class CreateRequest
@@ -73,7 +74,7 @@ class CreateRequest extends FormRequest
         $triggers       = implode(',', array_values(Webhook::getTriggers()));
         $responses      = implode(',', array_values(Webhook::getResponses()));
         $deliveries     = implode(',', array_values(Webhook::getDeliveries()));
-        $validProtocols = config('firefly.valid_url_protocols');
+        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         return [
             'title'        => 'required|min:1|max:255|uniqueObjectForUser:webhooks,title',

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

@@ -31,6 +31,7 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\ValidatesWebhooks;
 use Illuminate\Foundation\Http\FormRequest;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class UpdateRequest
@@ -73,7 +74,7 @@ class UpdateRequest extends FormRequest
         $triggers       = implode(',', array_values(Webhook::getTriggers()));
         $responses      = implode(',', array_values(Webhook::getResponses()));
         $deliveries     = implode(',', array_values(Webhook::getDeliveries()));
-        $validProtocols = config('firefly.valid_url_protocols');
+        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         /** @var Webhook $webhook */
         $webhook        = $this->route()->parameter('webhook');

app/Console/Commands/Correction/ClearsEmptyForeignAmounts.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * ClearsEmptyForeignAmounts.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/>.
+ */
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Models\Transaction;
+use Illuminate\Console\Command;
+
+class ClearsEmptyForeignAmounts extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'correction:clears-empty-foreign-amounts';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Removes references to foreign amounts if there is no amount.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        // transaction: has no amount, but reference to currency.
+        $count = Transaction::whereNull('foreign_amount')->whereNotNull('foreign_currency_id')->count();
+        if ($count > 0) {
+            Transaction::whereNull('foreign_amount')->whereNotNull('foreign_currency_id')->update(['foreign_currency_id' => null]);
+            $this->friendlyInfo(sprintf('Corrected %d invalid foreign amount reference(s)', $count));
+        }
+        // transaction: has amount, but no currency.
+        $count = Transaction::whereNull('foreign_currency_id')->whereNotNull('foreign_amount')->count();
+        if ($count > 0) {
+            Transaction::whereNull('foreign_currency_id')->whereNotNull('foreign_amount')->update(['foreign_amount' => null]);
+            $this->friendlyInfo(sprintf('Corrected %d invalid foreign amount reference(s)', $count));
+        }
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/Correction/CorrectsAmounts.php

@@ -39,6 +39,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -78,6 +79,8 @@ class CorrectsAmounts extends Command
 
     private function correctTransfers(): void
     {
+        Log::debug('Will now correct transfers.');
+
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
         $type       = TransactionType::where('type', TransactionTypeEnum::TRANSFER->value)->first();
@@ -88,24 +91,21 @@ class CorrectsAmounts extends Command
             $repository->setUser($journal->user);
             $primary        = Amount::getPrimaryCurrencyByUserGroup($journal->userGroup);
 
-            /** @var null|Transaction $source */
-            $source         = $journal->transactions()->where('amount', '<', 0)->first();
+            $valid          = $this->validateJournal($journal);
+            if (false === $valid) {
+                Log::debug(sprintf('Journal #%d does not need to be fixed or is invalid (see previous messages)', $journal->id));
 
-            /** @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;
             }
+            Log::debug(sprintf('Journal #%d is ready to be corrected (if necessary).', $journal->id));
+            $source         = $journal->transactions()->where('amount', '<', '0')->first();
+            $destination    = $journal->transactions()->where('amount', '>', '0')->first();
             $sourceAccount  = $source->account;
             $destAccount    = $destination->account;
-            if (null === $sourceAccount || null === $destAccount) {
-                continue;
-            }
             $sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $primary;
             $destCurrency   = $repository->getAccountCurrency($destAccount) ?? $primary;
+            Log::debug(sprintf('Currency of source account      #%d "%s" is %s', $sourceAccount->id, $sourceAccount->name, $sourceCurrency->code));
+            Log::debug(sprintf('Currency of destination account #%d "%s" is %s', $destAccount->id, $destAccount->name, $destCurrency->code));
 
             if ($sourceCurrency->id === $destCurrency->id) {
                 Log::debug('Both accounts have the same currency. Removing foreign currency info.');
@@ -119,22 +119,40 @@ class CorrectsAmounts extends Command
                 continue;
             }
 
-            // validate source
+            // validate source transaction
             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));
+                Log::debug(sprintf('[a] Journal #%d: transaction #%d refers to foreign currency "%s" but should refer to "%s".', $journal->id, $source->id, $source->foreignCurrency->code, $destCurrency->code));
                 $source->foreign_currency_id = $destCurrency->id;
                 $source->save();
             }
+            if ($sourceCurrency->id !== $source->transaction_currency_id) {
+                Log::debug(sprintf('[b] Journal #%d: transaction #%d refers to currency "%s" but should refer to "%s".', $journal->id, $source->id, $source->transactionCurrency->code, $sourceCurrency->code));
+                $source->transaction_currency_id = $sourceCurrency->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));
+                Log::debug(sprintf('[c] Journal #%d: transaction #%d refers to foreign currency "%s" but should refer to "%s".', $journal->id, $destination->id, $destination->foreignCurrency->code, $sourceCurrency->code));
                 $destination->foreign_currency_id = $sourceCurrency->id;
                 $destination->save();
             }
+
+            if ($destCurrency->id !== $destination->transaction_currency_id) {
+                Log::debug(sprintf('[d] Journal #%d: transaction #%d refers to currency "%s" but should refer to "%s".', $journal->id, $destination->id, $destination->transactionCurrency->code, $destCurrency->code));
+                $destination->transaction_currency_id = $destCurrency->id;
+                $destination->save();
+            }
+            Log::debug(sprintf('Done with journal #%d.', $journal->id));
         }
     }
 
+    private function deleteJournal(TransactionJournal $journal): void
+    {
+        $journal->transactionGroup?->delete();
+        $journal->delete();
+    }
+
     private function fixAutoBudgets(): void
     {
         $count = AutoBudget::where('amount', '<', 0)->update(['amount' => DB::raw('amount * -1')]);
@@ -234,7 +252,7 @@ class CorrectsAmounts extends Command
     private function fixRuleTrigger(RuleTrigger $item): bool
     {
         try {
-            $check = bccomp((string) $item->trigger_value, '0');
+            $check = bccomp((string)$item->trigger_value, '0');
         } 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;
@@ -244,7 +262,7 @@ class CorrectsAmounts extends Command
             return false;
         }
         if (-1 === $check) {
-            $item->trigger_value = app('steam')->positive($item->trigger_value);
+            $item->trigger_value = Steam::positive($item->trigger_value);
             $item->save();
 
             return true;
@@ -252,4 +270,57 @@ class CorrectsAmounts extends Command
 
         return false;
     }
+
+    private function validateJournal(TransactionJournal $journal): bool
+    {
+        $countSource   = $journal->transactions()->where('amount', '<', 0)->count();
+        $countDest     = $journal->transactions()->where('amount', '>', 0)->count();
+
+        if (1 !== $countSource || 1 !== $countDest) {
+            $this->friendlyError(sprintf('Transaction journal #%d has bad transaction information. Will delete.', $journal->id));
+            $this->deleteJournal($journal);
+            Log::error(sprintf('Transaction journal #%d has bad transaction information. Will delete.', $journal->id));
+
+            return false;
+        }
+
+        /** @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) {
+            $this->friendlyError(sprintf('Could not find source OR destination for journal #%d .', $journal->id));
+            Log::error(sprintf('Could not find source OR destination for journal #%d .', $journal->id));
+            $this->deleteJournal($journal);
+
+            return false;
+        }
+        if (null === $source->foreign_currency_id || null === $destination->foreign_currency_id) {
+            Log::debug('No foreign currency information is present, can safely continue with other transactions.');
+
+            return false;
+        }
+        if (null === $source->foreign_amount || null === $destination->foreign_amount) {
+            $this->friendlyError(sprintf('Transactions of journal #%d have no foreign amount, but have foreign currency info. Will reset this.', $journal->id));
+            $source->foreign_currency_id      = null;
+            $source->save();
+            $destination->foreign_currency_id = null;
+            $source->save();
+
+            return false;
+        }
+
+        $sourceAccount = $source->account;
+        $destAccount   = $destination->account;
+        if (null === $sourceAccount || null === $destAccount) {
+            $this->friendlyError(sprintf('Could not find accounts for journal #%d,', $journal->id));
+            $this->deleteJournal($journal);
+
+            return false;
+        }
+
+        return true;
+    }
 }

app/Console/Commands/Correction/CorrectsCurrencies.php

@@ -63,7 +63,7 @@ class CorrectsCurrencies extends Command
         $repos           = app(CurrencyRepositoryInterface::class);
 
         // first check if the user has any default currency (not necessarily the case, so can be forced).
-        $primaryCurrency = app('amount')->getPrimaryCurrencyByUserGroup($userGroup);
+        $primaryCurrency = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($userGroup);
 
         Log::debug(sprintf('Now correcting currencies for user group #%d', $userGroup->id));
         $found           = [$primaryCurrency->id];

app/Console/Commands/Correction/CorrectsDatabase.php

@@ -74,9 +74,11 @@ class CorrectsDatabase extends Command
             'correction:group-accounts',
             'correction:recalculates-liabilities',
             'correction:preferences',
+            'correction:corrects-inverted-budget-limits',
             // 'correction:transaction-types', // resource heavy, disabled.
             'correction:recalculate-pc-amounts',
             'correction:remove-links-to-deleted-objects',
+            'correction:clears-empty-foreign-amounts',
             'firefly-iii:report-integrity',
         ];
         foreach ($commands as $command) {

app/Console/Commands/Correction/CorrectsIbans.php

@@ -29,6 +29,7 @@ use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Account;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use FireflyIII\Support\Facades\Steam;
 
 class CorrectsIbans extends Command
 {
@@ -55,7 +56,7 @@ class CorrectsIbans extends Command
         /** @var Account $account */
         foreach ($accounts as $account) {
             $iban          = (string) $account->iban;
-            $newIban       = app('steam')->filterSpaces($iban);
+            $newIban       = Steam::filterSpaces($iban);
             if ('' !== $iban && $iban !== $newIban) {
                 $account->iban = $newIban;
                 $account->save();
@@ -66,7 +67,7 @@ class CorrectsIbans extends Command
             $accountNumber = $account->accountMeta->where('name', 'account_number')->first();
             if (null !== $accountNumber) {
                 $number    = (string) $accountNumber->value;
-                $newNumber = app('steam')->filterSpaces($number);
+                $newNumber = Steam::filterSpaces($number);
                 if ('' !== $number && $number !== $newNumber) {
                     $accountNumber->value = $newNumber;
                     $accountNumber->save();

app/Console/Commands/Correction/CorrectsInvertedBudgetLimits.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * CorrectsInversedBudgetLimits.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/>.
+ */
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class CorrectsInvertedBudgetLimits extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'correction:corrects-inverted-budget-limits';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Reverse budget limits where the dates are inverted.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+
+        $set = BudgetLimit::where('start_date', '>', DB::raw('end_date'))->get();
+        if (0 === $set->count()) {
+            Log::debug('No inverted budget limits found.');
+
+            return Command::SUCCESS;
+        }
+
+        /** @var BudgetLimit $budgetLimit */
+        foreach ($set as $budgetLimit) {
+            $start                   = $budgetLimit->start_date->copy();
+            $end                     = $budgetLimit->end_date->copy();
+            $budgetLimit->start_date = $end;
+            $budgetLimit->end_date   = $start;
+            $budgetLimit->saveQuietly();
+        }
+        if (1 === $set->count()) {
+            $this->friendlyInfo('Corrected one budget limit to have the right start/end dates.');
+
+            return Command::SUCCESS;
+        }
+        $this->friendlyInfo(sprintf('Corrected %d budget limits to have the right start/end dates.', count($set)));
+
+        return Command::SUCCESS;
+    }
+}

app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php

@@ -133,6 +133,6 @@ class CorrectsOpeningBalanceCurrencies extends Command
         $repos = app(AccountRepositoryInterface::class);
         $repos->setUser($account->user);
 
-        return $repos->getAccountCurrency($account) ?? app('amount')->getPrimaryCurrencyByUserGroup($account->userGroup);
+        return $repos->getAccountCurrency($account) ?? \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($account->userGroup);
     }
 }

app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php

@@ -48,6 +48,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\Builder as DatabaseBuilder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class CorrectsPrimaryCurrencyAmounts extends Command
 {
@@ -62,7 +63,7 @@ class CorrectsPrimaryCurrencyAmounts extends Command
      */
     public function handle(): int
     {
-        if (false === config('cer.enabled')) {
+        if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) {
             $this->friendlyInfo('This command will not run because currency exchange rates are disabled.');
 
             return 0;

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -30,6 +30,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
@@ -60,7 +61,7 @@ class CorrectsUnevenAmount extends Command
 
         $this->fixUnevenAmounts();
         $this->matchCurrencies();
-        if (true === config('firefly.feature_flags.running_balance_column')) {
+        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             $this->friendlyInfo('Will recalculate transaction running balance columns. This may take a LONG time. Please be patient.');
             AccountBalanceCalculator::recalculateAll(false);
             $this->friendlyInfo('Done recalculating transaction running balance columns.');
@@ -112,9 +113,9 @@ class CorrectsUnevenAmount extends Command
             if ($source->transaction_currency_id === $destination->transaction_currency_id) {
                 Log::debug('Ready to swap data between transactions.');
                 $destination->foreign_currency_id     = $source->transaction_currency_id;
-                $destination->foreign_amount          = app('steam')->positive($source->amount);
+                $destination->foreign_amount          = Steam::positive($source->amount);
                 $destination->transaction_currency_id = $source->foreign_currency_id;
-                $destination->amount                  = app('steam')->positive($source->foreign_amount);
+                $destination->amount                  = Steam::positive($source->foreign_amount);
                 $destination->balance_dirty           = true;
                 $source->balance_dirty                = true;
                 $destination->save();
@@ -132,11 +133,7 @@ class CorrectsUnevenAmount extends Command
     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')])
-        ;
+        $journals = DB::table('transactions')->groupBy('transaction_journal_id')->whereNull('deleted_at')->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
 
         /** @var stdClass $entry */
         foreach ($journals as $entry) {
@@ -146,11 +143,7 @@ class CorrectsUnevenAmount extends Command
                 || '' === $sum // @phpstan-ignore-line
                 || str_contains($sum, 'e')
                 || str_contains($sum, ',')) {
-                $message = sprintf(
-                    'Journal #%d has an invalid sum ("%s"). No sure what to do.',
-                    $entry->transaction_journal_id,
-                    $entry->the_sum
-                );
+                $message = sprintf('Journal #%d has an invalid sum ("%s"). No sure what to do.', $entry->transaction_journal_id, $entry->the_sum);
                 $this->friendlyWarning($message);
                 Log::warning($message);
                 ++$this->count;
@@ -184,13 +177,7 @@ class CorrectsUnevenAmount extends Command
         $source              = $journal->transactions()->where('amount', '<', 0)->first();
 
         if (null === $source) {
-            $this->friendlyError(
-                sprintf(
-                    'Journal #%d ("%s") has no source transaction. It will be deleted to maintain database consistency.',
-                    $journal->id ?? 0,
-                    $journal->description ?? ''
-                )
-            );
+            $this->friendlyError(sprintf('Journal #%d ("%s") has no source transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0, $journal->description ?? ''));
             Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete();
             TransactionJournal::where('id', $journal->id ?? 0)->forceDelete();
             ++$this->count;
@@ -205,13 +192,7 @@ class CorrectsUnevenAmount extends Command
         $destination         = $journal->transactions()->where('amount', '>', 0)->first();
 
         if (null === $destination) {
-            $this->friendlyError(
-                sprintf(
-                    'Journal #%d ("%s") has no destination transaction. It will be deleted to maintain database consistency.',
-                    $journal->id ?? 0,
-                    $journal->description ?? ''
-                )
-            );
+            $this->friendlyError(sprintf('Journal #%d ("%s") has no destination transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0, $journal->description ?? ''));
 
             Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete();
             TransactionJournal::where('id', $journal->id ?? 0)->forceDelete();
@@ -257,8 +238,8 @@ class CorrectsUnevenAmount extends Command
         // source currency = dest foreign currency
         // dest amount = source foreign currency
         // dest currency = source foreign currency
-        //        Log::debug(sprintf('[a] %s', bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount))));
-        //        Log::debug(sprintf('[b] %s', bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount))));
+        //        Log::debug(sprintf('[a] %s', bccomp(\FireflyIII\Support\Facades\Steam::positive($source->amount), \FireflyIII\Support\Facades\Steam::positive($destination->foreign_amount))));
+        //        Log::debug(sprintf('[b] %s', bccomp(\FireflyIII\Support\Facades\Steam::positive($destination->amount), \FireflyIII\Support\Facades\Steam::positive($source->foreign_amount))));
         //        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)));
         return 0 === bccomp(Steam::positive($source->amount), Steam::positive($destination->foreign_amount))
@@ -428,9 +409,9 @@ class CorrectsUnevenAmount extends Command
 
             //            // only fix the destination transaction
             //            $destination->foreign_currency_id     = $source->transaction_currency_id;
-            //            $destination->foreign_amount          = app('steam')->positive($source->amount);
+            //            $destination->foreign_amount          = \FireflyIII\Support\Facades\Steam::positive($source->amount);
             //            $destination->transaction_currency_id = $source->foreign_currency_id;
-            //            $destination->amount                  = app('steam')->positive($source->foreign_amount);
+            //            $destination->amount                  = \FireflyIII\Support\Facades\Steam::positive($source->foreign_amount);
             //            $destination->balance_dirty           = true;
             //            $source->balance_dirty                = true;
             //            $destination->save();

app/Console/Commands/Correction/RemovesLinksToDeletedObjects.php

@@ -86,17 +86,27 @@ class RemovesLinksToDeletedObjects extends Command
 
     private function cleanupJournals(array $journals): void
     {
-        $count = DB::table('tag_transaction_journal')->whereIn('transaction_journal_id', $journals)->delete();
-        if ($count > 0) {
-            $this->friendlyInfo(sprintf('Removed %d old relationship(s) between tags and transactions.', $count));
+        $countTags       = 0;
+        $countBudgets    = 0;
+        $countCategories = 0;
+        // #11333
+        foreach (array_chunk($journals, 1337) as $set) {
+            $countTags += DB::table('tag_transaction_journal')->whereIn('transaction_journal_id', $set)->delete();
+            $countBudgets += DB::table('budget_transaction_journal')->whereIn('transaction_journal_id', $set)->delete();
+            $countCategories += DB::table('category_transaction_journal')->whereIn('transaction_journal_id', $set)->delete();
         }
-        $count = DB::table('budget_transaction_journal')->whereIn('transaction_journal_id', $journals)->delete();
-        if ($count > 0) {
-            $this->friendlyInfo(sprintf('Removed %d old relationship(s) between budgets and transactions.', $count));
+
+
+
+        if ($countTags > 0) {
+            $this->friendlyInfo(sprintf('Removed %d old relationship(s) between tags and transactions.', $countTags));
         }
-        $count = DB::table('category_transaction_journal')->whereIn('transaction_journal_id', $journals)->delete();
-        if ($count > 0) {
-            $this->friendlyInfo(sprintf('Removed %d old relationship(s) categories and transactions.', $count));
+
+        if ($countBudgets > 0) {
+            $this->friendlyInfo(sprintf('Removed %d old relationship(s) between budgets and transactions.', $countBudgets));
+        }
+        if ($countCategories > 0) {
+            $this->friendlyInfo(sprintf('Removed %d old relationship(s) categories and transactions.', $countCategories));
         }
     }
 

app/Console/Commands/Integrity/ReportSkeleton.php.stub

@@ -1,26 +0,0 @@
-<?php
-
-namespace FireflyIII\Console\Commands\Integrity;
-
-use Illuminate\Console\Command;
-
-class ReportSkeleton extends Command
-{
-
-    protected $description = 'DESCRIPTION HERE';
-
-    protected $signature = 'firefly-iii:INT_COMMAND';
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle(): int
-    {
-        //
-        $this->warn('Congrats, you found the skeleton command. Boo!');
-
-        return 0;
-    }
-}

app/Console/Commands/Integrity/ReportsIntegrity.php

@@ -48,6 +48,7 @@ class ReportsIntegrity extends Command
         $commands = [
             'integrity:empty-objects',
             'integrity:total-sums',
+            'integrity:file-permissions',
         ];
         foreach ($commands as $command) {
             $this->friendlyLine(sprintf('Now executing %s', $command));

app/Console/Commands/Integrity/ValidatesFilePermissions.php

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * ValidatesFilePermissions.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/>.
+ */
+
+namespace FireflyIII\Console\Commands\Integrity;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+
+class ValidatesFilePermissions extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'integrity:file-permissions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $directories = [storage_path('upload')];
+        $errors      = false;
+
+        /** @var string $directory */
+        foreach ($directories as $directory) {
+            if (!is_dir($directory)) {
+                $this->friendlyError(sprintf('Directory "%s" cannot found. It is necessary to allow files to be uploaded.', $directory));
+                $errors = true;
+
+                continue;
+            }
+            if (!is_writable($directory)) {
+                $this->friendlyError(sprintf('Directory "%s" is not writeable. Uploading attachments may fail silently.', $directory));
+                $errors = true;
+            }
+        }
+        if (false === $errors) {
+            $this->friendlyInfo('All necessary file paths seem to exist, and are writeable.');
+        }
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/System/ForcesDecimalSize.php

@@ -56,7 +56,7 @@ class ForcesDecimalSize extends Command
     use ShowsFriendlyMessages;
 
     protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).';
-    protected $signature   = 'firefly-iii:force-decimal-size';
+    protected $signature   = 'firefly-iii:force-decimal-size {--force}';
     private string $cast;
     private array  $classes
                            = [
@@ -98,9 +98,14 @@ class ForcesDecimalSize extends Command
         Log::debug('Now in ForceDecimalSize::handle()');
         $this->determineDatabaseType();
 
-        $this->friendlyError('Running this command is dangerous and can cause data loss.');
-        $this->friendlyError('Please do not continue.');
-        $question = $this->confirm('Do you want to continue?');
+        $force    = $this->option('force');
+        $question = true;
+        if (false === $force) {
+            $this->friendlyError('Running this command is dangerous and can cause data loss.');
+            $this->friendlyError('Please make sure you have a backup.');
+            $question = $this->confirm('Do you want to continue?');
+        }
+
         if (true === $question) {
             $this->correctAmounts();
             $this->updateDecimals();
@@ -131,17 +136,17 @@ class ForcesDecimalSize extends Command
     private function correctAmounts(): void
     {
         // if sqlite, add function?
-        if ('sqlite' === (string) config('database.default')) {
+        if ('sqlite' === (string)config('database.default')) {
             DB::connection()->getPdo()->sqliteCreateFunction('REGEXP', static function ($pattern, $value): int {
                 mb_regex_encoding('UTF-8');
                 $pattern = trim($pattern, '"');
 
-                return (mb_ereg($pattern, (string) $value)) ? 1 : 0;
+                return (mb_ereg($pattern, (string)$value)) ? 1 : 0;
             });
         }
 
-        if (!in_array((string) config('database.default'), ['mysql', 'pgsql', 'sqlite'], true)) {
-            $this->friendlyWarning(sprintf('Skip correcting amounts, does not support "%s"...', (string) config('database.default')));
+        if (!in_array((string)config('database.default'), ['mysql', 'pgsql', 'sqlite'], true)) {
+            $this->friendlyWarning(sprintf('Skip correcting amounts, does not support "%s"...', (string)config('database.default')));
 
             return;
         }
@@ -236,7 +241,7 @@ class ForcesDecimalSize extends Command
         /** @var Builder $query */
         $query             = Account::leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', json_encode((string)$currency->id))
         ;
         $query->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
             foreach ($fields as $field) {
@@ -264,7 +269,7 @@ class ForcesDecimalSize extends Command
                 }
                 // fix $field by rounding it down correctly.
                 $pow           = 10 ** $currency->decimal_places;
-                $correct       = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $correct       = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyInfo(sprintf('Account #%d has %s with value "%s", this has been corrected to "%s".', $account->id, $field, $value, $correct));
 
                 /** @var null|Account $updateAccount */
@@ -316,7 +321,7 @@ class ForcesDecimalSize extends Command
                 }
                 // fix $field by rounding it down correctly.
                 $pow     = 10 ** $currency->decimal_places;
-                $correct = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(sprintf('%s #%d has %s with value "%s", this has been corrected to "%s".', $table, $item->id, $field, $value, $correct));
 
                 /** @var null|Model $model */
@@ -340,7 +345,7 @@ class ForcesDecimalSize extends Command
             ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
             ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', json_encode((string)$currency->id))
             ->where(static function (Builder $q) use ($fields, $currency, $cast, $operator, $regularExpression): void {
                 foreach ($fields as $field) {
                     $q->orWhere(
@@ -369,7 +374,7 @@ class ForcesDecimalSize extends Command
                 }
                 // fix $field by rounding it down correctly.
                 $pow     = 10 ** $currency->decimal_places;
-                $correct = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(
                     sprintf('Piggy bank event #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct)
                 );
@@ -396,7 +401,7 @@ class ForcesDecimalSize extends Command
             ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
             ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', json_encode((string)$currency->id))
             ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
                 foreach ($fields as $field) {
                     $q->orWhere(
@@ -425,7 +430,7 @@ class ForcesDecimalSize extends Command
                 }
                 // fix $field by rounding it down correctly.
                 $pow        = 10 ** $currency->decimal_places;
-                $correct    = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $correct    = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(
                     sprintf('Piggy bank repetition #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct)
                 );
@@ -450,7 +455,7 @@ class ForcesDecimalSize extends Command
         $query             = PiggyBank::leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
             ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', json_encode((string)$currency->id))
             ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
                 foreach ($fields as $field) {
                     $q->orWhere(
@@ -479,7 +484,7 @@ class ForcesDecimalSize extends Command
                 }
                 // fix $field by rounding it down correctly.
                 $pow       = 10 ** $currency->decimal_places;
-                $correct   = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $correct   = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(sprintf('Piggy bank #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct));
 
                 /** @var null|PiggyBank $piggyBank */
@@ -515,7 +520,7 @@ class ForcesDecimalSize extends Command
             }
             // fix $field by rounding it down correctly.
             $pow         = 10.0 ** $currency->decimal_places;
-            $correct     = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
+            $correct     = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);
             $this->friendlyWarning(sprintf('Transaction #%d has amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct));
 
             /** @var null|Transaction $transaction */
@@ -546,7 +551,7 @@ class ForcesDecimalSize extends Command
             }
             // fix $field by rounding it down correctly.
             $pow         = 10.0 ** $currency->decimal_places;
-            $correct     = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
+            $correct     = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);
             $this->friendlyWarning(
                 sprintf('Transaction #%d has foreign amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct)
             );
@@ -560,7 +565,7 @@ class ForcesDecimalSize extends Command
     private function updateDecimals(): void
     {
         $this->friendlyInfo('Going to force the size of DECIMAL columns. Please hold.');
-        $type = (string) config('database.default');
+        $type = (string)config('database.default');
 
         /**
          * @var string $name

app/Console/Commands/System/RecalculatesRunningBalance.php

@@ -28,6 +28,7 @@ namespace FireflyIII\Console\Commands\System;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class RecalculatesRunningBalance extends Command
 {
@@ -52,7 +53,7 @@ class RecalculatesRunningBalance extends Command
      */
     public function handle(): int
     {
-        if (true === config('firefly.feature_flags.running_balance_column')) {
+        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
             $this->correctBalanceAmounts($this->option('force'));
             $this->friendlyInfo('Done recalculating account balances.');

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -31,6 +31,7 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use League\Flysystem\FilesystemException;
 use Safe\Exceptions\JsonException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 use function Safe\json_decode;
 
@@ -107,8 +108,8 @@ class VerifySecurityAlerts extends Command
     private function removeOldAdvisory(): void
     {
         try {
-            app('fireflyconfig')->delete('upgrade_security_message');
-            app('fireflyconfig')->delete('upgrade_security_level');
+            FireflyConfig::delete('upgrade_security_message');
+            FireflyConfig::delete('upgrade_security_level');
         } catch (QueryException $e) {
             Log::debug(sprintf('Could not delete old security advisory, but thats OK: %s', $e->getMessage()));
         }
@@ -117,8 +118,8 @@ class VerifySecurityAlerts extends Command
     private function saveSecurityAdvisory(array $array): void
     {
         try {
-            app('fireflyconfig')->set('upgrade_security_message', $array['message']);
-            app('fireflyconfig')->set('upgrade_security_level', $array['level']);
+            FireflyConfig::set('upgrade_security_message', $array['message']);
+            FireflyConfig::set('upgrade_security_level', $array['level']);
         } catch (QueryException $e) {
             Log::debug(sprintf('Could not save new security advisory, but thats OK: %s', $e->getMessage()));
         }

app/Console/Commands/Tools/Cron.php

@@ -36,6 +36,7 @@ use FireflyIII\Support\Cronjobs\WebhookCronjob;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 use InvalidArgumentException;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class Cron extends Command
 {
@@ -72,7 +73,7 @@ class Cron extends Command
         $force = (bool) $this->option('force'); // @phpstan-ignore-line
 
         // Fire exchange rates cron job.
-        if (true === config('cer.download_enabled') && ($doAll || $this->option('download-cer'))) {
+        if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) {
             try {
                 $this->exchangeRatesCronJob($force, $date);
             } catch (FireflyException $e) {

app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php

@@ -32,6 +32,7 @@ use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class AddsTransactionIdentifiers extends Command
 {
@@ -97,7 +98,7 @@ class AddsTransactionIdentifiers extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -157,6 +158,6 @@ class AddsTransactionIdentifiers extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -34,6 +34,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use JsonException;
 use stdClass;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 use function Safe\json_decode;
 
@@ -86,7 +87,7 @@ class RemovesDatabaseDecryption extends Command
         $this->friendlyPositive(sprintf('Decrypted the data in table "%s".', $table));
         // mark as decrypted:
         $configName = sprintf('is_decrypted_%s', $table);
-        app('fireflyconfig')->set($configName, true);
+        FireflyConfig::set($configName, true);
     }
 
     private function isDecrypted(string $table): bool
@@ -95,7 +96,7 @@ class RemovesDatabaseDecryption extends Command
         $configVar  = null;
 
         try {
-            $configVar = app('fireflyconfig')->get($configName, false);
+            $configVar = FireflyConfig::get($configName, false);
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
         }
@@ -120,7 +121,7 @@ class RemovesDatabaseDecryption extends Command
         if (null === $original) {
             return;
         }
-        $id       = (int) $row->id;
+        $id       = (int)$row->id;
         $value    = '';
 
         try {
@@ -133,7 +134,7 @@ class RemovesDatabaseDecryption extends Command
         }
 
         // A separate routine for preferences table:
-        if ('preferences' === $table) {
+        if ('preferences' === $table && is_string($value)) {
             $this->decryptPreferencesRow($id, $value);
 
             return;

app/Console/Commands/Upgrade/RepairsAccountBalances.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * CorrectAccountBalance.php
+ * RepairsAccountBalances.php
  * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -27,6 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class RepairsAccountBalances extends Command
 {
@@ -43,7 +44,7 @@ class RepairsAccountBalances extends Command
 
             return 0;
         }
-        if (true === config('firefly.feature_flags.running_balance_column')) {
+        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
             $this->markAsExecuted();
             $this->correctBalanceAmounts();
@@ -58,14 +59,14 @@ class RepairsAccountBalances extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 
     private function correctBalanceAmounts(): void

app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub

@@ -41,7 +41,7 @@ class UpgradeSkeleton extends Command
      */
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
         if (null !== $configVar) {
             return (bool)$configVar->data;
         }
@@ -55,6 +55,6 @@ class UpgradeSkeleton extends Command
      */
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php

@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesAccountCurrencies extends Command
 {
@@ -85,7 +86,7 @@ class UpgradesAccountCurrencies extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
@@ -104,7 +105,7 @@ class UpgradesAccountCurrencies extends Command
         $accounts        = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value]);
 
         // get user's currency preference:
-        $primaryCurrency = app('amount')->getPrimaryCurrencyByUserGroup($user->userGroup);
+        $primaryCurrency = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($user->userGroup);
 
         /** @var Account $account */
         foreach ($accounts as $account) {
@@ -155,6 +156,6 @@ class UpgradesAccountCurrencies extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesAccountMetaData.php

@@ -28,6 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\AccountMeta;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesAccountMetaData extends Command
 {
@@ -82,7 +83,7 @@ class UpgradesAccountMetaData extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -90,6 +91,6 @@ class UpgradesAccountMetaData extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesAttachments.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Note;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesAttachments extends Command
 {
@@ -92,7 +93,7 @@ class UpgradesAttachments extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -100,6 +101,6 @@ class UpgradesAttachments extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesBillsToRules.php

@@ -36,6 +36,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesBillsToRules extends Command
 {
@@ -99,7 +100,7 @@ class UpgradesBillsToRules extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -206,6 +207,6 @@ class UpgradesBillsToRules extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php

@@ -28,6 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesBudgetLimitPeriods extends Command
 {
@@ -58,7 +59,7 @@ class UpgradesBudgetLimitPeriods extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
@@ -152,6 +153,6 @@ class UpgradesBudgetLimitPeriods extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesBudgetLimits.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\User;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesBudgetLimits extends Command
 {
@@ -66,7 +67,7 @@ class UpgradesBudgetLimits extends Command
                     /** @var null|User $user */
                     $user = $budget->user;
                     if (null !== $user) {
-                        $currency                             = app('amount')->getPrimaryCurrencyByUserGroup($user->userGroup);
+                        $currency                             = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($user->userGroup);
                         $budgetLimit->transaction_currency_id = $currency->id;
                         $budgetLimit->save();
                         $this->friendlyInfo(
@@ -84,7 +85,7 @@ class UpgradesBudgetLimits extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -92,6 +93,6 @@ class UpgradesBudgetLimits extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesCreditCardLiabilities extends Command
 {
@@ -80,13 +81,13 @@ class UpgradesCreditCardLiabilities extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php

@@ -33,6 +33,7 @@ use FireflyIII\Support\Facades\Amount;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesCurrencyPreferences extends Command
 {
@@ -65,7 +66,7 @@ class UpgradesCurrencyPreferences extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -144,6 +145,6 @@ class UpgradesCurrencyPreferences extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesJournalMetaData.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesJournalMetaData extends Command
 {
@@ -69,14 +70,14 @@ class UpgradesJournalMetaData extends Command
 
     private function isMigrated(): bool
     {
-        $configVar = app('fireflyconfig')->get(UpgradesToGroups::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(UpgradesToGroups::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
@@ -218,6 +219,6 @@ class UpgradesJournalMetaData extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesJournalNotes.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournalMeta;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesJournalNotes extends Command
 {
@@ -86,7 +87,7 @@ class UpgradesJournalNotes extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -94,6 +95,6 @@ class UpgradesJournalNotes extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesLiabilities.php

@@ -33,6 +33,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use FireflyIII\User;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesLiabilities extends Command
 {
@@ -61,7 +62,7 @@ class UpgradesLiabilities extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -148,6 +149,6 @@ class UpgradesLiabilities extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php

@@ -36,6 +36,7 @@ use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesLiabilitiesEight extends Command
 {
@@ -63,7 +64,7 @@ class UpgradesLiabilitiesEight extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -137,7 +138,7 @@ class UpgradesLiabilitiesEight extends Command
             return false;
         }
 
-        return (bool) $openingJournal->date->isSameDay($liabilityJournal->date);
+        return (bool)$openingJournal->date->isSameDay($liabilityJournal->date);
     }
 
     private function deleteCreditTransaction(Account $account): void
@@ -148,7 +149,7 @@ class UpgradesLiabilitiesEight extends Command
             ->where('transaction_journals.transaction_type_id', $liabilityType->id)
             ->first(['transaction_journals.*'])
         ;
-        if (null !== $liabilityJournal) {
+        if (null !== $liabilityJournal && null !== $liabilityJournal->transactionGroup) {
             $group   = $liabilityJournal->transactionGroup;
             $service = new TransactionGroupDestroyService();
             $service->destroy($group);
@@ -192,11 +193,14 @@ class UpgradesLiabilitiesEight extends Command
             ->where('transactions.account_id', $account->id)->get(['transaction_journals.*'])
         ;
 
+        $service  = app(TransactionGroupDestroyService::class);
+
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            $service = app(TransactionGroupDestroyService::class);
-            $service->destroy($journal->transactionGroup);
-            ++$count;
+            if (null !== $journal->transactionGroup) {
+                $service->destroy($journal->transactionGroup);
+                ++$count;
+            }
         }
 
         return $count;
@@ -204,6 +208,6 @@ class UpgradesLiabilitiesEight extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesMultiPiggyBanks extends Command
 {
@@ -64,7 +65,7 @@ class UpgradesMultiPiggyBanks extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -94,7 +95,7 @@ class UpgradesMultiPiggyBanks extends Command
         $this->repository->setUser($piggyBank->account->user);
         $this->accountRepository->setUser($piggyBank->account->user);
         $repetition                         = $this->repository->getRepetition($piggyBank, true);
-        $currency                           = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getPrimaryCurrencyByUserGroup($piggyBank->account->user->userGroup);
+        $currency                           = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($piggyBank->account->user->userGroup);
 
         // update piggy bank to have a currency.
         $piggyBank->transaction_currency_id = $currency->id;
@@ -112,6 +113,6 @@ class UpgradesMultiPiggyBanks extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php

@@ -28,6 +28,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesPrimaryCurrencyAmounts extends Command
 {
@@ -60,7 +61,7 @@ class UpgradesPrimaryCurrencyAmounts extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -68,6 +69,6 @@ class UpgradesPrimaryCurrencyAmounts extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\RecurrenceMeta;
 use FireflyIII\Models\RecurrenceTransactionMeta;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 use function Safe\json_encode;
 
@@ -65,7 +66,7 @@ class UpgradesRecurrenceMetaData extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -117,6 +118,6 @@ class UpgradesRecurrenceMetaData extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesRuleActions.php

@@ -28,6 +28,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\RuleAction;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesRuleActions extends Command
 {
@@ -63,7 +64,7 @@ class UpgradesRuleActions extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -183,6 +184,6 @@ class UpgradesRuleActions extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesTagLocations.php

@@ -28,6 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Location;
 use FireflyIII\Models\Tag;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesTagLocations extends Command
 {
@@ -57,7 +58,7 @@ class UpgradesTagLocations extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -97,6 +98,6 @@ class UpgradesTagLocations extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesToGroups.php

@@ -39,6 +39,7 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesToGroups extends Command
 {
@@ -97,7 +98,7 @@ class UpgradesToGroups extends Command
 
     private function isMigrated(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -379,6 +380,6 @@ class UpgradesToGroups extends Command
 
     private function markAsMigrated(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php

@@ -34,6 +34,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesTransferCurrencies extends Command
 {
@@ -105,7 +106,7 @@ class UpgradesTransferCurrencies extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -480,6 +481,6 @@ class UpgradesTransferCurrencies extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php

@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesVariousCurrencyInformation extends Command
 {
@@ -86,7 +87,7 @@ class UpgradesVariousCurrencyInformation extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -246,6 +247,6 @@ class UpgradesVariousCurrencyInformation extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesWebhooks.php

@@ -34,6 +34,7 @@ use FireflyIII\Models\WebhookDelivery as WebhookDeliveryModel;
 use FireflyIII\Models\WebhookResponse as WebhookResponseModel;
 use FireflyIII\Models\WebhookTrigger as WebhookTriggerModel;
 use Illuminate\Console\Command;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 class UpgradesWebhooks extends Command
 {
@@ -63,7 +64,7 @@ class UpgradesWebhooks extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -109,6 +110,6 @@ class UpgradesWebhooks extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }

app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * TriggeredStoredTransactionGroup.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/>.
+ */
+
+namespace FireflyIII\Events\Model\TransactionGroup;
+
+use FireflyIII\Events\Event;
+use FireflyIII\Models\TransactionGroup;
+use Illuminate\Queue\SerializesModels;
+
+class TriggeredStoredTransactionGroup extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public TransactionGroup $transactionGroup) {}
+}

app/Exceptions/Handler.php

@@ -42,7 +42,6 @@ use Illuminate\Validation\ValidationException as LaravelValidationException;
 use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Override;
-use Sentry\Laravel\Integration;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -50,6 +49,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
+use FireflyIII\Support\Facades\Steam;
 
 use function Safe\json_encode;
 use function Safe\parse_url;
@@ -83,14 +83,7 @@ class Handler extends ExceptionHandler
      * Register the exception handling callbacks for the application.
      */
     #[Override]
-    public function register(): void
-    {
-        if (true === config('firefly.report_errors_online')) {
-            $this->reportable(function (Throwable $e): void {
-                Integration::captureUnhandledException($e);
-            });
-        }
-    }
+    public function register(): void {}
 
     /**
      * Render an exception into an HTTP response. It's complex but lucky for us, we never use it because
@@ -287,7 +280,7 @@ class Handler extends ExceptionHandler
     protected function invalid($request, LaravelValidationException $exception): \Illuminate\Http\Response|JsonResponse|RedirectResponse
     {
         // protect against open redirect when submitting invalid forms.
-        $previous = app('steam')->getSafePreviousUrl();
+        $previous = Steam::getSafePreviousUrl();
         $redirect = $this->getRedirectUrl($exception);
 
         return redirect($redirect ?? $previous)

app/Factory/BillFactory.php

@@ -51,7 +51,7 @@ class BillFactory
         Log::debug(sprintf('Now in %s', __METHOD__), $data);
         $factory          = app(TransactionCurrencyFactory::class);
         $currency         = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null))
-                    ?? app('amount')->getPrimaryCurrencyByUserGroup($this->user->userGroup);
+                    ?? \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($this->user->userGroup);
 
         try {
             $skip   = array_key_exists('skip', $data) ? $data['skip'] : 0;

app/Factory/PiggyBankFactory.php

@@ -126,7 +126,7 @@ class PiggyBankFactory
     private function getCurrency(array $data): TransactionCurrency
     {
         // currency:
-        $primaryCurrency = app('amount')->getPrimaryCurrency();
+        $primaryCurrency = \FireflyIII\Support\Facades\Amount::getPrimaryCurrency();
         $currency        = null;
         if (array_key_exists('transaction_currency_code', $data)) {
             $currency = $this->currencyRepository->findByCode((string)($data['transaction_currency_code'] ?? ''));

app/Factory/TransactionFactory.php

@@ -34,6 +34,7 @@ use FireflyIII\Services\Internal\Update\AccountUpdateService;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\Steam;
 
 /**
  * Class TransactionFactory
@@ -58,10 +59,10 @@ class TransactionFactory
             $foreignAmount = null;
         }
         if (null !== $foreignAmount) {
-            $foreignAmount = app('steam')->negative($foreignAmount);
+            $foreignAmount = Steam::negative($foreignAmount);
         }
 
-        return $this->create(app('steam')->negative($amount), $foreignAmount);
+        return $this->create(Steam::negative($amount), $foreignAmount);
     }
 
     /**
@@ -170,10 +171,10 @@ class TransactionFactory
             $foreignAmount = null;
         }
         if (null !== $foreignAmount) {
-            $foreignAmount = app('steam')->positive($foreignAmount);
+            $foreignAmount = Steam::positive($foreignAmount);
         }
 
-        return $this->create(app('steam')->positive($amount), $foreignAmount);
+        return $this->create(Steam::positive($amount), $foreignAmount);
     }
 
     public function setAccount(Account $account): void

app/Factory/TransactionJournalFactory.php

@@ -251,7 +251,7 @@ class TransactionJournalFactory
         $foreignCurrency       = $this->getForeignByAccount($type->type, $foreignCurrency, $destinationAccount);
         $description           = $this->getDescription($description);
 
-        Log::debug(sprintf('Currency is #%d "%s", foreign currency is #%d "%s"', $currency->id, $currency->code, $foreignCurrency?->id, $foreignCurrency));
+        Log::debug(sprintf('Currency is #%d "%s", foreign currency is #%d "%s"', $currency->id, $currency->code, $foreignCurrency?->id, $foreignCurrency?->code));
         Log::debug(sprintf('Date: %s (%s)', $carbon->toW3cString(), $carbon->getTimezone()->getName()));
 
         /** Create a basic journal. */
@@ -502,7 +502,7 @@ class TransactionJournalFactory
         $preference = $this->accountRepository->getAccountCurrency($account);
         if (null === $preference && !$currency instanceof TransactionCurrency) {
             // return user's default:
-            return app('amount')->getPrimaryCurrencyByUserGroup($this->user->userGroup);
+            return \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($this->user->userGroup);
         }
         $result     = $preference ?? $currency;
         Log::debug(sprintf('Currency is now #%d (%s) because of account #%d (%s)', $result->id, $result->code, $account->id, $account->name));

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Generator\Chart\Basic;
 
 use FireflyIII\Support\ChartColour;
+use FireflyIII\Support\Facades\Steam;
 
 /**
  * Class ChartJsGenerator.
@@ -56,7 +57,7 @@ class ChartJsGenerator implements GeneratorInterface
         $index     = 0;
         foreach ($data as $key => $valueArray) {
             // make larger than 0
-            $chartData['datasets'][0]['data'][]            = app('steam')->positive((string) $valueArray['amount']);
+            $chartData['datasets'][0]['data'][]            = Steam::positive((string) $valueArray['amount']);
             $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
             $chartData['datasets'][0]['currency_symbol'][] = $valueArray['currency_symbol'];
             $chartData['labels'][]                         = $key;
@@ -163,7 +164,7 @@ class ChartJsGenerator implements GeneratorInterface
         $index     = 0;
         foreach ($data as $key => $value) {
             // make larger than 0
-            $chartData['datasets'][0]['data'][]            = app('steam')->positive((string) $value);
+            $chartData['datasets'][0]['data'][]            = Steam::positive((string) $value);
             $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
 
             $chartData['labels'][]                         = $key;

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -144,7 +144,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $dayBeforeBalance  = Steam::accountsBalancesOptimized(new Collection()->push($account), $date)[$account->id];
 
         $startBalance      = $dayBeforeBalance['balance'];
-        $primaryCurrency   = app('amount')->getPrimaryCurrencyByUserGroup($account->user->userGroup);
+        $primaryCurrency   = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($account->user->userGroup);
         $currency          = $accountRepository->getAccountCurrency($account) ?? $primaryCurrency;
 
         foreach ($journals as $index => $journal) {
@@ -153,13 +153,13 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
             // make sure amount is in the right "direction".
             if ($account->id === $journal['destination_account_id']) {
-                $transactionAmount = app('steam')->positive($journal['amount']);
+                $transactionAmount = Steam::positive($journal['amount']);
             }
 
             if ($currency->id === $journal['foreign_currency_id']) {
                 $transactionAmount = $journal['foreign_amount'];
                 if ($account->id === $journal['destination_account_id']) {
-                    $transactionAmount = app('steam')->positive($journal['foreign_amount']);
+                    $transactionAmount = Steam::positive($journal['foreign_amount']);
                 }
             }
 
@@ -175,7 +175,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
             $journals[$index]['payment_date']   = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'payment_date');
             $journals[$index]['invoice_date']   = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'invoice_date');
         }
-        $locale            = app('steam')->getLocale();
+        $locale            = Steam::getLocale();
         // call is correct.
         Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));
 

app/Handlers/Events/AdminEventHandler.php

@@ -37,6 +37,7 @@ use FireflyIII\Notifications\Test\OwnerTestNotificationPushover;
 use FireflyIII\Notifications\Test\OwnerTestNotificationSlack;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class AdminEventHandler.
@@ -45,7 +46,7 @@ class AdminEventHandler
 {
     public function sendInvitationNotification(InvitationCreated $event): void
     {
-        $sendMail = app('fireflyconfig')->get('notification_invite_created', true)->data;
+        $sendMail = FireflyConfig::get('notification_invite_created', true)->data;
         if (false === $sendMail) {
             return;
         }
@@ -96,7 +97,7 @@ class AdminEventHandler
      */
     public function sendNewVersion(NewVersionAvailable $event): void
     {
-        $sendMail = app('fireflyconfig')->get('notification_new_version', true)->data;
+        $sendMail = FireflyConfig::get('notification_new_version', true)->data;
         if (false === $sendMail) {
             return;
         }

app/Handlers/Events/StoredGroupEventHandler.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Enums\WebhookTrigger;
+use FireflyIII\Events\Model\TransactionGroup\TriggeredStoredTransactionGroup;
 use FireflyIII\Events\RequestedSendWebhookMessages;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
@@ -51,6 +52,12 @@ class StoredGroupEventHandler
         $this->removePeriodStatistics($event);
     }
 
+    public function triggerRulesManually(TriggeredStoredTransactionGroup $event): void
+    {
+        $newEvent = new StoredTransactionGroup($event->transactionGroup, true, false);
+        $this->processRules($newEvent);
+    }
+
     /**
      * This method grabs all the users rules and processes them.
      */

app/Handlers/Events/UserEventHandler.php

@@ -57,6 +57,7 @@ use Illuminate\Auth\Events\Login;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class UserEventHandler.
@@ -224,7 +225,7 @@ class UserEventHandler
 
     public function sendAdminRegistrationNotification(RegisteredUser $event): void
     {
-        $sendMail = (bool)app('fireflyconfig')->get('notification_admin_new_reg', true)->data;
+        $sendMail = (bool)FireflyConfig::get('notification_admin_new_reg', true)->data;
         if ($sendMail) {
             $owner = $event->owner;
 
@@ -367,7 +368,7 @@ class UserEventHandler
      */
     public function sendRegistrationMail(RegisteredUser $event): void
     {
-        $sendMail = (bool)app('fireflyconfig')->get('notification_user_new_reg', true)->data;
+        $sendMail = (bool)FireflyConfig::get('notification_user_new_reg', true)->data;
         if ($sendMail) {
             try {
                 Notification::send($event->user, new UserRegistrationNotification());

app/Handlers/Events/VersionCheckEventHandler.php

@@ -33,6 +33,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class VersionCheckEventHandler
@@ -54,7 +55,7 @@ class VersionCheckEventHandler
         Log::debug('Now in checkForUpdates()');
 
         // should not check for updates:
-        $permission    = app('fireflyconfig')->get('permission_update_check', -1);
+        $permission    = FireflyConfig::get('permission_update_check', -1);
         $value         = (int) $permission->data;
         if (1 !== $value) {
             Log::debug('Update check is not enabled.');
@@ -73,7 +74,7 @@ class VersionCheckEventHandler
         }
 
         /** @var Configuration $lastCheckTime */
-        $lastCheckTime = app('fireflyconfig')->get('last_update_check', Carbon::now()->getTimestamp());
+        $lastCheckTime = FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp());
         $now           = Carbon::now()->getTimestamp();
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
@@ -87,7 +88,7 @@ class VersionCheckEventHandler
         $release       = $this->getLatestRelease();
 
         session()->flash($release['level'], $release['message']);
-        app('fireflyconfig')->set('last_update_check', Carbon::now()->getTimestamp());
+        FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp());
     }
 
     /**
@@ -107,7 +108,7 @@ class VersionCheckEventHandler
         }
 
         /** @var Configuration $lastCheckTime */
-        $lastCheckTime = app('fireflyconfig')->get('last_update_warning', Carbon::now()->getTimestamp());
+        $lastCheckTime = FireflyConfig::get('last_update_warning', Carbon::now()->getTimestamp());
         $now           = Carbon::now()->getTimestamp();
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
@@ -120,6 +121,6 @@ class VersionCheckEventHandler
         Log::debug('Have warned about a new version in four weeks!');
 
         session()->flash('info', (string) trans('firefly.disabled_but_check'));
-        app('fireflyconfig')->set('last_update_warning', Carbon::now()->getTimestamp());
+        FireflyConfig::set('last_update_warning', Carbon::now()->getTimestamp());
     }
 }

app/Handlers/Events/WebhookEventHandler.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Handlers\Events;
 use FireflyIII\Jobs\SendWebhookMessage;
 use FireflyIII\Models\WebhookMessage;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class WebhookEventHandler
@@ -39,7 +40,7 @@ class WebhookEventHandler
     public function sendWebhookMessages(): void
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
-        if (false === config('firefly.feature_flags.webhooks') || false === config('firefly.allow_webhooks')) {
+        if (false === config('firefly.feature_flags.webhooks') || false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::debug('Webhook event handler is disabled, do not run sendWebhookMessages().');
 
             return;
@@ -53,8 +54,13 @@ class WebhookEventHandler
             )->splice(0, 5)
         ;
         Log::debug(sprintf('Found %d webhook message(s) ready to be send.', $messages->count()));
+
+        /** @var WebhookMessage $message */
         foreach ($messages as $message) {
             if (false === $message->sent) {
+                // set it to "sent" right away!
+                $message->sent = true;
+                $message->save();
                 Log::debug(sprintf('Send message #%d', $message->id));
                 SendWebhookMessage::dispatch($message)->afterResponse();
             }

app/Handlers/Observer/AccountObserver.php

@@ -52,7 +52,7 @@ class AccountObserver
         if (!Amount::convertToPrimary($account->user)) {
             return;
         }
-        $userCurrency = app('amount')->getPrimaryCurrencyByUserGroup($account->user->userGroup);
+        $userCurrency = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($account->user->userGroup);
         $repository   = app(AccountRepositoryInterface::class);
         $currency     = $repository->getAccountCurrency($account);
         if (null !== $currency && $currency->id !== $userCurrency->id && '' !== (string) $account->virtual_balance && 0 !== bccomp($account->virtual_balance, '0')) {

app/Handlers/Observer/AutoBudgetObserver.php

@@ -42,7 +42,7 @@ class AutoBudgetObserver
         if (!Amount::convertToPrimary($autoBudget->budget->user)) {
             return;
         }
-        $userCurrency              = app('amount')->getPrimaryCurrencyByUserGroup($autoBudget->budget->user->userGroup);
+        $userCurrency              = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($autoBudget->budget->user->userGroup);
         $autoBudget->native_amount = null;
         if ($autoBudget->transactionCurrency->id !== $userCurrency->id) {
             $converter                 = new ExchangeRateConverter();

app/Handlers/Observer/AvailableBudgetObserver.php

@@ -44,7 +44,7 @@ class AvailableBudgetObserver
 
             return;
         }
-        $userCurrency                   = app('amount')->getPrimaryCurrencyByUserGroup($availableBudget->user->userGroup);
+        $userCurrency                   = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($availableBudget->user->userGroup);
         $availableBudget->native_amount = null;
         if ($availableBudget->transactionCurrency->id !== $userCurrency->id) {
             $converter                      = new ExchangeRateConverter();

app/Handlers/Observer/BillObserver.php

@@ -46,7 +46,7 @@ class BillObserver
         if (!Amount::convertToPrimary($bill->user)) {
             return;
         }
-        $userCurrency            = app('amount')->getPrimaryCurrencyByUserGroup($bill->user->userGroup);
+        $userCurrency            = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($bill->user->userGroup);
         $bill->native_amount_min = null;
         $bill->native_amount_max = null;
         if ($bill->transactionCurrency->id !== $userCurrency->id) {

app/Handlers/Observer/BudgetLimitObserver.php

@@ -72,7 +72,7 @@ class BudgetLimitObserver
 
             return;
         }
-        $userCurrency               = app('amount')->getPrimaryCurrencyByUserGroup($budgetLimit->budget->user->userGroup);
+        $userCurrency               = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($budgetLimit->budget->user->userGroup);
         $budgetLimit->native_amount = null;
         if ($budgetLimit->transactionCurrency->id !== $userCurrency->id) {
             $converter                  = new ExchangeRateConverter();

app/Handlers/Observer/PiggyBankEventObserver.php

@@ -48,7 +48,7 @@ class PiggyBankEventObserver
         if (!Amount::convertToPrimary($user)) {
             return;
         }
-        $userCurrency         = app('amount')->getPrimaryCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup);
+        $userCurrency         = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup);
         $event->native_amount = null;
         if ($event->piggyBank->transactionCurrency->id !== $userCurrency->id) {
             $converter            = new ExchangeRateConverter();

app/Handlers/Observer/PiggyBankObserver.php

@@ -49,7 +49,7 @@ class PiggyBankObserver
 
             return;
         }
-        $userCurrency                    = app('amount')->getPrimaryCurrencyByUserGroup($group);
+        $userCurrency                    = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($group);
         $piggyBank->native_target_amount = null;
         if ($piggyBank->transactionCurrency->id !== $userCurrency->id) {
             $converter                       = new ExchangeRateConverter();

app/Handlers/Observer/TransactionObserver.php

@@ -28,6 +28,7 @@ use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class TransactionObserver
@@ -39,7 +40,7 @@ class TransactionObserver
     public function created(Transaction $transaction): void
     {
         Log::debug('Observe "created" of a transaction.');
-        if (true === config('firefly.feature_flags.running_balance_column') && (1 === bccomp($transaction->amount, '0') && self::$recalculate)) {
+        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data && (1 === bccomp($transaction->amount, '0') && self::$recalculate)) {
             Log::debug('Trigger recalculateForJournal');
             AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
         }
@@ -51,7 +52,7 @@ class TransactionObserver
         if (!Amount::convertToPrimary($transaction->transactionJournal->user)) {
             return;
         }
-        $userCurrency                       = app('amount')->getPrimaryCurrencyByUserGroup($transaction->transactionJournal->user->userGroup);
+        $userCurrency                       = \FireflyIII\Support\Facades\Amount::getPrimaryCurrencyByUserGroup($transaction->transactionJournal->user->userGroup);
         $transaction->native_amount         = null;
         $transaction->native_foreign_amount = null;
         // first normal amount
@@ -82,7 +83,7 @@ class TransactionObserver
     public function updated(Transaction $transaction): void
     {
         //        Log::debug('Observe "updated" of a transaction.');
-        if (true === config('firefly.feature_flags.running_balance_column') && self::$recalculate && 1 === bccomp($transaction->amount, '0')) {
+        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data && self::$recalculate && 1 === bccomp($transaction->amount, '0')) {
             Log::debug('Trigger recalculateForJournal');
             AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
         }

app/Helpers/Collector/Extensions/AmountCollection.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Helpers\Collector\Extensions;
 
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use FireflyIII\Support\Facades\Steam;
 
 /**
  * Trait AmountCollection
@@ -39,7 +40,7 @@ trait AmountCollection
     {
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
-                $q->where('source.amount', app('steam')->negative($amount));
+                $q->where('source.amount', Steam::negative($amount));
             }
         );
 
@@ -50,7 +51,7 @@ trait AmountCollection
     {
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
-                $q->where('source.amount', '!=', app('steam')->negative($amount));
+                $q->where('source.amount', '!=', Steam::negative($amount));
             }
         );
 
@@ -64,7 +65,7 @@ trait AmountCollection
     {
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
-                $q->where('destination.amount', '<=', app('steam')->positive($amount));
+                $q->where('destination.amount', '<=', Steam::positive($amount));
             }
         );
 
@@ -78,7 +79,7 @@ trait AmountCollection
     {
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
-                $q->where('destination.amount', '>=', app('steam')->positive($amount));
+                $q->where('destination.amount', '>=', Steam::positive($amount));
             }
         );
 
@@ -93,7 +94,7 @@ trait AmountCollection
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
                 $q->whereNotNull('source.foreign_amount');
-                $q->where('source.foreign_amount', app('steam')->negative($amount));
+                $q->where('source.foreign_amount', Steam::negative($amount));
             }
         );
 
@@ -108,7 +109,7 @@ trait AmountCollection
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
                 $q->whereNull('source.foreign_amount');
-                $q->orWhere('source.foreign_amount', '!=', app('steam')->negative($amount));
+                $q->orWhere('source.foreign_amount', '!=', Steam::negative($amount));
             }
         );
 
@@ -123,7 +124,7 @@ trait AmountCollection
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
                 $q->whereNotNull('destination.foreign_amount');
-                $q->where('destination.foreign_amount', '<=', app('steam')->positive($amount));
+                $q->where('destination.foreign_amount', '<=', Steam::positive($amount));
             }
         );
 
@@ -138,7 +139,7 @@ trait AmountCollection
         $this->query->where(
             static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
                 $q->whereNotNull('destination.foreign_amount');
-                $q->where('destination.foreign_amount', '>=', app('steam')->positive($amount));
+                $q->where('destination.foreign_amount', '>=', Steam::positive($amount));
             }
         );
 

app/Helpers/Report/ReportHelper.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Report;
 
+use FireflyIII\Support\Facades\Navigation;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
@@ -81,7 +82,7 @@ class ReportHelper implements ReportHelperInterface
 
             /** @var Carbon $expectedStart */
             foreach ($expectedDates as $expectedStart) {
-                $expectedEnd               = app('navigation')->endOfX($expectedStart, $bill->repeat_freq, null);
+                $expectedEnd               = Navigation::endOfX($expectedStart, $bill->repeat_freq, null);
 
                 // is paid in this period maybe?
                 /** @var GroupCollectorInterface $collector */

app/Helpers/Update/UpdateTrait.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Helpers\Update;
 
 use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface;
 use Illuminate\Support\Facades\Log;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Trait UpdateTrait
@@ -43,7 +44,7 @@ trait UpdateTrait
 
         /** @var UpdateRequestInterface $checker */
         $checker       = app(UpdateRequestInterface::class);
-        $channelConfig = app('fireflyconfig')->get('update_channel', 'stable');
+        $channelConfig = FireflyConfig::get('update_channel', 'stable');
         $channel       = (string) $channelConfig->data;
 
         return $checker->getUpdateInformation($channel);

app/Http/Controllers/Account/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -141,18 +142,18 @@ class CreateController extends Controller
         $data      = $request->getAccountData();
         $account   = $this->repository->store($data);
         $request->session()->flash('success', (string) trans('firefly.stored_new_account', ['name' => $account->name]));
-        app('preferences')->mark();
+        Preferences::mark();
 
         Log::channel('audit')->info('Stored new account.', $data);
 
         // update preferences if necessary:
-        $frontpage = app('preferences')->get('frontpageAccounts', [])->data;
+        $frontpage = Preferences::get('frontpageAccounts', [])->data;
         if (!is_array($frontpage)) {
             $frontpage = [];
         }
         if (AccountTypeEnum::ASSET->value === $account->accountType->type) {
             $frontpage[] = $account->id;
-            app('preferences')->set('frontpageAccounts', $frontpage);
+            Preferences::set('frontpageAccounts', $frontpage);
         }
 
         // store attachment(s):

app/Http/Controllers/Account/DeleteController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -101,7 +102,7 @@ class DeleteController extends Controller
         $this->repository->destroy($account, $moveTo);
 
         $request->session()->flash('success', (string) trans(sprintf('firefly.%s_deleted', $typeName), ['name' => $name]));
-        app('preferences')->mark();
+        Preferences::mark();
 
         return redirect($this->getPreviousUrl('accounts.delete.url'));
     }

app/Http/Controllers/Account/EditController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\AccountFormRequest;
@@ -37,6 +38,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use FireflyIII\Support\Facades\Steam;
 
 /**
  * Class EditController
@@ -147,9 +149,9 @@ class EditController extends Controller
             'BIC'                     => $repository->getMetaValue($account, 'BIC'),
             'opening_balance_date'    => substr((string) $openingBalanceDate, 0, 10),
             'liability_type_id'       => $account->account_type_id,
-            'opening_balance'         => app('steam')->bcround($openingBalanceAmount, $currency->decimal_places),
+            'opening_balance'         => Steam::bcround($openingBalanceAmount, $currency->decimal_places),
             'liability_direction'     => $this->repository->getMetaValue($account, 'liability_direction'),
-            'virtual_balance'         => app('steam')->bcround($virtualBalance, $currency->decimal_places),
+            'virtual_balance'         => Steam::bcround($virtualBalance, $currency->decimal_places),
             'currency_id'             => $currency->id,
             'include_net_worth'       => $hasOldInput ? (bool) $request->old('include_net_worth') : $includeNetWorth,
             'interest'                => $repository->getMetaValue($account, 'interest'),
@@ -205,7 +207,7 @@ class EditController extends Controller
 
             $redirect = redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]);
         }
-        app('preferences')->mark();
+        Preferences::mark();
 
         return $redirect;
     }

app/Http/Controllers/Account/IndexController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Support\Facades\Preferences;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
@@ -81,7 +82,7 @@ class IndexController extends Controller
         $collection   = $this->repository->getInactiveAccountsByType($types);
         $total        = $collection->count();
         $page         = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
+        $pageSize     = (int) Preferences::get('listPageSize', 50)->data;
         $accounts     = $collection->slice(($page - 1) * $pageSize, $pageSize);
         unset($collection);
 
@@ -153,7 +154,7 @@ class IndexController extends Controller
         $collection    = $this->repository->getActiveAccountsByType($types);
         $total         = $collection->count();
         $page          = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
-        $pageSize      = (int) app('preferences')->get('listPageSize', 50)->data;
+        $pageSize      = (int) Preferences::get('listPageSize', 50)->data;
         $accounts      = $collection->slice(($page - 1) * $pageSize, $pageSize);
         $inactiveCount = $this->repository->getInactiveAccountsByType($types)->count();
 
@@ -167,12 +168,17 @@ class IndexController extends Controller
         /** @var Carbon $end */
         $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
 
+        $now           = now();
+        if ($now->gt($end) || $now->lt($start)) {
+            $now = $end;
+        }
+
         $ids           = $accounts->pluck('id')->toArray();
         Log::debug(sprintf('index: accountsBalancesInRange("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
         [
             $startBalances,
             $endBalances,
-        ]              = Steam::accountsBalancesInRange($accounts, $start, $end, $this->primaryCurrency, $this->convertToPrimary);
+        ]              = Steam::accountsBalancesInRange($accounts, $start, $now, $this->primaryCurrency, $this->convertToPrimary);
         $activities    = Steam::getLastActivities($ids);
 
 

app/Http/Controllers/Account/ReconcileController.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\Facades\Navigation;
 use Illuminate\Support\Facades\Log;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -91,20 +93,20 @@ class ReconcileController extends Controller
         $currency        = $this->accountRepos->getAccountCurrency($account) ?? $this->primaryCurrency;
 
         // no start or end:
-        $range           = app('navigation')->getViewRange(false);
+        $range           = Navigation::getViewRange(false);
 
         // get start and end
 
         if (!$start instanceof Carbon && !$end instanceof Carbon) {
             /** @var Carbon $start */
-            $start = clone session('start', app('navigation')->startOfPeriod(new Carbon(), $range));
+            $start = clone session('start', Navigation::startOfPeriod(new Carbon(), $range));
 
             /** @var Carbon $end */
-            $end   = clone session('end', app('navigation')->endOfPeriod(new Carbon(), $range));
+            $end   = clone session('end', Navigation::endOfPeriod(new Carbon(), $range));
         }
         if (null === $end) {
             /** @var Carbon $end */
-            $end = app('navigation')->endOfPeriod($start, $range);
+            $end = Navigation::endOfPeriod($start, $range);
         }
 
         if ($end->lt($start)) {
@@ -174,7 +176,7 @@ class ReconcileController extends Controller
             $result = $this->createReconciliation($account, $start, $end, $data['difference']);
         }
         Log::debug('End of routine.');
-        app('preferences')->mark();
+        Preferences::mark();
         if ('' === $result) {
             session()->flash('success', (string) trans('firefly.reconciliation_stored'));
         }

app/Http/Controllers/Account/ShowController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Support\Facades\Preferences;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -113,7 +114,7 @@ class ShowController extends Controller
         $today            = today(config('app.timezone'));
         $subTitleIcon     = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
         $page             = (int) $request->get('page');
-        $pageSize         = (int) app('preferences')->get('listPageSize', 50)->data;
+        $pageSize         = (int) Preferences::get('listPageSize', 50)->data;
         $accountCurrency  = $this->repository->getAccountCurrency($account);
         $currency         = $accountCurrency ?? $this->primaryCurrency;
         $fStart           = $start->isoFormat($this->monthAndDayFormat);
@@ -164,7 +165,7 @@ class ShowController extends Controller
         $timer->stop('collection');
         $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]));
         $showAll          = false;
-        $now              = today()->endOfDay();
+        $now              = now();
         if ($now->gt($end) || $now->lt($start)) {
             $now = $end;
         }
@@ -173,10 +174,7 @@ class ShowController extends Controller
         $balances         = Steam::accountsBalancesOptimized(new Collection()->push($account), $now)[$account->id];
         // $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $now), $account, $this->convertToPrimary, $accountCurrency);
 
-        return view(
-            'accounts.show',
-            ['account' => $account, 'showAll' => $showAll, 'objectType' => $objectType, 'currency' => $currency, 'today' => $today, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'attachments' => $attachments, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'chartUrl' => $chartUrl, 'location' => $location, 'balances' => $balances]
-        );
+        return view('accounts.show', ['account' => $account, 'showAll' => $showAll, 'objectType' => $objectType, 'currency' => $currency, 'today' => $today, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'attachments' => $attachments, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'chartUrl' => $chartUrl, 'location' => $location, 'balances' => $balances]);
     }
 
     /**
@@ -202,7 +200,7 @@ class ShowController extends Controller
         $start        = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
         $subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type);
         $page         = (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
+        $pageSize     = (int) Preferences::get('listPageSize', 50)->data;
         $currency     = $this->repository->getAccountCurrency($account) ?? $this->primaryCurrency;
         $subTitle     = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
         $periods      = new Collection();
@@ -224,14 +222,16 @@ class ShowController extends Controller
         // correct
         Log::debug(sprintf('showAll: Call accountsBalancesOptimized with date/time "%s"', $end->toIso8601String()));
 
+        $now          = now();
+        if ($now->gt($end) || $now->lt($start)) {
+            $now = $end;
+        }
+
         // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.
         // $balances = Steam::finalAccountBalance($account, $end);
         // $balances        = Steam::filterAccountBalance($balances, $account, $this->convertToPrimary, $accountCurrency);
-        $balances     = Steam::accountsBalancesOptimized(new Collection()->push($account), $end)[$account->id];
+        $balances     = Steam::accountsBalancesOptimized(new Collection()->push($account), $now)[$account->id];
 
-        return view(
-            'accounts.show',
-            ['account' => $account, 'showAll' => $showAll, 'location' => $location, 'objectType' => $objectType, 'isLiability' => $isLiability, 'attachments' => $attachments, 'currency' => $currency, 'today' => $today, 'chartUrl' => $chartUrl, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'balances' => $balances]
-        );
+        return view('accounts.show', ['account' => $account, 'showAll' => $showAll, 'location' => $location, 'objectType' => $objectType, 'isLiability' => $isLiability, 'attachments' => $attachments, 'currency' => $currency, 'today' => $today, 'chartUrl' => $chartUrl, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'balances' => $balances]);
     }
 }

app/Http/Controllers/Admin/ConfigurationController.php

@@ -27,6 +27,7 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Requests\ConfigurationRequest;
 use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
@@ -46,7 +47,7 @@ class ConfigurationController extends Controller
 
         $this->middleware(
             static function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.system_settings'));
+                app('view')->share('title', (string)trans('firefly.system_settings'));
                 app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
 
                 return $next($request);
@@ -62,20 +63,39 @@ class ConfigurationController extends Controller
      */
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
-        $subTitle       = (string) trans('firefly.instance_configuration');
-        $subTitleIcon   = 'fa-wrench';
+        $subTitle            = (string)trans('firefly.instance_configuration');
+        $subTitleIcon        = 'fa-wrench';
 
         Log::channel('audit')->info('User visits admin config index.');
 
         // all available configuration and their default value in case
         // they don't exist yet.
-        $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
-        $isDemoSite     = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
-        $siteOwner      = config('firefly.site_owner');
+        $singleUserMode      = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $isDemoSite          = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $siteOwner           = config('firefly.site_owner');
+
+        $enableExchangeRates = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data;
+        $useRunningBalance   = FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;
+        $enableExternalMap   = FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
+        $enableExternalRates = FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data;
+        $allowWebhooks       = FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data;
+        $validUrlProtocols   = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         return view(
             'settings.configuration.index',
-            ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'singleUserMode' => $singleUserMode, 'isDemoSite' => $isDemoSite, 'siteOwner' => $siteOwner]
+            [
+                'subTitle'            => $subTitle,
+                'subTitleIcon'        => $subTitleIcon,
+                'singleUserMode'      => $singleUserMode,
+                'isDemoSite'          => $isDemoSite,
+                'siteOwner'           => $siteOwner,
+                'enableExchangeRates' => $enableExchangeRates,
+                'useRunningBalance'   => $useRunningBalance,
+                'enableExternalMap'   => $enableExternalMap,
+                'enableExternalRates' => $enableExternalRates,
+                'allowWebhooks'       => $allowWebhooks,
+                'validUrlProtocols'   => $validUrlProtocols,
+            ]
         );
     }
 
@@ -91,11 +111,20 @@ class ConfigurationController extends Controller
 
         // store config values
         FireflyConfig::set('single_user_mode', $data['single_user_mode']);
+
+        FireflyConfig::set('enable_exchange_rates', $data['enable_exchange_rates']);
+        FireflyConfig::set('use_running_balance', $data['use_running_balance']);
+
+        FireflyConfig::set('enable_external_map', $data['enable_external_map']);
+        FireflyConfig::set('enable_external_rates', $data['enable_external_rates']);
+        FireflyConfig::set('allow_webhooks', $data['allow_webhooks']);
+
+        FireflyConfig::set('valid_url_protocols', $data['valid_url_protocols']);
         FireflyConfig::set('is_demo_site', $data['is_demo_site']);
 
         // flash message
-        session()->flash('success', (string) trans('firefly.configuration_updated'));
-        app('preferences')->mark();
+        session()->flash('success', (string)trans('firefly.configuration_updated'));
+        Preferences::mark();
 
         return redirect()->route('settings.configuration.index');
     }

app/Http/Controllers/Admin/HomeController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use Illuminate\Contracts\View\Factory;
@@ -59,7 +60,7 @@ class HomeController extends Controller
         $title         = (string) trans('firefly.system_settings');
         $mainTitleIcon = 'fa-hand-spock-o';
         $email         = auth()->user()->email;
-        $pref          = app('preferences')->get('remote_guard_alt_email');
+        $pref          = Preferences::get('remote_guard_alt_email');
         if (null !== $pref && is_string($pref->data)) {
             $email = $pref->data;
         }

app/Http/Controllers/Admin/LinkController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Requests\LinkTypeFormRequest;
@@ -125,7 +126,7 @@ class LinkController extends Controller
         $this->repository->destroy($linkType, $moveTo);
 
         $request->session()->flash('success', (string) trans('firefly.deleted_link_type', ['name' => $name]));
-        app('preferences')->mark();
+        Preferences::mark();
 
         return redirect($this->getPreviousUrl('link-types.delete.url'));
     }
@@ -245,7 +246,7 @@ class LinkController extends Controller
         Log::channel('audit')->info(sprintf('User update link type #%d.', $linkType->id), $data);
 
         $request->session()->flash('success', (string) trans('firefly.updated_link_type', ['name' => $linkType->name]));
-        app('preferences')->mark();
+        Preferences::mark();
         $redirect = redirect($this->getPreviousUrl('link-types.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
             // set value so edit routine will not overwrite URL:

app/Http/Controllers/Admin/UserController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Support\Facades\Log;
 use FireflyIII\Events\Admin\InvitationCreated;
 use FireflyIII\Exceptions\FireflyException;
@@ -41,6 +42,7 @@ use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class UserController.
@@ -163,7 +165,7 @@ class UserController extends Controller
         $subTitle       = (string) trans('firefly.user_administration');
         $subTitleIcon   = 'fa-users';
         $users          = $this->repository->all();
-        $singleUserMode = (bool) app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode = (bool) FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $allowInvites   = false;
         if (!$this->externalIdentity && $singleUserMode) {
             // also registration enabled.
@@ -242,7 +244,7 @@ class UserController extends Controller
         $this->repository->updateEmail($user, $data['email']);
 
         session()->flash('success', (string) trans('firefly.updated_user', ['email' => $user->email]));
-        app('preferences')->mark();
+        Preferences::mark();
         $redirect = redirect($this->getPreviousUrl('users.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
             session()->put('users.edit.fromUpdate', true);

app/Http/Controllers/AttachmentController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\AttachmentFormRequest;
 use FireflyIII\Models\Attachment;
@@ -85,7 +86,7 @@ class AttachmentController extends Controller
         $this->repository->destroy($attachment);
 
         $request->session()->flash('success', (string) trans('firefly.attachment_deleted', ['name' => $name]));
-        app('preferences')->mark();
+        Preferences::mark();
 
         return redirect($this->getPreviousUrl('attachments.delete.url'));
     }
@@ -175,7 +176,7 @@ class AttachmentController extends Controller
         $this->repository->update($attachment, $data);
 
         $request->session()->flash('success', (string) trans('firefly.attachment_updated', ['name' => $attachment->filename]));
-        app('preferences')->mark();
+        Preferences::mark();
 
         $redirect = redirect($this->getPreviousUrl('attachments.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {