From 48a0eafa0c54547ef078ee01e6b924d0e6fd0ce2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Dec 2019 06:58:49 +0100 Subject: [PATCH] Refer to new command in scripts. #2691 --- .deploy/docker/entrypoint.sh | 1 + app/Console/Commands/Correction/CorrectDatabase.php | 1 + app/Console/Commands/Correction/FixRecurringTransactions.php | 2 +- app/Console/Commands/Upgrade/UpgradeDatabase.php | 3 ++- app/Http/Controllers/System/InstallController.php | 5 +++-- composer.json | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.deploy/docker/entrypoint.sh b/.deploy/docker/entrypoint.sh index e444824b93..b58adec2b9 100755 --- a/.deploy/docker/entrypoint.sh +++ b/.deploy/docker/entrypoint.sh @@ -112,6 +112,7 @@ if [[ $DKR_RUN_VERIFY != "false" ]]; then php artisan firefly-iii:rename-meta-fields php artisan firefly-iii:fix-ob-currencies php artisan firefly-iii:fix-long-descriptions + php artisan firefly-iii:fix-recurring-transactions fi # report commands diff --git a/app/Console/Commands/Correction/CorrectDatabase.php b/app/Console/Commands/Correction/CorrectDatabase.php index 85a36b9e47..7c456464f8 100644 --- a/app/Console/Commands/Correction/CorrectDatabase.php +++ b/app/Console/Commands/Correction/CorrectDatabase.php @@ -72,6 +72,7 @@ class CorrectDatabase extends Command 'firefly-iii:rename-meta-fields', 'firefly-iii:fix-ob-currencies', 'firefly-iii:fix-long-descriptions', + 'firefly-iii:fix-recurring-transactions', 'firefly-iii:restore-oauth-keys' ]; foreach ($commands as $command) { diff --git a/app/Console/Commands/Correction/FixRecurringTransactions.php b/app/Console/Commands/Correction/FixRecurringTransactions.php index 0461d07839..336f7ddfef 100644 --- a/app/Console/Commands/Correction/FixRecurringTransactions.php +++ b/app/Console/Commands/Correction/FixRecurringTransactions.php @@ -80,7 +80,7 @@ class FixRecurringTransactions extends Command } /** - * + * */ private function correctTransactions(): void { diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php index 4af05bd266..9aa7550355 100644 --- a/app/Console/Commands/Upgrade/UpgradeDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php @@ -74,7 +74,7 @@ class UpgradeDatabase extends Command 'firefly-iii:rename-account-meta', 'firefly-iii:migrate-recurrence-meta', - // there are 15 verify commands. + // there are 16 verify commands. 'firefly-iii:fix-piggies', 'firefly-iii:create-link-types', 'firefly-iii:create-access-tokens', @@ -90,6 +90,7 @@ class UpgradeDatabase extends Command 'firefly-iii:rename-meta-fields', 'firefly-iii:fix-ob-currencies', 'firefly-iii:fix-long-descriptions', + 'firefly-iii:fix-recurring-transactions', // two report commands 'firefly-iii:report-empty-objects', diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 0fde6ac8ec..e4681576d7 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -86,7 +86,7 @@ class InstallController extends Controller 'firefly-iii:rename-account-meta' => [], 'firefly-iii:migrate-recurrence-meta' => [], - // there are 15 verify commands. + // there are 16 verify commands. 'firefly-iii:fix-piggies' => [], 'firefly-iii:create-link-types' => [], 'firefly-iii:create-access-tokens' => [], @@ -102,9 +102,10 @@ class InstallController extends Controller 'firefly-iii:rename-meta-fields' => [], 'firefly-iii:fix-ob-currencies' => [], 'firefly-iii:fix-long-descriptions' => [], + 'firefly-iii:fix-recurring-transactions' => [], // final command to set latest version in DB - 'firefly-iii:set-latest-version' => ['--james-is-cool' => true], + 'firefly-iii:set-latest-version' => ['--james-is-cool' => true], ]; } diff --git a/composer.json b/composer.json index 7e009ef0cf..8712ee5002 100644 --- a/composer.json +++ b/composer.json @@ -166,6 +166,7 @@ "@php artisan firefly-iii:rename-meta-fields", "@php artisan firefly-iii:fix-ob-currencies", "@php artisan firefly-iii:fix-long-descriptions", + "@php artisan firefly-iii:fix-recurring-transactions", "@php artisan firefly-iii:report-empty-objects", "@php artisan firefly-iii:report-sum",