IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-26 21:27:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into adminlte

Browse Source
This commit is contained in:
James Cole
2026-06-06 06:38:25 +02:00
parent 85300b38f4 c421315465
commit 05d9f4967e
143 changed files with 1873 additions and 1618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/php-cs-fixer/composer.lock
Generated
+196 -104
View File
@@ -471,23 +471,23 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.95.2",
"version": "v3.95.4",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "a28d88a5e172b27e78d0816992b15a9df3da20f1"
"reference": "3f8f68856837a77e1f1d870354eca3c8747f2f72"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a28d88a5e172b27e78d0816992b15a9df3da20f1",
"reference": "a28d88a5e172b27e78d0816992b15a9df3da20f1",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3f8f68856837a77e1f1d870354eca3c8747f2f72",
"reference": "3f8f68856837a77e1f1d870354eca3c8747f2f72",
"shasum": ""
},
"require": {
"clue/ndjson-react": "^1.3",
"composer/semver": "^3.4",
"composer/xdebug-handler": "^3.0.5",
"ergebnis/agent-detector": "^1.1.1",
"ergebnis/agent-detector": "^1.2",
"ext-filter": "*",
"ext-hash": "*",
"ext-json": "*",
@@ -504,10 +504,10 @@
"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/polyfill-mbstring": "^1.37",
"symfony/polyfill-php80": "^1.37",
"symfony/polyfill-php81": "^1.37",
"symfony/polyfill-php84": "^1.37",
"symfony/process": "^5.4.47 || ^6.4.24 || ^7.2 || ^8.0",
"symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
},
@@ -521,9 +521,9 @@
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.8",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.8",
"phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.55",
"symfony/polyfill-php85": "^1.33",
"symfony/polyfill-php85": "^1.37",
"symfony/var-dumper": "^5.4.48 || ^6.4.32 || ^7.4.4 || ^8.0.8",
"symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.8"
"symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.11"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@@ -564,7 +564,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.95.2"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.4"
},
"funding": [
{
@@ -572,7 +572,7 @@
"type": "github"
}
],
"time": "2026-05-15T09:20:44+00:00"
"time": "2026-06-03T18:02:44+00:00"
},
{
"name": "psr/container",
@@ -1334,23 +1334,29 @@
},
{
"name": "symfony/console",
"version": "v8.0.11",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "3156577f46a38aa1b9323aad223de7a9cd426782"
"reference": "f5a856c6ecb56b3c21ed94a5b7bf940d857d110a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/3156577f46a38aa1b9323aad223de7a9cd426782",
"reference": "3156577f46a38aa1b9323aad223de7a9cd426782",
"url": "https://api.github.com/repos/symfony/console/zipball/f5a856c6ecb56b3c21ed94a5b7bf940d857d110a",
"reference": "f5a856c6ecb56b3c21ed94a5b7bf940d857d110a",
"shasum": ""
},
"require": {
"php": ">=8.4",
"php": ">=8.4.1",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-mbstring": "^1.0",
"symfony/polyfill-php85": "^1.32",
"symfony/service-contracts": "^2.5|^3",
"symfony/string": "^7.4|^8.0"
"symfony/string": "^7.4.6|^8.0.6"
},
"conflict": {
"symfony/dependency-injection": "<8.1",
"symfony/event-dispatcher": "<8.1"
},
"provide": {
"psr/log-implementation": "1.0|2.0|3.0"
@@ -1358,14 +1364,18 @@
"require-dev": {
"psr/log": "^1|^2|^3",
"symfony/config": "^7.4|^8.0",
"symfony/dependency-injection": "^7.4|^8.0",
"symfony/event-dispatcher": "^7.4|^8.0",
"symfony/dependency-injection": "^8.1",
"symfony/event-dispatcher": "^8.1",
"symfony/filesystem": "^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/mime": "^7.4|^8.0",
"symfony/process": "^7.4|^8.0",
"symfony/stopwatch": "^7.4|^8.0",
"symfony/uid": "^7.4|^8.0",
"symfony/validator": "^7.4|^8.0",
"symfony/var-dumper": "^7.4|^8.0"
},
"type": "library",
@@ -1400,7 +1410,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v8.0.11"
"source": "https://github.com/symfony/console/tree/v8.1.0"
},
"funding": [
{
@@ -1420,7 +1430,7 @@
"type": "tidelift"
}
],
"time": "2026-05-13T12:07:53+00:00"
"time": "2026-05-29T05:06:50+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1495,20 +1505,21 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v8.0.9",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "0c3c1a17604c4dbbec4b93fe162c538482096e1f"
"reference": "f249ae3f680958b6f1f9dd76e5747cf0695b4102"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0c3c1a17604c4dbbec4b93fe162c538482096e1f",
"reference": "0c3c1a17604c4dbbec4b93fe162c538482096e1f",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f249ae3f680958b6f1f9dd76e5747cf0695b4102",
"reference": "f249ae3f680958b6f1f9dd76e5747cf0695b4102",
"shasum": ""
},
"require": {
"php": ">=8.4",
"php": ">=8.4.1",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/event-dispatcher-contracts": "^2.5|^3"
},
"conflict": {
@@ -1556,7 +1567,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/v8.0.9"
"source": "https://github.com/symfony/event-dispatcher/tree/v8.1.0"
},
"funding": [
{
@@ -1576,7 +1587,7 @@
"type": "tidelift"
}
],
"time": "2026-04-18T13:51:42+00:00"
"time": "2026-05-29T05:06:50+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -1660,20 +1671,21 @@
},
{
"name": "symfony/filesystem",
"version": "v8.0.11",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "224db910898ce1317b892a9a1338f1f8f17eb7c7"
"reference": "99aec13b82b4967ec5088222c4a3ecca955949c2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/224db910898ce1317b892a9a1338f1f8f17eb7c7",
"reference": "224db910898ce1317b892a9a1338f1f8f17eb7c7",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/99aec13b82b4967ec5088222c4a3ecca955949c2",
"reference": "99aec13b82b4967ec5088222c4a3ecca955949c2",
"shasum": ""
},
"require": {
"php": ">=8.4",
"php": ">=8.4.1",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.8"
},
@@ -1706,7 +1718,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v8.0.11"
"source": "https://github.com/symfony/filesystem/tree/v8.1.0"
},
"funding": [
{
@@ -1726,24 +1738,24 @@
"type": "tidelift"
}
],
"time": "2026-05-11T16:39:47+00:00"
"time": "2026-05-29T05:06:50+00:00"
},
{
"name": "symfony/finder",
"version": "v8.0.8",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "8da41214757b87d97f181e3d14a4179286151007"
"reference": "58d2e767a66052c1487356f953445634a8194c64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/8da41214757b87d97f181e3d14a4179286151007",
"reference": "8da41214757b87d97f181e3d14a4179286151007",
"url": "https://api.github.com/repos/symfony/finder/zipball/58d2e767a66052c1487356f953445634a8194c64",
"reference": "58d2e767a66052c1487356f953445634a8194c64",
"shasum": ""
},
"require": {
"php": ">=8.4"
"php": ">=8.4.1"
},
"require-dev": {
"symfony/filesystem": "^7.4|^8.0"
@@ -1774,7 +1786,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v8.0.8"
"source": "https://github.com/symfony/finder/tree/v8.1.0"
},
"funding": [
{
@@ -1794,24 +1806,24 @@
"type": "tidelift"
}
],
"time": "2026-03-30T15:14:47+00:00"
"time": "2026-05-29T05:06:50+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v8.0.8",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "b48bce0a70b914f6953dafbd10474df232ed4de8"
"reference": "88f9c561f678a02d54b897014049fa839e33ff82"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/b48bce0a70b914f6953dafbd10474df232ed4de8",
"reference": "b48bce0a70b914f6953dafbd10474df232ed4de8",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/88f9c561f678a02d54b897014049fa839e33ff82",
"reference": "88f9c561f678a02d54b897014049fa839e33ff82",
"shasum": ""
},
"require": {
"php": ">=8.4",
"php": ">=8.4.1",
"symfony/deprecation-contracts": "^2.5|^3"
},
"type": "library",
@@ -1845,7 +1857,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v8.0.8"
"source": "https://github.com/symfony/options-resolver/tree/v8.1.0"
},
"funding": [
{
@@ -1865,7 +1877,7 @@
"type": "tidelift"
}
],
"time": "2026-03-30T15:14:47+00:00"
"time": "2026-05-29T05:06:50+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -1952,16 +1964,16 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
"version": "v1.37.0",
"version": "v1.38.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e"
"reference": "e9247d281d694a5120554d9afaf54e070e88a603"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e",
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e9247d281d694a5120554d9afaf54e070e88a603",
"reference": "e9247d281d694a5120554d9afaf54e070e88a603",
"shasum": ""
},
"require": {
@@ -2010,7 +2022,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0"
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.38.1"
},
"funding": [
{
@@ -2030,20 +2042,20 @@
"type": "tidelift"
}
],
"time": "2026-04-26T13:13:48+00:00"
"time": "2026-05-26T05:58:03+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.37.0",
"version": "v1.38.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "3833d7255cc303546435cb650316bff708a1c75c"
"reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
"reference": "3833d7255cc303546435cb650316bff708a1c75c",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b",
"reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b",
"shasum": ""
},
"require": {
@@ -2095,7 +2107,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0"
},
"funding": [
{
@@ -2115,20 +2127,20 @@
"type": "tidelift"
}
],
"time": "2024-09-09T11:45:10+00:00"
"time": "2026-05-25T13:48:31+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.37.0",
"version": "v1.38.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
"reference": "14c5439eec4ccff081ac14eca2dc57feb2a66d92"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/14c5439eec4ccff081ac14eca2dc57feb2a66d92",
"reference": "14c5439eec4ccff081ac14eca2dc57feb2a66d92",
"shasum": ""
},
"require": {
@@ -2180,7 +2192,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.1"
},
"funding": [
{
@@ -2200,7 +2212,7 @@
"type": "tidelift"
}
],
"time": "2026-04-10T17:25:58+00:00"
"time": "2026-05-26T12:51:13+00:00"
},
{
"name": "symfony/polyfill-php80",
@@ -2288,16 +2300,16 @@
},
{
"name": "symfony/polyfill-php81",
"version": "v1.37.0",
"version": "v1.38.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
"reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
"reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
"shasum": ""
},
"require": {
@@ -2344,7 +2356,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php81/tree/v1.37.0"
"source": "https://github.com/symfony/polyfill-php81/tree/v1.38.1"
},
"funding": [
{
@@ -2364,20 +2376,20 @@
"type": "tidelift"
}
],
"time": "2024-09-09T11:45:10+00:00"
"time": "2026-05-26T12:45:58+00:00"
},
{
"name": "symfony/polyfill-php84",
"version": "v1.37.0",
"version": "v1.38.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php84.git",
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06"
"reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06",
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06",
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
"reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
"shasum": ""
},
"require": {
@@ -2424,7 +2436,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php84/tree/v1.37.0"
"source": "https://github.com/symfony/polyfill-php84/tree/v1.38.1"
},
"funding": [
{
@@ -2444,24 +2456,104 @@
"type": "tidelift"
}
],
"time": "2026-04-10T18:47:49+00:00"
"time": "2026-05-26T12:51:13+00:00"
},
{
"name": "symfony/process",
"version": "v8.0.11",
"name": "symfony/polyfill-php85",
"version": "v1.38.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "26d89e459f037d2873300605d0a07e7a8ef84db0"
"url": "https://github.com/symfony/polyfill-php85.git",
"reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/26d89e459f037d2873300605d0a07e7a8ef84db0",
"reference": "26d89e459f037d2873300605d0a07e7a8ef84db0",
"url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1",
"reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1",
"shasum": ""
},
"require": {
"php": ">=8.4"
"php": ">=7.2"
},
"type": "library",
"extra": {
"thanks": {
"url": "https://github.com/symfony/polyfill",
"name": "symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Php85\\": ""
},
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 8.5+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php85/tree/v1.38.1"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"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": "2026-05-26T02:25:22+00:00"
},
{
"name": "symfony/process",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "c4a9e58f235a6bf7f97ffbfedae2687353ac79e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/c4a9e58f235a6bf7f97ffbfedae2687353ac79e5",
"reference": "c4a9e58f235a6bf7f97ffbfedae2687353ac79e5",
"shasum": ""
},
"require": {
"php": ">=8.4.1"
},
"type": "library",
"autoload": {
@@ -2489,7 +2581,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v8.0.11"
"source": "https://github.com/symfony/process/tree/v8.1.0"
},
"funding": [
{
@@ -2509,7 +2601,7 @@
"type": "tidelift"
}
],
"time": "2026-05-11T16:56:32+00:00"
"time": "2026-05-29T05:06:50+00:00"
},
{
"name": "symfony/service-contracts",
@@ -2600,20 +2692,20 @@
},
{
"name": "symfony/stopwatch",
"version": "v8.0.8",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "85954ed72d5440ea4dc9a10b7e49e01df766ffa3"
"reference": "21c07b026905d596e8379caeb115d87aa479499d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/85954ed72d5440ea4dc9a10b7e49e01df766ffa3",
"reference": "85954ed72d5440ea4dc9a10b7e49e01df766ffa3",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/21c07b026905d596e8379caeb115d87aa479499d",
"reference": "21c07b026905d596e8379caeb115d87aa479499d",
"shasum": ""
},
"require": {
"php": ">=8.4",
"php": ">=8.4.1",
"symfony/service-contracts": "^2.5|^3"
},
"type": "library",
@@ -2642,7 +2734,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/stopwatch/tree/v8.0.8"
"source": "https://github.com/symfony/stopwatch/tree/v8.1.0"
},
"funding": [
{
@@ -2662,24 +2754,24 @@
"type": "tidelift"
}
],
"time": "2026-03-30T15:14:47+00:00"
"time": "2026-05-29T05:06:50+00:00"
},
{
"name": "symfony/string",
"version": "v8.0.11",
"version": "v8.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "39be2ad058a3c0bd558edca23e65f009865d75ff"
"reference": "afd5944f4005862d961efb85c8bbd5c523c4e3c9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/39be2ad058a3c0bd558edca23e65f009865d75ff",
"reference": "39be2ad058a3c0bd558edca23e65f009865d75ff",
"url": "https://api.github.com/repos/symfony/string/zipball/afd5944f4005862d961efb85c8bbd5c523c4e3c9",
"reference": "afd5944f4005862d961efb85c8bbd5c523c4e3c9",
"shasum": ""
},
"require": {
"php": ">=8.4",
"php": ">=8.4.1",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-intl-grapheme": "^1.33",
"symfony/polyfill-intl-normalizer": "^1.0",
@@ -2732,7 +2824,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v8.0.11"
"source": "https://github.com/symfony/string/tree/v8.1.0"
},
"funding": [
{
@@ -2752,7 +2844,7 @@
"type": "tidelift"
}
],
"time": "2026-05-13T12:07:53+00:00"
"time": "2026-05-29T05:06:50+00:00"
}
],
"packages-dev": [],
app/Api/V1/Controllers/Chart/BalanceController.php
+1 -2
View File
@@ -87,8 +87,7 @@ final class BalanceController extends Controller
// get journals for entire period:
$this->collector
->setRange($queryParameters['start'], $queryParameters['end'])
$this->collector->setRange($queryParameters['start'], $queryParameters['end'])
->withAccountInformation()
->setXorAccounts($accounts)
->setTypes([
app/Api/V1/Controllers/System/ConfigurationController.php
+13 -13
View File
@@ -31,7 +31,7 @@ use FireflyIII\Enums\WebhookResponse;
use FireflyIII\Enums\WebhookTrigger;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\Binder\EitherConfigKey;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
use Illuminate\Validation\ValidationException;
@@ -128,7 +128,7 @@ final class ConfigurationController extends Controller
$data = $request->getAll();
$shortName = str_replace('configuration.', '', $name);
FireflyConfig::set($shortName, $data['value']);
AppConfiguration::set($shortName, $data['value']);
// get updated config:
$newConfig = $this->getDynamicConfiguration();
@@ -148,17 +148,17 @@ final class ConfigurationController extends Controller
*/
private function getDynamicConfiguration(): array
{
$isDemoSite = FireflyConfig::get('is_demo_site', false);
$updateCheck = FireflyConfig::get('permission_update_check', -1);
$singleUser = FireflyConfig::get('single_user_mode', true);
$lastCheck = FireflyConfig::get('last_update_check', 1);
$enableExchangeRates = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'));
$useRunningBalance = FireflyConfig::get('use_running_balance', true);
$enableExternalMap = FireflyConfig::get('enable_external_map', false);
$enableExternalRates = FireflyConfig::get('enable_external_rates', false);
$allowWebhooks = FireflyConfig::get('allow_webhooks', false);
$enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false);
$validUrlProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'));
$isDemoSite = AppConfiguration::get('is_demo_site', false);
$updateCheck = AppConfiguration::get('permission_update_check', -1);
$singleUser = AppConfiguration::get('single_user_mode', true);
$lastCheck = AppConfiguration::get('last_update_check', 1);
$enableExchangeRates = AppConfiguration::get('enable_exchange_rates', config('cer.enabled'));
$useRunningBalance = AppConfiguration::get('use_running_balance', true);
$enableExternalMap = AppConfiguration::get('enable_external_map', false);
$enableExternalRates = AppConfiguration::get('enable_external_rates', false);
$allowWebhooks = AppConfiguration::get('allow_webhooks', false);
$enableBatchProcessing = AppConfiguration::get('enable_batch_processing', false);
$validUrlProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'));
return [
'is_demo_site' => $isDemoSite?->data,
app/Api/V1/Controllers/System/CronController.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\System;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\System\CronRequest;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Http\Controllers\CronRunner;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
@@ -51,7 +51,7 @@ final 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 === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data) {
if (true === AppConfiguration::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
+3 -3
View File
@@ -30,7 +30,7 @@ use FireflyIII\Models\Webhook;
use FireflyIII\Models\WebhookAttempt;
use FireflyIII\Models\WebhookMessage;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Transformers\WebhookAttemptTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
@@ -71,7 +71,7 @@ final class AttemptController extends Controller
if ($message->webhook_id !== $webhook->id) {
throw new FireflyException('200040: Webhook and webhook message are no match');
}
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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,
@@ -119,7 +119,7 @@ final class AttemptController extends Controller
throw new FireflyException('200041: Webhook message and webhook attempt are no match');
}
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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,
app/Api/V1/Controllers/Webhook/DestroyController.php
+4 -4
View File
@@ -30,7 +30,7 @@ use FireflyIII\Models\Webhook;
use FireflyIII\Models\WebhookAttempt;
use FireflyIII\Models\WebhookMessage;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
@@ -62,7 +62,7 @@ final class DestroyController extends Controller
*/
public function destroy(Webhook $webhook): JsonResponse
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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.');
@@ -92,7 +92,7 @@ final class DestroyController extends Controller
throw new FireflyException('200041: Webhook message and webhook attempt are no match');
}
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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,
@@ -125,7 +125,7 @@ final class DestroyController extends Controller
throw new FireflyException('200040: Webhook and webhook message are no match');
}
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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
+3 -3
View File
@@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Webhook;
use FireflyIII\Models\WebhookMessage;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Transformers\WebhookMessageTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
@@ -65,7 +65,7 @@ final class MessageController extends Controller
*/
public function index(Webhook $webhook): JsonResponse
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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 +105,7 @@ final class MessageController extends Controller
if ($message->webhook_id !== $webhook->id) {
throw new FireflyException('200040: Webhook and webhook message are no match');
}
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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
+4 -4
View File
@@ -31,7 +31,7 @@ use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\Webhook;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
use FireflyIII\Transformers\WebhookTransformer;
use FireflyIII\User;
@@ -72,7 +72,7 @@ final class ShowController extends Controller
*/
public function index(): JsonResponse
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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 +114,7 @@ final class ShowController extends Controller
*/
public function show(Webhook $webhook): JsonResponse
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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 +146,7 @@ final class ShowController extends Controller
*/
public function triggerTransaction(Webhook $webhook, TransactionGroup $group): JsonResponse
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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,
app/Api/V1/Controllers/Webhook/StoreController.php
+2 -2
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Webhook;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\Webhook\CreateRequest;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
use FireflyIII\Transformers\WebhookTransformer;
use FireflyIII\User;
@@ -63,7 +63,7 @@ final class StoreController extends Controller
public function store(CreateRequest $request): JsonResponse
{
$data = $request->getData();
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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
+2 -2
View File
@@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Jobs\SendWebhookMessage;
use FireflyIII\Models\Webhook;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -57,7 +57,7 @@ final class SubmitController extends Controller
*/
public function submit(Webhook $webhook): JsonResponse
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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
+2 -2
View File
@@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\Webhook\UpdateRequest;
use FireflyIII\Models\Webhook;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
use FireflyIII\Transformers\WebhookTransformer;
use FireflyIII\User;
@@ -62,7 +62,7 @@ final class UpdateController extends Controller
public function update(Webhook $webhook, UpdateRequest $request): JsonResponse
{
$data = $request->getData();
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::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/Models/Transaction/StoreRequest.php
+2 -2
View File
@@ -30,7 +30,7 @@ use FireflyIII\Rules\IsBoolean;
use FireflyIII\Rules\IsDateOrTime;
use FireflyIII\Rules\IsValidPositiveAmount;
use FireflyIII\Rules\IsValidZeroOrMoreAmount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\NullArrayObject;
use FireflyIII\Support\Request\AppendsLocationData;
use FireflyIII\Support\Request\ChecksLogin;
@@ -81,7 +81,7 @@ class StoreRequest extends FormRequest
public function rules(): array
{
Log::debug('Collect rules of TransactionStoreRequest');
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$locationRules = Location::requestRules([]);
return [
app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
+2 -2
View File
@@ -31,7 +31,7 @@ use FireflyIII\Rules\IsBoolean;
use FireflyIII\Rules\IsDateOrTime;
use FireflyIII\Rules\IsValidPositiveAmount;
use FireflyIII\Rules\IsValidZeroOrMoreAmount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\Validation\GroupValidation;
@@ -141,7 +141,7 @@ class UpdateRequest extends FormRequest
public function rules(): array
{
Log::debug(sprintf('Now in %s', __METHOD__));
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
return [
// basic fields for group:
app/Api/V1/Requests/Models/Webhook/CreateRequest.php
+2 -2
View File
@@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Webhook;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Rules\Webhook\IsValidWebhookUrl;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\Support\Request\ValidatesWebhooks;
@@ -72,7 +72,7 @@ class CreateRequest extends FormRequest
$triggers = implode(',', array_values(Webhook::getTriggers()));
$responses = implode(',', array_values(Webhook::getResponses()));
$deliveries = implode(',', array_values(Webhook::getDeliveries()));
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::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
+2 -2
View File
@@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Webhook;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Rules\Webhook\IsValidWebhookUrl;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\Support\Request\ValidatesWebhooks;
@@ -73,7 +73,7 @@ class UpdateRequest extends FormRequest
$triggers = implode(',', array_values(Webhook::getTriggers()));
$responses = implode(',', array_values(Webhook::getResponses()));
$deliveries = implode(',', array_values(Webhook::getDeliveries()));
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
/** @var Webhook $webhook */
$webhook = $this->route()->parameter('webhook');
app/Console/Commands/Correction/ConvertsDatesToUTC.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Correction;
use Carbon\Carbon;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\QueryException;
@@ -58,7 +58,7 @@ class ConvertsDatesToUTC extends Command
$this->ConvertModeltoUTC($model, $fields);
}
// tell the system we are now in UTC mode.
FireflyConfig::set('utc', true);
AppConfiguration::set('utc', true);
return Command::SUCCESS;
}
app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Correction;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Services\Internal\Recalculate\PrimaryAmountRecalculationService;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
@@ -43,7 +43,7 @@ class CorrectsPrimaryCurrencyAmounts extends Command
*/
public function handle(): int
{
if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) {
if (false === AppConfiguration::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/CorrectsTimezoneInformation.php
+2 -2
View File
@@ -36,7 +36,7 @@ use FireflyIII\Models\PiggyBankRepetition;
use FireflyIII\Models\Recurrence;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Log;
@@ -71,7 +71,7 @@ class CorrectsTimezoneInformation extends Command
$this->addTimezoneToModel($model, $fields);
}
// not yet in UTC mode
FireflyConfig::set('utc', false);
AppConfiguration::set('utc', false);
}
private function addTimezoneToModel(string $model, array $fields): void
app/Console/Commands/Correction/CorrectsUnevenAmount.php
+2 -2
View File
@@ -30,7 +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\AppConfiguration;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\Support\Models\AccountBalanceCalculator;
use Illuminate\Console\Command;
@@ -61,7 +61,7 @@ class CorrectsUnevenAmount extends Command
$this->fixUnevenAmounts();
$this->matchCurrencies();
if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
if (true === AppConfiguration::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.');
app/Console/Commands/SendTestEmail.php
+3 -3
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands;
use FireflyIII\Events\Test\OwnerTestsNotificationChannel;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class SendTestEmail extends Command
@@ -63,7 +63,7 @@ class SendTestEmail extends Command
}
/** @var int $lastNotification */
$lastNotification = FireflyConfig::get('last_test_notification', 123)->data;
$lastNotification = AppConfiguration::get('last_test_notification', 123)->data;
if ((time() - $lastNotification) < 120) {
$this->friendlyError((string) trans('firefly.test_rate_limited'));
@@ -72,7 +72,7 @@ class SendTestEmail extends Command
$owner = new OwnerNotifiable();
event(new OwnerTestsNotificationChannel('email', $owner));
FireflyConfig::set('last_test_notification', time());
AppConfiguration::set('last_test_notification', time());
return Command::SUCCESS;
}
app/Console/Commands/System/RecalculatesRunningBalance.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\System;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Models\AccountBalanceCalculator;
use Illuminate\Console\Command;
@@ -52,7 +52,7 @@ class RecalculatesRunningBalance extends Command
*/
public function handle(): int
{
if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
if (true === AppConfiguration::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/SetsLatestVersion.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\System;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class SetsLatestVersion extends Command
@@ -46,7 +46,7 @@ class SetsLatestVersion extends Command
return 0;
}
FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time'));
AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time'));
$this->friendlyInfo('Updated version.');
return 0;
app/Console/Commands/System/VerifySecurityAlerts.php
+5 -5
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\System;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Log;
@@ -108,8 +108,8 @@ class VerifySecurityAlerts extends Command
private function removeOldAdvisory(): void
{
try {
FireflyConfig::delete('upgrade_security_message');
FireflyConfig::delete('upgrade_security_level');
AppConfiguration::delete('upgrade_security_message');
AppConfiguration::delete('upgrade_security_level');
} catch (QueryException $e) {
Log::debug(sprintf('Could not delete old security advisory, but thats OK: %s', $e->getMessage()));
}
@@ -118,8 +118,8 @@ class VerifySecurityAlerts extends Command
private function saveSecurityAdvisory(array $array): void
{
try {
FireflyConfig::set('upgrade_security_message', $array['message']);
FireflyConfig::set('upgrade_security_level', $array['level']);
AppConfiguration::set('upgrade_security_message', $array['message']);
AppConfiguration::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/ChecksForUpdates.php
+2 -2
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Tools;
use Carbon\Carbon;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class ChecksForUpdates extends Command
@@ -57,7 +57,7 @@ class ChecksForUpdates extends Command
$version = config('firefly.version');
$this->friendlyLine(sprintf('You are running version "%s", built on %s', $version, $build->format('Y-m-d H:i')));
$permission = FireflyConfig::get('permission_update_check', -1)->data;
$permission = AppConfiguration::get('permission_update_check', -1)->data;
if (1 !== $permission && false === $this->option('force')) {
$this->friendlyWarning('Checking for updates is disabled. To overrule, use --force.');
app/Console/Commands/Tools/Cron.php
+2 -2
View File
@@ -33,7 +33,7 @@ use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob;
use FireflyIII\Support\Cronjobs\RecurringCronjob;
use FireflyIII\Support\Cronjobs\UpdateCheckCronjob;
use FireflyIII\Support\Cronjobs\WebhookCronjob;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
use InvalidArgumentException;
@@ -74,7 +74,7 @@ class Cron extends Command
$force = (bool) $this->option('force');
// Fire exchange rates cron job.
if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) {
if (true === AppConfiguration::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
+3 -3
View File
@@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Log;
@@ -115,14 +115,14 @@ class AddsTransactionIdentifiers extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
/**
app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php
+3 -3
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Preference;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Support\Facades\Crypt;
@@ -145,7 +145,7 @@ class RemovesDatabaseDecryption extends Command
$this->friendlyPositive(sprintf('Decrypted the data in table "%s".', $table));
// mark as decrypted:
$configName = sprintf('is_decrypted_%s', $table);
FireflyConfig::set($configName, true);
AppConfiguration::set($configName, true);
}
private function isDecrypted(string $table): bool
@@ -154,7 +154,7 @@ class RemovesDatabaseDecryption extends Command
$configVar = null;
try {
$configVar = FireflyConfig::get($configName, false);
$configVar = AppConfiguration::get($configName, false);
} catch (FireflyException $e) {
Log::error($e->getMessage());
}
app/Console/Commands/Upgrade/RepairsAccountBalances.php
+4 -4
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Models\AccountBalanceCalculator;
use Illuminate\Console\Command;
@@ -45,7 +45,7 @@ class RepairsAccountBalances extends Command
return 0;
}
if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
if (true === AppConfiguration::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();
@@ -65,13 +65,13 @@ class RepairsAccountBalances extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
}
app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php
+3 -3
View File
@@ -34,7 +34,7 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Console\Command;
@@ -75,14 +75,14 @@ class UpgradesAccountCurrencies extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
/**
app/Console/Commands/Upgrade/UpgradesAccountMetaData.php
+3 -3
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class UpgradesAccountMetaData extends Command
@@ -83,13 +83,13 @@ class UpgradesAccountMetaData extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
}
app/Console/Commands/Upgrade/UpgradesAttachments.php
+3 -3
View File
@@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Attachment;
use FireflyIII\Models\Note;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
@@ -93,13 +93,13 @@ class UpgradesAttachments extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
}
app/Console/Commands/Upgrade/UpgradesBillsToRules.php
+3 -3
View File
@@ -33,7 +33,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\User;
use Illuminate\Console\Command;
@@ -86,14 +86,14 @@ class UpgradesBillsToRules extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function migrateBill(RuleGroup $ruleGroup, Bill $bill, Preference $language): void
app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php
+3 -3
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
@@ -140,14 +140,14 @@ class UpgradesBudgetLimitPeriods extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function theresNoLimit(): void
app/Console/Commands/Upgrade/UpgradesBudgetLimits.php
+3 -3
View File
@@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Console\Command;
@@ -89,13 +89,13 @@ class UpgradesBudgetLimits extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
}
app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php
+3 -3
View File
@@ -29,7 +29,7 @@ use FireflyIII\Enums\AccountTypeEnum;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Collection;
@@ -82,13 +82,13 @@ class UpgradesCreditCardLiabilities extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
}
app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php
+3 -3
View File
@@ -30,7 +30,7 @@ use FireflyIII\Models\Preference;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\UserGroup;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Console\Command;
use Illuminate\Support\Collection;
@@ -85,14 +85,14 @@ class UpgradesCurrencyPreferences extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function runUpgrade(): void
app/Console/Commands/Upgrade/UpgradesDatabase.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
use Safe\Exceptions\InfoException;
@@ -87,7 +87,7 @@ class UpgradesDatabase extends Command
$this->call($command, $args);
}
// index will set FF3 version.
FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time'));
AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time'));
return 0;
}
app/Console/Commands/Upgrade/UpgradesJournalMetaData.php
+4 -4
View File
@@ -29,7 +29,7 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
@@ -98,21 +98,21 @@ class UpgradesJournalMetaData extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar->data;
}
private function isMigrated(): bool
{
$configVar = FireflyConfig::get(UpgradesToGroups::CONFIG_NAME, false);
$configVar = AppConfiguration::get(UpgradesToGroups::CONFIG_NAME, false);
return (bool) $configVar->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function migrateAll(): void
app/Console/Commands/Upgrade/UpgradesJournalNotes.php
+3 -3
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\Note;
use FireflyIII\Models\TransactionJournalMeta;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
@@ -87,13 +87,13 @@ class UpgradesJournalNotes extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
}
app/Console/Commands/Upgrade/UpgradesLiabilities.php
+3 -3
View File
@@ -31,7 +31,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Services\Internal\Support\CreditRecalculateService;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Console\Command;
@@ -93,14 +93,14 @@ class UpgradesLiabilities extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function upgradeForUser(User $user): void
app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php
+3 -3
View File
@@ -33,7 +33,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
use FireflyIII\Services\Internal\Support\CreditRecalculateService;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
@@ -132,14 +132,14 @@ class UpgradesLiabilitiesEight extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function reverseOpeningBalance(Account $account): void
app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php
+3 -3
View File
@@ -29,7 +29,7 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
@@ -65,14 +65,14 @@ class UpgradesMultiPiggyBanks extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function upgradePiggyBank(PiggyBank $piggyBank): void
app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php
+3 -3
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Artisan;
@@ -59,13 +59,13 @@ class UpgradesPrimaryCurrencyAmounts extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
}
app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php
+3 -3
View File
@@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\Recurrence;
use FireflyIII\Models\RecurrenceMeta;
use FireflyIII\Models\RecurrenceTransactionMeta;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use function Safe\json_encode;
@@ -66,14 +66,14 @@ class UpgradesRecurrenceMetaData extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function migrateEntry(RecurrenceMeta $meta): int
app/Console/Commands/Upgrade/UpgradesRuleActions.php
+3 -3
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\RuleAction;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class UpgradesRuleActions extends Command
@@ -63,14 +63,14 @@ class UpgradesRuleActions extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function replaceEqualSign(): void
app/Console/Commands/Upgrade/UpgradesTagLocations.php
+3 -3
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\Location;
use FireflyIII\Models\Tag;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class UpgradesTagLocations extends Command
@@ -63,14 +63,14 @@ class UpgradesTagLocations extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function migrateLocationDetails(Tag $tag): void
app/Console/Commands/Upgrade/UpgradesToGroups.php
+3 -3
View File
@@ -35,7 +35,7 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
@@ -260,7 +260,7 @@ class UpgradesToGroups extends Command
private function isMigrated(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
@@ -355,7 +355,7 @@ class UpgradesToGroups extends Command
private function markAsMigrated(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
/**
app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php
+3 -3
View File
@@ -32,7 +32,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
@@ -333,7 +333,7 @@ class UpgradesTransferCurrencies extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
@@ -375,7 +375,7 @@ class UpgradesTransferCurrencies extends Command
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
/**
app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php
+3 -3
View File
@@ -34,7 +34,7 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class UpgradesVariousCurrencyInformation extends Command
@@ -149,7 +149,7 @@ class UpgradesVariousCurrencyInformation extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
@@ -166,7 +166,7 @@ class UpgradesVariousCurrencyInformation extends Command
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
/**
app/Console/Commands/Upgrade/UpgradesWebhooks.php
+3 -3
View File
@@ -32,7 +32,7 @@ use FireflyIII\Models\Webhook;
use FireflyIII\Models\WebhookDelivery as WebhookDeliveryModel;
use FireflyIII\Models\WebhookResponse as WebhookResponseModel;
use FireflyIII\Models\WebhookTrigger as WebhookTriggerModel;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Console\Command;
class UpgradesWebhooks extends Command
@@ -64,14 +64,14 @@ class UpgradesWebhooks extends Command
private function isExecuted(): bool
{
$configVar = FireflyConfig::get(self::CONFIG_NAME, false);
$configVar = AppConfiguration::get(self::CONFIG_NAME, false);
return (bool) $configVar?->data;
}
private function markAsExecuted(): void
{
FireflyConfig::set(self::CONFIG_NAME, true);
AppConfiguration::set(self::CONFIG_NAME, true);
}
private function upgradeWebhook(Webhook $webhook): void
app/Factory/TransactionJournalFactory.php
+2 -2
View File
@@ -49,7 +49,7 @@ use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
use FireflyIII\Services\Internal\Support\JournalServiceTrait;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\NullArrayObject;
use FireflyIII\User;
use FireflyIII\Validation\AccountValidator;
@@ -252,7 +252,7 @@ class TransactionJournalFactory
$carbon->setTimezone(config('app.timezone'));
// 2024-11-19, overrule timezone with UTC and store it as UTC.
if (true === FireflyConfig::get('utc', false)->data) {
if (true === AppConfiguration::get('utc', false)->data) {
$carbon->setTimezone('UTC');
}
app/Generator/Webhook/StandardMessageGenerator.php
+1 -2
View File
@@ -313,8 +313,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
private function getWebhooks(): Collection
{
return $this->user
->webhooks()
return $this->user->webhooks()
->leftJoin('webhook_webhook_trigger', 'webhook_webhook_trigger.webhook_id', 'webhooks.id')
->leftJoin('webhook_triggers', 'webhook_webhook_trigger.webhook_trigger_id', 'webhook_triggers.id')
->where('active', true)
app/Helpers/Collector/Extensions/AttachmentCollection.php
+1 -2
View File
@@ -515,8 +515,7 @@ trait AttachmentCollection
if (false === $this->hasJoinedAttTables) {
// join some extra tables:
$this->hasJoinedAttTables = true;
$this->query
->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
$this->query->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
->where(static function (EloquentBuilder $q1): void {
$q1->where('attachments.attachable_type', TransactionJournal::class);
// $q1->where('attachments.uploaded', true);
app/Helpers/Collector/GroupCollector.php
+3 -5
View File
@@ -1063,9 +1063,8 @@ class GroupCollector implements GroupCollectorInterface
private function startQuery(): void
{
// Log::debug('GroupCollector::startQuery');
$this->query = $this->user
// ->transactionGroups()
// ->leftJoin('transaction_journals', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
$this->query = $this->user// ->transactionGroups()
// ->leftJoin('transaction_journals', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
->transactionJournals()
->leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
// join source transaction.
@@ -1099,8 +1098,7 @@ class GroupCollector implements GroupCollectorInterface
private function startQueryForGroup(): void
{
// Log::debug('GroupCollector::startQuery');
$this->query = $this->userGroup
->transactionJournals()
$this->query = $this->userGroup->transactionJournals()
->leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
// join source transaction.
->leftJoin('transactions as source', static function (JoinClause $join): void {
app/Helpers/Update/UpdateTrait.php
+2 -2
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Helpers\Update;
use Carbon\Carbon;
use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface;
use FireflyIII\Services\FireflyIIIOrg\Update\UpdateResponse;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Support\Facades\Log;
/**
@@ -46,7 +46,7 @@ trait UpdateTrait
/** @var UpdateRequestInterface $checker */
$checker = app(UpdateRequestInterface::class);
$channelConfig = FireflyConfig::get('update_channel', 'stable');
$channelConfig = AppConfiguration::get('update_channel', 'stable');
$channel = (string) $channelConfig->data;
$build = Carbon::createFromTimestamp(config('firefly.build_time'), config('app.timezone'));
$version = config('firefly.version');
app/Http/Controllers/Account/ShowController.php
+6 -1
View File
@@ -83,7 +83,12 @@ final class ShowController extends Controller
* @throws FireflyException
* @throws NotFoundExceptionInterface
*/
public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse {
public function show(
Request $request,
Account $account,
?Carbon $start = null,
?Carbon $end = null
): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse {
if (0 === $account->id) {
throw new NotFoundHttpException();
}
app/Http/Controllers/Admin/ConfigurationController.php
+19 -19
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Requests\ConfigurationRequest;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
@@ -68,17 +68,17 @@ final class ConfigurationController extends Controller
// 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;
$singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$isDemoSite = AppConfiguration::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;
$enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false)->data;
$validUrlProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$enableExchangeRates = AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data;
$useRunningBalance = AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;
$enableExternalMap = AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;
$enableExternalRates = AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data;
$allowWebhooks = AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data;
$enableBatchProcessing = AppConfiguration::get('enable_batch_processing', false)->data;
$validUrlProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
return view('settings.configuration.index', [
'subTitle' => $subTitle,
@@ -107,18 +107,18 @@ final class ConfigurationController extends Controller
Log::channel('audit')->info('User updates global configuration.', $data);
// store config values
FireflyConfig::set('single_user_mode', $data['single_user_mode']);
AppConfiguration::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']);
AppConfiguration::set('enable_exchange_rates', $data['enable_exchange_rates']);
AppConfiguration::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('enable_batch_processing', $data['enable_batch_processing']);
AppConfiguration::set('enable_external_map', $data['enable_external_map']);
AppConfiguration::set('enable_external_rates', $data['enable_external_rates']);
AppConfiguration::set('allow_webhooks', $data['allow_webhooks']);
AppConfiguration::set('enable_batch_processing', $data['enable_batch_processing']);
FireflyConfig::set('valid_url_protocols', $data['valid_url_protocols']);
FireflyConfig::set('is_demo_site', $data['is_demo_site']);
AppConfiguration::set('valid_url_protocols', $data['valid_url_protocols']);
AppConfiguration::set('is_demo_site', $data['is_demo_site']);
// flash message
session()->flash('success', (string) trans('firefly.configuration_updated'));
app/Http/Controllers/Admin/NotificationController.php
+16 -16
View File
@@ -28,7 +28,7 @@ use FireflyIII\Events\Test\OwnerTestsNotificationChannel;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\NotificationRequest;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
@@ -45,14 +45,14 @@ final class NotificationController extends Controller
$subTitleIcon = 'envelope-o';
// notification settings:
$slackUrl = FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
$pushoverAppToken = FireflyConfig::getEncrypted('pushover_app_token', '')->data;
$pushoverUserToken = FireflyConfig::getEncrypted('pushover_user_token', '')->data;
$ntfyServer = FireflyConfig::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
$ntfyTopic = FireflyConfig::getEncrypted('ntfy_topic', '')->data;
$ntfyAuth = FireflyConfig::get('ntfy_auth', false)->data;
$ntfyUser = FireflyConfig::getEncrypted('ntfy_user', '')->data;
$ntfyPass = FireflyConfig::getEncrypted('ntfy_pass', '')->data;
$slackUrl = AppConfiguration::getEncrypted('slack_webhook_url', '')->data;
$pushoverAppToken = AppConfiguration::getEncrypted('pushover_app_token', '')->data;
$pushoverUserToken = AppConfiguration::getEncrypted('pushover_user_token', '')->data;
$ntfyServer = AppConfiguration::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
$ntfyTopic = AppConfiguration::getEncrypted('ntfy_topic', '')->data;
$ntfyAuth = AppConfiguration::get('ntfy_auth', false)->data;
$ntfyUser = AppConfiguration::getEncrypted('ntfy_user', '')->data;
$ntfyPass = AppConfiguration::getEncrypted('ntfy_pass', '')->data;
$channels = config('notifications.channels');
$forcedAvailability = [];
@@ -60,7 +60,7 @@ final class NotificationController extends Controller
$notifications = [];
foreach (config('notifications.notifications.owner') as $key => $info) {
if (true === $info['enabled']) {
$notifications[$key] = FireflyConfig::get(sprintf('notification_%s', $key), true)->data;
$notifications[$key] = AppConfiguration::get(sprintf('notification_%s', $key), true)->data;
}
}
@@ -97,19 +97,19 @@ final class NotificationController extends Controller
foreach (config('notifications.notifications.owner') as $key => $info) {
if (array_key_exists($key, $all)) {
FireflyConfig::set(sprintf('notification_%s', $key), $all[$key]);
AppConfiguration::set(sprintf('notification_%s', $key), $all[$key]);
}
}
$variables = ['slack_webhook_url', 'pushover_app_token', 'pushover_user_token', 'ntfy_server', 'ntfy_topic', 'ntfy_user', 'ntfy_pass'];
foreach ($variables as $variable) {
if ('' === $all[$variable]) {
FireflyConfig::delete($variable);
AppConfiguration::delete($variable);
}
if ('' !== $all[$variable]) {
FireflyConfig::setEncrypted($variable, $all[$variable]);
AppConfiguration::setEncrypted($variable, $all[$variable]);
}
}
FireflyConfig::set('ntfy_auth', $all['ntfy_auth'] ?? false);
AppConfiguration::set('ntfy_auth', $all['ntfy_auth'] ?? false);
session()->flash('success', (string) trans('firefly.notification_settings_saved'));
@@ -125,7 +125,7 @@ final class NotificationController extends Controller
}
/** @var int $lastNotification */
$lastNotification = FireflyConfig::get('last_test_notification', 123)->data;
$lastNotification = AppConfiguration::get('last_test_notification', 123)->data;
if ((time() - $lastNotification) < 120) {
session()->flash('error', (string) trans('firefly.test_rate_limited'));
@@ -150,7 +150,7 @@ final class NotificationController extends Controller
event(new OwnerTestsNotificationChannel($channel, $owner));
session()->flash('success', (string) trans('firefly.notification_test_executed', ['channel' => $channel]));
}
FireflyConfig::set('last_test_notification', time());
AppConfiguration::set('last_test_notification', time());
return redirect(route('settings.notification.index'));
}
app/Http/Controllers/Admin/UpdateController.php
+6 -6
View File
@@ -27,7 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Helpers\Update\UpdateTrait;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -64,8 +64,8 @@ final class UpdateController extends Controller
{
$subTitle = (string) trans('firefly.update_check_title');
$subTitleIcon = 'fa-star';
$permission = FireflyConfig::get('permission_update_check', -1);
$channel = FireflyConfig::get('update_channel', 'stable');
$permission = AppConfiguration::get('permission_update_check', -1);
$channel = AppConfiguration::get('update_channel', 'stable');
$selected = $permission->data;
$channelSelected = $channel->data;
$options = [
@@ -99,9 +99,9 @@ final class UpdateController extends Controller
$channel = $request->get('update_channel');
$channel = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable';
FireflyConfig::set('permission_update_check', $checkForUpdates);
FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp());
FireflyConfig::set('update_channel', $channel);
AppConfiguration::set('permission_update_check', $checkForUpdates);
AppConfiguration::set('last_update_check', Carbon::now()->getTimestamp());
AppConfiguration::set('update_channel', $channel);
session()->flash('success', (string) trans('firefly.configuration_updated'));
return redirect(route('settings.update-check'));
app/Http/Controllers/Admin/UserController.php
+2 -2
View File
@@ -31,7 +31,7 @@ use FireflyIII\Http\Requests\InviteUserFormRequest;
use FireflyIII\Http\Requests\UserFormRequest;
use FireflyIII\Models\InvitedUser;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
@@ -167,7 +167,7 @@ final class UserController extends Controller
$subTitle = (string) trans('firefly.user_administration');
$subTitleIcon = 'fa-users';
$users = $this->repository->all();
$singleUserMode = (bool) FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$singleUserMode = (bool) AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$allowInvites = false;
if (!$this->externalIdentity && $singleUserMode) {
// also registration enabled.
app/Http/Controllers/Auth/ForgotPasswordController.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
@@ -122,7 +122,7 @@ final class ForgotPasswordController extends Controller
}
// is allowed to?
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();
$allowRegistration = true;
$pageTitle = (string) trans('firefly.forgot_pw_page_title');
app/Http/Controllers/Auth/LoginController.php
+2 -2
View File
@@ -30,7 +30,7 @@ use FireflyIII\Events\Security\User\UserSuccessfullyLoggedIn;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Providers\RouteServiceProvider;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
@@ -199,7 +199,7 @@ final class LoginController extends Controller
}
// is allowed to register, etc.
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$allowRegistration = true;
$allowReset = true;
if (true === $singleUserMode && $count > 0) {
app/Http/Controllers/Auth/RegisterController.php
+4 -4
View File
@@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Http\Controllers\CreateStuff;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
@@ -113,7 +113,7 @@ final class RegisterController extends Controller
*/
public function showInviteForm(Request $request, string $code): Factory|\Illuminate\Contracts\View\View
{
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$isDemoSite = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$pageTitle = (string) trans('firefly.register_page_title');
$repository = app(UserRepositoryInterface::class);
$allowRegistration = $this->allowedToRegister();
@@ -147,7 +147,7 @@ final class RegisterController extends Controller
*/
public function showRegistrationForm(?Request $request = null): Factory|\Illuminate\Contracts\View\View
{
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$isDemoSite = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$pageTitle = (string) trans('firefly.register_page_title');
$allowRegistration = $this->allowedToRegister();
@@ -171,7 +171,7 @@ final class RegisterController extends Controller
$allowRegistration = true;
try {
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
} catch (ContainerExceptionInterface|NotFoundExceptionInterface) {
$singleUserMode = true;
}
app/Http/Controllers/Auth/ResetPasswordController.php
+2 -2
View File
@@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Foundation\Auth\ResetsPasswords;
@@ -124,7 +124,7 @@ final class ResetPasswordController extends Controller
}
// is allowed to register?
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();
$allowRegistration = true;
$pageTitle = (string) trans('firefly.reset_pw_page_title');
app/Http/Controllers/Controller.php
+3 -3
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\Support\Http\Controllers\RequestInformation;
@@ -72,7 +72,7 @@ abstract class Controller extends BaseController
public function __construct()
{
// is site a demo site?
$isDemoSiteConfig = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site', false));
$isDemoSiteConfig = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site', false));
$isDemoSite = (bool) $isDemoSiteConfig->data;
View::share('IS_DEMO_SITE', $isDemoSite);
View::share('DEMO_USERNAME', config('firefly.demo_username'));
@@ -91,7 +91,7 @@ abstract class Controller extends BaseController
// is webhooks enabled?
View::share(
'featuringWebhooks',
true === config('firefly.feature_flags.webhooks') && true === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data
true === config('firefly.feature_flags.webhooks') && true === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data
);
// share custom auth guard info.
app/Http/Controllers/DebugController.php
+3 -3
View File
@@ -34,7 +34,7 @@ use FireflyIII\Models\PeriodStatistic;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\Support\Http\Controllers\GetConfigurationData;
@@ -118,7 +118,7 @@ final class DebugController extends Controller
// also do some recalculations.
Artisan::call('correction:recalculates-liabilities');
if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
AccountBalanceCalculator::recalculateAll(false);
}
@@ -292,7 +292,7 @@ final class DebugController extends Controller
{
$userGuard = config('auth.defaults.guard');
$config = FireflyConfig::get('last_rt_job', 0);
$config = AppConfiguration::get('last_rt_job', 0);
$lastTime = (int) $config->data;
$lastCronjob = 'never';
$lastCronjobAgo = 'never';
app/Http/Controllers/ExchangeRates/IndexController.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\ExchangeRates;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\View\View;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -46,7 +46,7 @@ final class IndexController extends Controller
return $next($request);
});
if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) {
if (false === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data) {
throw new NotFoundHttpException();
}
}
app/Http/Controllers/Profile/OAuthController.php
+3 -3
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Profile;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\Validation\Factory as ValidationFactory;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
@@ -167,7 +167,7 @@ final class OAuthController extends Controller
public function storeClient(Request $request): JsonResponse
{
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$this->validation->make($request->only(['name', 'redirect_uris', 'confidential']), [
'name' => ['required', 'string', 'max:255'],
'redirect_uris' => ['required', sprintf('url:%s', $validProtocols)],
@@ -199,7 +199,7 @@ final class OAuthController extends Controller
public function updateClient(Request $request, string $clientId): Client|Response
{
$client = auth()->user()->oauthApps()->where('revoked', false)->find($clientId);
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
if (null === $client) {
return new Response('', 404);
}
app/Http/Controllers/System/InstallController.php
+3 -3
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Http\Controllers\System;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\Support\Http\Controllers\GetConfigurationData;
use Illuminate\Contracts\View\Factory;
@@ -76,8 +76,8 @@ final class InstallController extends Controller
app('view')->share('FF_VERSION', config('firefly.version'));
// index will set FF3 version.
FireflyConfig::set('ff3_version', (string) config('firefly.version'));
FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time'));
AppConfiguration::set('ff3_version', (string) config('firefly.version'));
AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time'));
return view('install.index');
}
app/Http/Controllers/Transaction/CreateController.php
+2 -2
View File
@@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
use FireflyIII\Services\Internal\Update\GroupCloneService;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
@@ -136,7 +136,7 @@ final class CreateController extends Controller
$optionalFields['external_url'] ??= false;
$optionalFields['location'] ??= false;
$optionalFields['location'] = $optionalFields['location']
&& true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
&& true === AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;
// map info:
$longitude = config('firefly.default_location.longitude');
app/Http/Controllers/Transaction/EditController.php
+2 -2
View File
@@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
@@ -116,7 +116,7 @@ final class EditController extends Controller
$optionalFields['external_url'] ??= false;
$optionalFields['location'] ??= false;
$optionalFields['location'] = true === $optionalFields['location']
&& true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
&& true === AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;
// map info voor v2:
$longitude = config('firefly.default_location.longitude');
app/Http/Controllers/Webhooks/CreateController.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
@@ -58,7 +58,7 @@ final class CreateController extends Controller
*/
public function index(): Factory|\Illuminate\Contracts\View\View
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
Log::channel('audit')->warning('User visits webhook create page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');
app/Http/Controllers/Webhooks/DeleteController.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Webhook;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Log;
@@ -57,7 +57,7 @@ final class DeleteController extends Controller
public function index(Webhook $webhook): Factory|View
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
Log::channel('audit')->warning('User visits webhook delete page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');
app/Http/Controllers/Webhooks/EditController.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Webhook;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Log;
@@ -56,7 +56,7 @@ final class EditController extends Controller
public function index(Webhook $webhook): Factory|View
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
Log::channel('audit')->warning('User visits webhook edit page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');
app/Http/Controllers/Webhooks/IndexController.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
@@ -54,7 +54,7 @@ final class IndexController extends Controller
*/
public function index(): Factory|\Illuminate\Contracts\View\View
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
Log::channel('audit')->warning('User visits webhook index page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');
app/Http/Controllers/Webhooks/ShowController.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Webhook;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Log;
@@ -56,7 +56,7 @@ final class ShowController extends Controller
public function index(Webhook $webhook): Factory|View
{
if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
Log::channel('audit')->warning(sprintf('User visits webhook #%d page, but webhooks are DISABLED.', $webhook->id));
throw new NotFoundHttpException('Webhooks are not enabled.');
app/Http/Middleware/Range.php
+4 -4
View File
@@ -27,7 +27,7 @@ use Carbon\Carbon;
use Closure;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Navigation;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\Support\Facades\Steam;
@@ -73,9 +73,9 @@ class Range
app('view')->share('listLength', $pref);
// share security message:
if (FireflyConfig::has('upgrade_security_message') && FireflyConfig::has('upgrade_security_level')) {
app('view')->share('upgrade_security_message', FireflyConfig::get('upgrade_security_message')->data);
app('view')->share('upgrade_security_level', FireflyConfig::get('upgrade_security_level')->data);
if (AppConfiguration::hasSetting('upgrade_security_message') && AppConfiguration::hasSetting('upgrade_security_level')) {
app('view')->share('upgrade_security_message', AppConfiguration::get('upgrade_security_message')->data);
app('view')->share('upgrade_security_level', AppConfiguration::get('upgrade_security_level')->data);
}
}
app/Http/Requests/NotificationRequest.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Rules\Admin\IsValidSlackOrDiscordUrl;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
@@ -66,7 +66,7 @@ class NotificationRequest extends FormRequest
*/
public function rules(): array
{
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$rules = [
'slack_webhook_url' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1', new IsValidSlackOrDiscordUrl()],
'ntfy_server' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1'],
app/Http/Requests/PreferencesRequest.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Rules\Admin\IsValidSlackOrDiscordUrl;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Request\ChecksLogin;
use Illuminate\Foundation\Http\FormRequest;
@@ -40,7 +40,7 @@ class PreferencesRequest extends FormRequest
*/
public function rules(): array
{
$validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
$rules = [
'slack_webhook_url' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1', new IsValidSlackOrDiscordUrl()],
'ntfy_server' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1'],
app/Jobs/DownloadExchangeRates.php
+22 -21
View File
@@ -41,6 +41,7 @@ use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Safe\Exceptions\JsonException;
use function Safe\json_decode;
/**
@@ -53,10 +54,10 @@ class DownloadExchangeRates implements ShouldQueue
use Queueable;
use SerializesModels;
private array $active = [];
private Carbon $date;
private array $active = [];
private Carbon $date;
private CurrencyRepositoryInterface $repository;
private Collection $users;
private Collection $users;
/**
* Create a new job instance.
@@ -67,11 +68,11 @@ class DownloadExchangeRates implements ShouldQueue
// get all users:
/** @var UserRepositoryInterface $userRepository */
$userRepository = app(UserRepositoryInterface::class);
$this->users = $userRepository->all();
$userRepository = app(UserRepositoryInterface::class);
$this->users = $userRepository->all();
if ($date instanceof Carbon) {
$newDate = clone $date;
$newDate = clone $date;
$newDate->startOfDay();
$this->date = $newDate;
Log::debug(sprintf('Created new DownloadExchangeRates("%s")', $this->date->format('Y-m-d')));
@@ -94,7 +95,7 @@ class DownloadExchangeRates implements ShouldQueue
public function setDate(Carbon $date): void
{
$newDate = clone $date;
$newDate = clone $date;
$newDate->startOfDay();
$this->date = $newDate;
}
@@ -106,13 +107,13 @@ class DownloadExchangeRates implements ShouldQueue
private function downloadRates(TransactionCurrency $currency): void
{
Log::debug(sprintf('Now downloading new exchange rates for currency %s.', $currency->code));
$base = sprintf('%s/%s/%s', (string)config('cer.url'), $this->date->year, $this->date->isoWeek);
$client = new Client();
$url = sprintf('%s/%s.json', $base, $currency->code);
$base = sprintf('%s/%s/%s', (string) config('cer.url'), $this->date->year, $this->date->isoWeek);
$client = new Client();
$url = sprintf('%s/%s.json', $base, $currency->code);
try {
$res = $client->get($url);
} catch (ConnectException | RequestException $e) {
} catch (ConnectException|RequestException $e) {
Log::warning(sprintf('Trying to grab "%s" resulted in error "%s".', $url, $e->getMessage()));
return;
@@ -123,14 +124,14 @@ class DownloadExchangeRates implements ShouldQueue
return;
}
$body = (string)$res->getBody();
$json = json_decode($body, true);
$body = (string) $res->getBody();
$json = json_decode($body, true);
if (false === $json || null === $json) {
Log::warning(sprintf('Trying to grab "%s" resulted in bad JSON.', $url));
return;
}
$date = Carbon::createFromFormat('Y-m-d', $json['date'], config('app.timezone'));
$date = Carbon::createFromFormat('Y-m-d', $json['date'], config('app.timezone'));
if (!$date instanceof Carbon) {
return;
}
@@ -146,19 +147,19 @@ class DownloadExchangeRates implements ShouldQueue
return $this->active[$code];
}
// find it in the database.
$currency = $this->repository->findByCode($code);
$currency = $this->repository->findByCode($code);
if (!$currency instanceof TransactionCurrency) {
Log::debug(sprintf('Did not find currency %s.', $code));
$this->active[$code] = null;
return null;
}
// if (false === $currency->enabled) {
// Log::debug(sprintf('Currency %s is not enabled.', $code));
// $this->active[$code] = null;
//
// return null;
// }
// if (false === $currency->enabled) {
// Log::debug(sprintf('Currency %s is not enabled.', $code));
// $this->active[$code] = null;
//
// return null;
// }
Log::debug(sprintf('Currency %s is enabled.', $code));
$this->active[$code] = $currency;
app/Listeners/Model/TransactionGroup/ProcessesNewTransactionGroup.php
+2 -2
View File
@@ -28,7 +28,7 @@ use FireflyIII\Enums\WebhookTrigger;
use FireflyIII\Events\Model\TransactionGroup\CreatedSingleTransactionGroup;
use FireflyIII\Events\Model\TransactionGroup\UserRequestedBatchProcessing;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Log;
@@ -40,7 +40,7 @@ class ProcessesNewTransactionGroup implements ShouldQueue
{
Log::debug(sprintf('Running event handler for %s', get_class($event)));
$setting = FireflyConfig::get('enable_batch_processing', false)->data;
$setting = AppConfiguration::get('enable_batch_processing', false)->data;
if (true === $event->flags->batchSubmission && true === $setting) {
Log::debug('Will do nothing for event because it is part of a batch.');
app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php
+2 -2
View File
@@ -18,7 +18,7 @@ use FireflyIII\Models\TransactionJournalMeta;
use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Services\Internal\Support\CreditRecalculateService;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Models\AccountBalanceCalculator;
use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
use Illuminate\Support\Collection;
@@ -68,7 +68,7 @@ trait SupportsGroupProcessingTrait
protected function recalculateRunningBalance(TransactionGroupEventObjects $objects): void
{
Log::debug('Now in recalculateRunningBalance');
if (false === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
if (false === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
Log::debug('Running balance is disabled.');
return;
app/Listeners/Model/Webhook/SendsWebhookMessages.php
+2 -2
View File
@@ -27,7 +27,7 @@ namespace FireflyIII\Listeners\Model\Webhook;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Jobs\SendWebhookMessage;
use FireflyIII\Models\WebhookMessage;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Log;
@@ -36,7 +36,7 @@ class SendsWebhookMessages implements ShouldQueue
public function handle(WebhookMessagesRequestSending $event): void
{
Log::debug(sprintf('Now in %s for %s', __METHOD__, get_class($event)));
if (false === config('firefly.feature_flags.webhooks') || false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
if (false === config('firefly.feature_flags.webhooks') || false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
Log::debug('Webhook event handler is disabled, do not run sendWebhookMessages().');
return;
app/Listeners/Security/System/ChecksForNewVersion.php
+6 -6
View File
@@ -30,7 +30,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Update\UpdateTrait;
use FireflyIII\Models\Configuration;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Log;
use Psr\Container\ContainerExceptionInterface;
@@ -45,7 +45,7 @@ class ChecksForNewVersion implements ShouldQueue
Log::debug(sprintf('Now in %s', __METHOD__));
// should not check for updates:
$permission = FireflyConfig::get('permission_update_check', -1);
$permission = AppConfiguration::get('permission_update_check', -1);
$value = (int) $permission->data;
if (1 !== $value) {
Log::debug('Update check is not enabled.');
@@ -64,7 +64,7 @@ class ChecksForNewVersion implements ShouldQueue
}
/** @var Configuration $lastCheckTime */
$lastCheckTime = FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp());
$lastCheckTime = AppConfiguration::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));
@@ -97,7 +97,7 @@ class ChecksForNewVersion implements ShouldQueue
}
session()->flash($level, $message);
FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp());
AppConfiguration::set('last_update_check', Carbon::now()->getTimestamp());
}
/**
@@ -117,7 +117,7 @@ class ChecksForNewVersion implements ShouldQueue
}
/** @var Configuration $lastCheckTime */
$lastCheckTime = FireflyConfig::get('last_update_warning', Carbon::now()->getTimestamp());
$lastCheckTime = AppConfiguration::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));
@@ -133,6 +133,6 @@ class ChecksForNewVersion implements ShouldQueue
Log::debug('Have warned about a new version in four weeks!');
session()->flash('info', (string) trans('firefly.disabled_but_check'));
FireflyConfig::set('last_update_warning', Carbon::now()->getTimestamp());
AppConfiguration::set('last_update_warning', Carbon::now()->getTimestamp());
}
}
app/Listeners/Security/System/HandlesNewUserRegistration.php
+3 -3
View File
@@ -36,7 +36,7 @@ use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Notifications\NotificationSender;
use FireflyIII\Notifications\User\UserRegistration as UserRegistrationNotification;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Log;
@@ -112,7 +112,7 @@ class HandlesNewUserRegistration implements ShouldQueue
private function sendAdminRegistrationNotification(User $user, OwnerNotifiable $owner): void
{
$sendMail = (bool) FireflyConfig::get('notification_admin_new_reg', true)->data;
$sendMail = (bool) AppConfiguration::get('notification_admin_new_reg', true)->data;
if (!$sendMail) {
return;
}
@@ -121,7 +121,7 @@ class HandlesNewUserRegistration implements ShouldQueue
private function sendRegistrationMail(User $user): void
{
$sendMail = (bool) FireflyConfig::get('notification_user_new_reg', true)->data;
$sendMail = (bool) AppConfiguration::get('notification_user_new_reg', true)->data;
if (!$sendMail) {
return;
}
app/Listeners/Security/System/NotifiesAboutNewInvitation.php
+2 -2
View File
@@ -32,7 +32,7 @@ use FireflyIII\Models\InvitedUser;
use FireflyIII\Notifications\Admin\UserInvitation;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Notifications\NotificationSender;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
@@ -47,7 +47,7 @@ class NotifiesAboutNewInvitation implements ShouldQueue
private function sendInvitationNotification(InvitedUser $invitee): void
{
$sendMail = FireflyConfig::get('notification_invite_created', true)->data;
$sendMail = AppConfiguration::get('notification_invite_created', true)->data;
if (false === $sendMail) {
return;
}
app/Listeners/Security/System/NotifiesOwnerAboutNewVersion.php
+2 -2
View File
@@ -28,14 +28,14 @@ use FireflyIII\Events\Security\System\SystemFoundNewVersionOnline;
use FireflyIII\Notifications\Admin\VersionCheckResult;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Notifications\NotificationSender;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Contracts\Queue\ShouldQueue;
class NotifiesOwnerAboutNewVersion implements ShouldQueue
{
public function handle(SystemFoundNewVersionOnline $event): void
{
$sendMail = FireflyConfig::get('notification_new_version', true)->data;
$sendMail = AppConfiguration::get('notification_new_version', true)->data;
if (false === $sendMail) {
return;
}
app/Notifications/Admin/UnknownUserLoginAttempt.php
+2 -2
View File
@@ -26,7 +26,7 @@ namespace FireflyIII\Notifications\Admin;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Steam;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
@@ -119,7 +119,7 @@ class UnknownUserLoginAttempt extends Notification
public function via(OwnerNotifiable $notifiable): array
{
$channels = ReturnsAvailableChannels::returnChannels('owner');
$isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
$isDemoSite = AppConfiguration::get('is_demo_site', false)->data;
if (true === $isDemoSite) {
return array_diff($channels, ['mail']);
}
app/Notifications/Notifiables/OwnerNotifiable.php
+4 -4
View File
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\Notifiables;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
@@ -59,15 +59,15 @@ class OwnerNotifiable
public function routeNotificationForPushover(): PushoverReceiver
{
Log::debug('Return settings for routeNotificationForPushover');
$pushoverAppToken = (string) FireflyConfig::getEncrypted('pushover_app_token', '')->data;
$pushoverUserToken = (string) FireflyConfig::getEncrypted('pushover_user_token', '')->data;
$pushoverAppToken = (string) AppConfiguration::getEncrypted('pushover_app_token', '')->data;
$pushoverUserToken = (string) AppConfiguration::getEncrypted('pushover_user_token', '')->data;
return PushoverReceiver::withUserKey($pushoverUserToken)->withApplicationToken($pushoverAppToken);
}
public function routeNotificationForSlack(): string
{
$res = FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
$res = AppConfiguration::getEncrypted('slack_webhook_url', '')->data;
if (is_array($res)) {
$res = '';
}
app/Notifications/ReturnsAvailableChannels.php
+4 -4
View File
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Notifications;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\Support\Notifications\UrlValidator;
use FireflyIII\User;
@@ -53,7 +53,7 @@ class ReturnsAvailableChannels
{
$channels = ['mail'];
if (true === config('notifications.channels.slack.enabled', false)) {
$slackUrl = FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
$slackUrl = AppConfiguration::getEncrypted('slack_webhook_url', '')->data;
if (UrlValidator::isValidWebhookURL($slackUrl)) {
$channels[] = 'slack';
}
@@ -72,8 +72,8 @@ class ReturnsAvailableChannels
// pushover
if (true === config('notifications.channels.pushover.enabled', false)) {
$pushoverAppToken = (string) FireflyConfig::getEncrypted('pushover_app_token', '')->data;
$pushoverUserToken = (string) FireflyConfig::getEncrypted('pushover_user_token', '')->data;
$pushoverAppToken = (string) AppConfiguration::getEncrypted('pushover_app_token', '')->data;
$pushoverUserToken = (string) AppConfiguration::getEncrypted('pushover_user_token', '')->data;
if ('' === $pushoverAppToken || '' === $pushoverUserToken) {
Log::warning('[b] No Pushover token, channel is disabled.');
}
app/Notifications/ReturnsSettings.php
+6 -6
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Notifications;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\User;
use Illuminate\Support\Facades\Log;
@@ -54,11 +54,11 @@ class ReturnsSettings
Log::debug(sprintf('Auth is %s, user = "%s"', var_export($settings['ntfy_auth'], true), $settings['ntfy_user']));
}
if ('owner' === $type) {
$settings['ntfy_server'] = FireflyConfig::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
$settings['ntfy_topic'] = FireflyConfig::getEncrypted('ntfy_topic', '')->data;
$settings['ntfy_auth'] = FireflyConfig::get('ntfy_auth', false)->data;
$settings['ntfy_user'] = FireflyConfig::getEncrypted('ntfy_user', '')->data;
$settings['ntfy_pass'] = FireflyConfig::getEncrypted('ntfy_pass', '')->data;
$settings['ntfy_server'] = AppConfiguration::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
$settings['ntfy_topic'] = AppConfiguration::getEncrypted('ntfy_topic', '')->data;
$settings['ntfy_auth'] = AppConfiguration::get('ntfy_auth', false)->data;
$settings['ntfy_user'] = AppConfiguration::getEncrypted('ntfy_user', '')->data;
$settings['ntfy_pass'] = AppConfiguration::getEncrypted('ntfy_pass', '')->data;
Log::debug(sprintf('Auth is %s, user = "%s"', var_export($settings['ntfy_auth'], true), $settings['ntfy_user']));
}
app/Notifications/Security/UserFailedLoginAttempt.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\Security;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\User;
use Illuminate\Bus\Queueable;
@@ -114,7 +114,7 @@ class UserFailedLoginAttempt extends Notification
public function via(User $notifiable): array
{
$channels = ReturnsAvailableChannels::returnChannels('user', $notifiable);
$isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
$isDemoSite = AppConfiguration::get('is_demo_site', false)->data;
if (true === $isDemoSite) {
return array_diff($channels, ['mail']);
}
app/Notifications/Test/OwnerTestNotificationEmail.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\Test;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
@@ -64,7 +64,7 @@ class OwnerTestNotificationEmail extends Notification
*/
public function via(OwnerNotifiable $notifiable): array
{
$isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
$isDemoSite = AppConfiguration::get('is_demo_site', false)->data;
if (true === $isDemoSite) {
return [];
}
app/Notifications/Test/UserTestNotificationEmail.php
+2 -2
View File
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\Test;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\User;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
@@ -61,7 +61,7 @@ class UserTestNotificationEmail extends Notification
*/
public function via(User $notifiable): array
{
$isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
$isDemoSite = AppConfiguration::get('is_demo_site', false)->data;
if (true === $isDemoSite) {
return [];
}
app/Notifications/User/NewAccessToken.php
+2 -2
View File
@@ -25,7 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\User;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\User;
use Illuminate\Bus\Queueable;
@@ -92,7 +92,7 @@ class NewAccessToken extends Notification
public function via(User $notifiable): array
{
$channels = ReturnsAvailableChannels::returnChannels('user', $notifiable);
$isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
$isDemoSite = AppConfiguration::get('is_demo_site', false)->data;
if (true === $isDemoSite) {
return array_diff($channels, ['mail']);
}
app/Providers/FireflyServiceProvider.php
+2 -2
View File
@@ -62,7 +62,7 @@ use FireflyIII\Services\Webhook\WebhookSenderInterface;
use FireflyIII\Support\Amount;
use FireflyIII\Support\Balance;
use FireflyIII\Support\ExpandedForm;
use FireflyIII\Support\FireflyConfig;
use FireflyIII\Support\AppConfiguration;
use FireflyIII\Support\Form\AccountForm;
use FireflyIII\Support\Form\CurrencyForm;
use FireflyIII\Support\Form\PiggyBankForm;
@@ -106,7 +106,7 @@ class FireflyServiceProvider extends ServiceProvider
{
$this->app->bind('preferences', static fn (): Preferences => new Preferences());
$this->app->bind('fireflyconfig', static fn (): FireflyConfig => new FireflyConfig());
$this->app->bind('appconfiguration', static fn (): AppConfiguration => new AppConfiguration());
$this->app->bind('navigation', static fn (): Navigation => new Navigation());
$this->app->bind('amount', static fn (): Amount => new Amount());
app/Repositories/Account/AccountRepository.php
+7 -14
View File
@@ -114,8 +114,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
public function findByAccountNumber(string $number, array $types): ?Account
{
$dbQuery = $this->user
->accounts()
$dbQuery = $this->user->accounts()
->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
->where('accounts.active', true)
->where(static function (EloquentBuilder $q1) use ($number): void {
@@ -251,8 +250,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
public function getActiveAccountsByType(array $types): Collection
{
$query = $this->user
->accounts()
$query = $this->user->accounts()
->with([
'accountmeta' => static function (HasMany $query): void {
$query->where('name', 'account_role');
@@ -315,8 +313,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
public function getInactiveAccountsByType(array $types): Collection
{
$query = $this->user
->accounts()
$query = $this->user->accounts()
->with(['accountmeta' => static function (HasMany $query): void {
$query->where('name', 'account_role');
}])
@@ -630,8 +627,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
AccountTypeEnum::CREDITCARD->value,
AccountTypeEnum::MORTGAGE->value,
];
$this->user
->accounts()
$this->user->accounts()
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->whereNotIn('account_types.type', $all)
->update(['order' => 0])
@@ -640,8 +636,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
public function searchAccount(string $query, array $types, int $limit): Collection
{
$dbQuery = $this->user
->accounts()
$dbQuery = $this->user->accounts()
->where('active', true)
->orderBy('accounts.order', 'ASC')
->orderBy('accounts.account_type_id', 'ASC')
@@ -666,8 +661,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
public function searchAccountIncludingInactive(string $query, array $types, int $limit): Collection
{
$dbQuery = $this->user
->accounts()
$dbQuery = $this->user->accounts()
->orderBy('accounts.order', 'ASC')
->orderBy('accounts.account_type_id', 'ASC')
->orderBy('accounts.name', 'ASC')
@@ -691,8 +685,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
public function searchAccountNr(string $query, array $types, int $limit): Collection
{
$dbQuery = $this->user
->accounts()
$dbQuery = $this->user->accounts()
->distinct()
->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
->where('accounts.active', true)
app/Repositories/Bill/BillRepository.php
+6 -12
View File
@@ -170,8 +170,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
public function getActiveBills(): Collection
{
return $this->user
->bills()
return $this->user->bills()
->where('active', true)
->orderBy('bills.name', 'ASC')
->get(['bills.*', DB::raw('((bills.amount_min + bills.amount_max) / 2) AS expectedAmount')])
@@ -197,8 +196,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
public function getBills(): Collection
{
return $this->user
->bills()
return $this->user->bills()
->orderBy('order', 'ASC')
->orderBy('active', 'DESC')
->orderBy('name', 'ASC')
@@ -226,8 +224,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
];
$ids = $accounts->pluck('id')->toArray();
return $this->user
->bills()
return $this->user->bills()
->leftJoin('transaction_journals', static function (JoinClause $join): void {
$join->on('transaction_journals.bill_id', '=', 'bills.id')->whereNull('transaction_journals.deleted_at');
})
@@ -383,8 +380,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
*/
public function getRulesForBill(Bill $bill): Collection
{
return $this->user
->rules()
return $this->user->rules()
->leftJoin('rule_actions', 'rule_actions.rule_id', '=', 'rules.id')
->where('rule_actions.action_type', 'link_to_bill')
->where('rule_actions.action_value', $bill->name)
@@ -400,8 +396,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
*/
public function getRulesForBills(Collection $collection): array
{
$rules = $this->user
->rules()
$rules = $this->user->rules()
->leftJoin('rule_actions', 'rule_actions.rule_id', '=', 'rules.id')
->where('rule_actions.action_type', 'link_to_bill')
->get(['rules.id', 'rules.title', 'rule_actions.action_value', 'rules.active'])
@@ -569,8 +564,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
{
$query = sprintf('%%%s%%', $query);
return $this->user
->bills()
return $this->user->bills()
->orderBy('name', 'ASC')
->whereLike('name', $query)
->take($limit)
app/Repositories/Budget/AvailableBudgetRepository.php
+5 -10
View File
@@ -102,8 +102,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
public function find(TransactionCurrency $currency, Carbon $start, Carbon $end): ?AvailableBudget
{
/** @var null|AvailableBudget */
return $this->user
->availableBudgets()
return $this->user->availableBudgets()
->where('transaction_currency_id', $currency->id)
->where('start_date', $start->format('Y-m-d'))
->where('end_date', $end->format('Y-m-d'))
@@ -121,8 +120,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
public function findInRange(TransactionCurrency $currency, Carbon $start, Carbon $end): Collection
{
/** @var Collection */
return $this->user
->availableBudgets()
return $this->user->availableBudgets()
->where('transaction_currency_id', $currency->id)
// start date OR end date must be the same or equal to start or END respectively.
->where(function ($q1) use ($start, $end): void {
@@ -157,8 +155,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
$amount = '0';
/** @var null|AvailableBudget $availableBudget */
$availableBudget = $this->user
->availableBudgets()
$availableBudget = $this->user->availableBudgets()
->where('transaction_currency_id', $currency->id)
->where('start_date', $start->format('Y-m-d'))
->where('end_date', $end->format('Y-m-d'))
@@ -234,8 +231,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
public function getByCurrencyDate(Carbon $start, Carbon $end, TransactionCurrency $currency): ?AvailableBudget
{
/** @var null|AvailableBudget */
return $this->user
->availableBudgets()
return $this->user->availableBudgets()
->where('transaction_currency_id', $currency->id)
->where('start_date', $start->format('Y-m-d'))
->where('end_date', $end->format('Y-m-d'))
@@ -279,8 +275,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget
{
/** @var null|AvailableBudget $availableBudget */
$availableBudget = $this->user
->availableBudgets()
$availableBudget = $this->user->availableBudgets()
->where('transaction_currency_id', $currency->id)
->where('start_date', $start->format('Y-m-d'))
->where('end_date', $end->format('Y-m-d'))
app/Repositories/Budget/BudgetRepository.php
+2 -4
View File
@@ -330,8 +330,7 @@ class BudgetRepository implements BudgetRepositoryInterface, UserGroupInterface
public function getActiveBudgets(): Collection
{
return $this->user
->budgets()
return $this->user->budgets()
->where('active', true)
->orderBy('order', 'ASC')
->orderBy('name', 'ASC')
@@ -379,8 +378,7 @@ class BudgetRepository implements BudgetRepositoryInterface, UserGroupInterface
public function getInactiveBudgets(): Collection
{
return $this->user
->budgets()
return $this->user->budgets()
->orderBy('order', 'ASC')
->orderBy('name', 'ASC')
->where('active', 0)

Some files were not shown because too many files have changed in this diff Show More