IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source 
# Conflicts:
#	app/Console/Commands/Upgrade/CorrectAccountBalance.php
This commit is contained in:
James Cole 2024-05-26 15:37:20 +02:00
commit c987191212
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
5 changed files with 524 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.ci/php-cs-fixer/composer.lock generated
View File

@ -950,16 +950,16 @@
}, },
{ {
"name": "react/promise", "name": "react/promise",
"version": "v3.1.0", "version": "v3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/reactphp/promise.git", "url": "https://github.com/reactphp/promise.git",
"reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c" "reference": "8a164643313c71354582dc850b42b33fa12a4b63"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
"reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", "reference": "8a164643313c71354582dc850b42b33fa12a4b63",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1011,7 +1011,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/reactphp/promise/issues", "issues": "https://github.com/reactphp/promise/issues",
"source": "https://github.com/reactphp/promise/tree/v3.1.0" "source": "https://github.com/reactphp/promise/tree/v3.2.0"
}, },
"funding": [ "funding": [
{ {
@ -1019,7 +1019,7 @@
"type": "open_collective" "type": "open_collective"
} }
], ],
"time": "2023-11-16T16:21:57+00:00" "time": "2024-05-24T10:39:05+00:00"
}, },
{ {
"name": "react/socket", "name": "react/socket",

6
app/Console/Commands/Upgrade/CorrectAccountBalance.php
View File

@ -34,9 +34,8 @@ class CorrectAccountBalance extends Command
{ {
use ShowsFriendlyMessages; use ShowsFriendlyMessages;
public const string CONFIG_NAME = '610_correct_balances'; public const string CONFIG_NAME = '610_correct_balances';
protected $description = 'Recalculate all account balance amounts'; protected $description = 'Recalculate all account balance amounts';
protected $signature = 'firefly-iii:correct-account-balance {--F|force : Force the execution of this command.}';
protected $signature = 'firefly-iii:correct-account-balance {--F|force : Force the execution of this command.}';
public function handle(): int public function handle(): int
{ {
@ -55,6 +54,7 @@ class CorrectAccountBalance extends Command
{ {
AccountBalanceCalculator::recalculateAll(); AccountBalanceCalculator::recalculateAll();
} }
private function isExecuted(): bool private function isExecuted(): bool
{ {
$configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);

51
composer.lock generated
View File

@ -3202,40 +3202,39 @@
}, },
{ {
"name": "league/csv", "name": "league/csv",
"version": "9.15.0", "version": "9.16.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/csv.git", "url": "https://github.com/thephpleague/csv.git",
"reference": "fa7e2441c0bc9b2360f4314fd6c954f7ff40d435" "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/csv/zipball/fa7e2441c0bc9b2360f4314fd6c954f7ff40d435", "url": "https://api.github.com/repos/thephpleague/csv/zipball/998280c6c34bd67d8125fdc8b45bae28d761b440",
"reference": "fa7e2441c0bc9b2360f4314fd6c954f7ff40d435", "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-filter": "*", "ext-filter": "*",
"ext-json": "*",
"ext-mbstring": "*",
"php": "^8.1.2" "php": "^8.1.2"
}, },
"require-dev": { "require-dev": {
"doctrine/collections": "^2.1.4", "doctrine/collections": "^2.2.2",
"ext-dom": "*", "ext-dom": "*",
"ext-xdebug": "*", "ext-xdebug": "*",
"friendsofphp/php-cs-fixer": "^v3.22.0", "friendsofphp/php-cs-fixer": "^3.57.1",
"phpbench/phpbench": "^1.2.15", "phpbench/phpbench": "^1.2.15",
"phpstan/phpstan": "^1.10.57", "phpstan/phpstan": "^1.11.1",
"phpstan/phpstan-deprecation-rules": "^1.1.4", "phpstan/phpstan-deprecation-rules": "^1.2.0",
"phpstan/phpstan-phpunit": "^1.3.15", "phpstan/phpstan-phpunit": "^1.4.0",
"phpstan/phpstan-strict-rules": "^1.5.2", "phpstan/phpstan-strict-rules": "^1.6.0",
"phpunit/phpunit": "^10.5.9", "phpunit/phpunit": "^10.5.16 || ^11.1.3",
"symfony/var-dumper": "^6.4.2" "symfony/var-dumper": "^6.4.6 || ^7.0.7"
}, },
"suggest": { "suggest": {
"ext-dom": "Required to use the XMLConverter and the HTMLConverter classes", "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
"ext-iconv": "Needed to ease transcoding CSV using iconv stream filters" "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters",
"ext-mbstring": "Needed to ease transcoding CSV using mb stream filters"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -3287,7 +3286,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-02-20T20:00:00+00:00" "time": "2024-05-24T11:04:54+00:00"
}, },
{ {
"name": "league/event", "name": "league/event",
@ -3966,16 +3965,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "3.3.1", "version": "3.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "8ff64b92c1b1ec84fcde9f8bb9ff2ca34cb8a77a" "reference": "8eab8983c83c30e0bacbef8d311e3f3b8172727f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8ff64b92c1b1ec84fcde9f8bb9ff2ca34cb8a77a", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8eab8983c83c30e0bacbef8d311e3f3b8172727f",
"reference": "8ff64b92c1b1ec84fcde9f8bb9ff2ca34cb8a77a", "reference": "8eab8983c83c30e0bacbef8d311e3f3b8172727f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4068,7 +4067,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-05-01T06:54:22+00:00" "time": "2024-05-24T14:26:34+00:00"
}, },
{ {
"name": "nette/schema", "name": "nette/schema",
@ -11014,16 +11013,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.11.1", "version": "1.11.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b" "reference": "0d5d4294a70deb7547db655c47685d680e39cfec"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e524358f930e41a2b4cca1320e3b04fc26b39e0b", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d5d4294a70deb7547db655c47685d680e39cfec",
"reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b", "reference": "0d5d4294a70deb7547db655c47685d680e39cfec",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11068,7 +11067,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-05-15T08:00:59+00:00" "time": "2024-05-24T13:23:04+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",

2
config/firefly.php
View File

@ -117,7 +117,7 @@ return [
'expression_engine' => false, 'expression_engine' => false,
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2024-05-23', 'version' => 'develop/2024-05-25',
'api_version' => '2.1.0', 'api_version' => '2.1.0',
'db_version' => 24, 'db_version' => 24,

978
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff