From 4b96558433d0b724169d3b99177cf93683af584f Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 31 Jul 2020 12:12:54 +0200 Subject: [PATCH] Do some code cleanup and call correct phpunit. --- .github/workflows/laravel.yml | 4 ++-- app/Console/Commands/Correction/CorrectDatabase.php | 3 ++- .../Commands/Correction/CorrectOpeningBalanceCurrencies.php | 1 + app/Console/Commands/Correction/CreateAccessTokens.php | 2 +- app/Console/Commands/Correction/CreateLinkTypes.php | 1 + app/Console/Commands/Correction/DeleteEmptyGroups.php | 1 + app/Console/Commands/Correction/DeleteEmptyJournals.php | 1 + .../Commands/Correction/DeleteOrphanedTransactions.php | 1 + app/Console/Commands/Correction/DeleteZeroAmount.php | 1 + app/Console/Commands/Correction/EnableCurrencies.php | 1 + app/Console/Commands/Correction/FixAccountOrder.php | 1 + app/Console/Commands/Correction/FixAccountTypes.php | 1 + app/Console/Commands/Correction/FixGroupAccounts.php | 1 + app/Console/Commands/Correction/FixLongDescriptions.php | 3 ++- app/Console/Commands/Correction/FixPiggies.php | 1 + app/Console/Commands/Correction/FixRecurringTransactions.php | 1 + app/Console/Commands/Correction/FixTransactionTypes.php | 1 + app/Console/Commands/Correction/FixUnevenAmount.php | 1 + app/Console/Commands/Correction/RemoveBills.php | 1 + app/Console/Commands/Correction/RenameMetaFields.php | 1 + app/Console/Commands/Correction/TransferBudgets.php | 1 + app/Console/Commands/CreateDatabase.php | 1 + app/Console/Commands/DecryptDatabase.php | 2 +- app/Console/Commands/Export/ExportData.php | 1 + app/Console/Commands/Integrity/ReportEmptyObjects.php | 1 + app/Console/Commands/Integrity/ReportIntegrity.php | 1 + app/Console/Commands/Integrity/ReportSum.php | 1 + app/Console/Commands/Integrity/RestoreOAuthKeys.php | 1 + app/Console/Commands/ScanAttachments.php | 1 + app/Console/Commands/SetLatestVersion.php | 1 + app/Console/Commands/Tools/ApplyRules.php | 1 + app/Console/Commands/Tools/Cron.php | 3 ++- app/Console/Commands/Upgrade/AccountCurrencies.php | 1 + app/Console/Commands/Upgrade/BackToJournals.php | 1 + app/Console/Commands/Upgrade/BudgetLimitCurrency.php | 1 + app/Console/Commands/Upgrade/CCLiabilities.php | 1 + app/Console/Commands/Upgrade/MigrateAttachments.php | 1 + app/Console/Commands/Upgrade/MigrateJournalNotes.php | 1 + app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php | 1 + app/Console/Commands/Upgrade/MigrateTagLocations.php | 1 + app/Console/Commands/Upgrade/MigrateToGroups.php | 2 +- app/Console/Commands/Upgrade/MigrateToRules.php | 1 + app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php | 2 +- app/Console/Commands/Upgrade/RenameAccountMeta.php | 1 + app/Console/Commands/Upgrade/TransactionIdentifier.php | 1 + .../Commands/Upgrade/TransferCurrenciesCorrections.php | 2 +- app/Console/Commands/Upgrade/UpgradeDatabase.php | 1 + app/Console/Commands/UpgradeFireflyInstructions.php | 3 ++- 48 files changed, 53 insertions(+), 11 deletions(-) diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index b8cbe64e92..404ed6aaa1 100644 --- a/.github/workflows/laravel.yml +++ b/.github/workflows/laravel.yml @@ -82,10 +82,10 @@ jobs: run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest - name: PHPUnit tests - uses: php-actions/phpunit@v9 + uses: php-actions/phpunit@v1 with: config: phpunit.xml - memory: 2048M + memory: 512M coding-standards: diff --git a/app/Console/Commands/Correction/CorrectDatabase.php b/app/Console/Commands/Correction/CorrectDatabase.php index 906d3beeb6..2cc972a861 100644 --- a/app/Console/Commands/Correction/CorrectDatabase.php +++ b/app/Console/Commands/Correction/CorrectDatabase.php @@ -48,6 +48,7 @@ class CorrectDatabase extends Command */ protected $signature = 'firefly-iii:correct-database'; + /** * Execute the console command. */ @@ -76,7 +77,7 @@ class CorrectDatabase extends Command 'firefly-iii:fix-long-descriptions', 'firefly-iii:fix-recurring-transactions', 'firefly-iii:restore-oauth-keys', - 'firefly-iii:fix-transaction-types' + 'firefly-iii:fix-transaction-types', ]; foreach ($commands as $command) { $this->line(sprintf('Now executing %s', $command)); diff --git a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php index 1063d47aa1..d0556c7080 100644 --- a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php +++ b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php @@ -52,6 +52,7 @@ class CorrectOpeningBalanceCurrencies extends Command */ protected $signature = 'firefly-iii:fix-ob-currencies'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/CreateAccessTokens.php b/app/Console/Commands/Correction/CreateAccessTokens.php index 9dd515c17a..7314645cf8 100644 --- a/app/Console/Commands/Correction/CreateAccessTokens.php +++ b/app/Console/Commands/Correction/CreateAccessTokens.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace FireflyIII\Console\Commands\Correction; use Exception; @@ -47,6 +46,7 @@ class CreateAccessTokens extends Command */ protected $signature = 'firefly-iii:create-access-tokens'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/CreateLinkTypes.php b/app/Console/Commands/Correction/CreateLinkTypes.php index 0bdf1d924d..6118c9920d 100644 --- a/app/Console/Commands/Correction/CreateLinkTypes.php +++ b/app/Console/Commands/Correction/CreateLinkTypes.php @@ -44,6 +44,7 @@ class CreateLinkTypes extends Command */ protected $signature = 'firefly-iii:create-link-types'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/DeleteEmptyGroups.php b/app/Console/Commands/Correction/DeleteEmptyGroups.php index 41e05013d3..f8c4d49c9f 100644 --- a/app/Console/Commands/Correction/DeleteEmptyGroups.php +++ b/app/Console/Commands/Correction/DeleteEmptyGroups.php @@ -46,6 +46,7 @@ class DeleteEmptyGroups extends Command */ protected $signature = 'firefly-iii:delete-empty-groups'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/DeleteEmptyJournals.php b/app/Console/Commands/Correction/DeleteEmptyJournals.php index 93d77eb81e..5cdef1cc89 100644 --- a/app/Console/Commands/Correction/DeleteEmptyJournals.php +++ b/app/Console/Commands/Correction/DeleteEmptyJournals.php @@ -48,6 +48,7 @@ class DeleteEmptyJournals extends Command */ protected $signature = 'firefly-iii:delete-empty-journals'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php index c95007b60f..8752694e12 100644 --- a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php +++ b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php @@ -48,6 +48,7 @@ class DeleteOrphanedTransactions extends Command */ protected $signature = 'firefly-iii:delete-orphaned-transactions'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/DeleteZeroAmount.php b/app/Console/Commands/Correction/DeleteZeroAmount.php index f96b426eee..e374905cac 100644 --- a/app/Console/Commands/Correction/DeleteZeroAmount.php +++ b/app/Console/Commands/Correction/DeleteZeroAmount.php @@ -47,6 +47,7 @@ class DeleteZeroAmount extends Command */ protected $signature = 'firefly-iii:delete-zero-amount'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/EnableCurrencies.php b/app/Console/Commands/Correction/EnableCurrencies.php index 502d1be977..076cacd868 100644 --- a/app/Console/Commands/Correction/EnableCurrencies.php +++ b/app/Console/Commands/Correction/EnableCurrencies.php @@ -49,6 +49,7 @@ class EnableCurrencies extends Command */ protected $signature = 'firefly-iii:enable-currencies'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixAccountOrder.php b/app/Console/Commands/Correction/FixAccountOrder.php index 9b93a6d6a8..cb3c56dc4d 100644 --- a/app/Console/Commands/Correction/FixAccountOrder.php +++ b/app/Console/Commands/Correction/FixAccountOrder.php @@ -49,6 +49,7 @@ class FixAccountOrder extends Command private AccountRepositoryInterface $repository; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixAccountTypes.php b/app/Console/Commands/Correction/FixAccountTypes.php index 2d9ac3aff0..dff350236b 100644 --- a/app/Console/Commands/Correction/FixAccountTypes.php +++ b/app/Console/Commands/Correction/FixAccountTypes.php @@ -58,6 +58,7 @@ class FixAccountTypes extends Command /** @var array */ private $fixable; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixGroupAccounts.php b/app/Console/Commands/Correction/FixGroupAccounts.php index 9d22b06522..eff6f7d5a1 100644 --- a/app/Console/Commands/Correction/FixGroupAccounts.php +++ b/app/Console/Commands/Correction/FixGroupAccounts.php @@ -49,6 +49,7 @@ class FixGroupAccounts extends Command */ protected $signature = 'firefly-iii:unify-group-accounts'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixLongDescriptions.php b/app/Console/Commands/Correction/FixLongDescriptions.php index 28ad7ea15f..e05e957ccc 100644 --- a/app/Console/Commands/Correction/FixLongDescriptions.php +++ b/app/Console/Commands/Correction/FixLongDescriptions.php @@ -47,6 +47,7 @@ class FixLongDescriptions extends Command */ protected $signature = 'firefly-iii:fix-long-descriptions'; + /** * Execute the console command. * @@ -68,7 +69,7 @@ class FixLongDescriptions extends Command $groups = TransactionGroup::get(['id', 'title']); /** @var TransactionGroup $group */ foreach ($groups as $group) { - if (strlen((string)$group->title) > self::MAX_LENGTH) { + if (strlen((string) $group->title) > self::MAX_LENGTH) { $group->title = substr($group->title, 0, self::MAX_LENGTH); $group->save(); $this->line(sprintf('Truncated description of transaction group #%d', $group->id)); diff --git a/app/Console/Commands/Correction/FixPiggies.php b/app/Console/Commands/Correction/FixPiggies.php index 14243e1aa2..8cca164de8 100644 --- a/app/Console/Commands/Correction/FixPiggies.php +++ b/app/Console/Commands/Correction/FixPiggies.php @@ -51,6 +51,7 @@ class FixPiggies extends Command /** @var int */ private $count; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixRecurringTransactions.php b/app/Console/Commands/Correction/FixRecurringTransactions.php index 6391a32d84..01b5f9cdb6 100644 --- a/app/Console/Commands/Correction/FixRecurringTransactions.php +++ b/app/Console/Commands/Correction/FixRecurringTransactions.php @@ -54,6 +54,7 @@ class FixRecurringTransactions extends Command /** @var UserRepositoryInterface */ private $userRepos; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixTransactionTypes.php b/app/Console/Commands/Correction/FixTransactionTypes.php index b927fbcdcb..de083aa82a 100644 --- a/app/Console/Commands/Correction/FixTransactionTypes.php +++ b/app/Console/Commands/Correction/FixTransactionTypes.php @@ -29,6 +29,7 @@ class FixTransactionTypes extends Command */ protected $signature = 'firefly-iii:fix-transaction-types'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixUnevenAmount.php b/app/Console/Commands/Correction/FixUnevenAmount.php index d545d2f11e..eac3982598 100644 --- a/app/Console/Commands/Correction/FixUnevenAmount.php +++ b/app/Console/Commands/Correction/FixUnevenAmount.php @@ -47,6 +47,7 @@ class FixUnevenAmount extends Command */ protected $signature = 'firefly-iii:fix-uneven-amount'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/RemoveBills.php b/app/Console/Commands/Correction/RemoveBills.php index d86b878933..fb85b507af 100644 --- a/app/Console/Commands/Correction/RemoveBills.php +++ b/app/Console/Commands/Correction/RemoveBills.php @@ -45,6 +45,7 @@ class RemoveBills extends Command */ protected $signature = 'firefly-iii:remove-bills'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/RenameMetaFields.php b/app/Console/Commands/Correction/RenameMetaFields.php index 0b1adad4f5..30ef3ad15e 100644 --- a/app/Console/Commands/Correction/RenameMetaFields.php +++ b/app/Console/Commands/Correction/RenameMetaFields.php @@ -47,6 +47,7 @@ class RenameMetaFields extends Command /** @var int */ private $count; + /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/TransferBudgets.php b/app/Console/Commands/Correction/TransferBudgets.php index 38b8a5684e..231454d514 100644 --- a/app/Console/Commands/Correction/TransferBudgets.php +++ b/app/Console/Commands/Correction/TransferBudgets.php @@ -45,6 +45,7 @@ class TransferBudgets extends Command */ protected $signature = 'firefly-iii:fix-transfer-budgets'; + /** * Execute the console command. * diff --git a/app/Console/Commands/CreateDatabase.php b/app/Console/Commands/CreateDatabase.php index 1c95d9d0e0..df1efce742 100644 --- a/app/Console/Commands/CreateDatabase.php +++ b/app/Console/Commands/CreateDatabase.php @@ -47,6 +47,7 @@ class CreateDatabase extends Command */ protected $signature = 'firefly-iii:create-database'; + /** * Execute the console command. * diff --git a/app/Console/Commands/DecryptDatabase.php b/app/Console/Commands/DecryptDatabase.php index 42d200fa94..5995e0cb99 100644 --- a/app/Console/Commands/DecryptDatabase.php +++ b/app/Console/Commands/DecryptDatabase.php @@ -34,7 +34,6 @@ use JsonException; use Log; /** - * * Class DecryptDatabase */ class DecryptDatabase extends Command @@ -52,6 +51,7 @@ class DecryptDatabase extends Command */ protected $signature = 'firefly-iii:decrypt-all'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index 590791e537..859a493443 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -81,6 +81,7 @@ class ExportData extends Command /** @var User */ private $user; + /** * Execute the console command. * diff --git a/app/Console/Commands/Integrity/ReportEmptyObjects.php b/app/Console/Commands/Integrity/ReportEmptyObjects.php index 4cca37288b..0e11400d30 100644 --- a/app/Console/Commands/Integrity/ReportEmptyObjects.php +++ b/app/Console/Commands/Integrity/ReportEmptyObjects.php @@ -48,6 +48,7 @@ class ReportEmptyObjects extends Command */ protected $signature = 'firefly-iii:report-empty-objects'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Integrity/ReportIntegrity.php b/app/Console/Commands/Integrity/ReportIntegrity.php index 62e45ed110..ed63e7c54b 100644 --- a/app/Console/Commands/Integrity/ReportIntegrity.php +++ b/app/Console/Commands/Integrity/ReportIntegrity.php @@ -49,6 +49,7 @@ class ReportIntegrity extends Command */ protected $signature = 'firefly-iii:report-integrity'; + /** * Execute the console command. */ diff --git a/app/Console/Commands/Integrity/ReportSum.php b/app/Console/Commands/Integrity/ReportSum.php index 2f24e1f00a..8b6f7f6cff 100644 --- a/app/Console/Commands/Integrity/ReportSum.php +++ b/app/Console/Commands/Integrity/ReportSum.php @@ -45,6 +45,7 @@ class ReportSum extends Command */ protected $signature = 'firefly-iii:report-sum'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Integrity/RestoreOAuthKeys.php b/app/Console/Commands/Integrity/RestoreOAuthKeys.php index 14655a5f58..1d2913c108 100644 --- a/app/Console/Commands/Integrity/RestoreOAuthKeys.php +++ b/app/Console/Commands/Integrity/RestoreOAuthKeys.php @@ -46,6 +46,7 @@ class RestoreOAuthKeys extends Command */ protected $signature = 'firefly-iii:restore-oauth-keys'; + /** * Execute the console command. * diff --git a/app/Console/Commands/ScanAttachments.php b/app/Console/Commands/ScanAttachments.php index 21af60f99d..abe7b209f2 100644 --- a/app/Console/Commands/ScanAttachments.php +++ b/app/Console/Commands/ScanAttachments.php @@ -54,6 +54,7 @@ class ScanAttachments extends Command */ protected $signature = 'firefly-iii:scan-attachments'; + /** * Execute the console command. */ diff --git a/app/Console/Commands/SetLatestVersion.php b/app/Console/Commands/SetLatestVersion.php index b961e755d7..310cc2d19f 100644 --- a/app/Console/Commands/SetLatestVersion.php +++ b/app/Console/Commands/SetLatestVersion.php @@ -44,6 +44,7 @@ class SetLatestVersion extends Command */ protected $signature = 'firefly-iii:set-latest-version {--james-is-cool}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Tools/ApplyRules.php b/app/Console/Commands/Tools/ApplyRules.php index 612b2e0f41..359a91f97f 100644 --- a/app/Console/Commands/Tools/ApplyRules.php +++ b/app/Console/Commands/Tools/ApplyRules.php @@ -89,6 +89,7 @@ class ApplyRules extends Command /** @var Carbon */ private $startDate; + /** * Execute the console command. * diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.php index e37676718a..e5d2a89b5e 100644 --- a/app/Console/Commands/Tools/Cron.php +++ b/app/Console/Commands/Tools/Cron.php @@ -57,6 +57,7 @@ class Cron extends Command {--date= : Set the date in YYYY-MM-DD to make Firefly III think that\'s the current date.} '; + /** * @return int */ @@ -173,7 +174,7 @@ class Cron extends Command // if not configured to do anything with telemetry, do nothing. return; } - $telemetry = new TelemetryCronJob; + $telemetry = new TelemetryCronjob; $telemetry->setForce($force); // set date in cron job: diff --git a/app/Console/Commands/Upgrade/AccountCurrencies.php b/app/Console/Commands/Upgrade/AccountCurrencies.php index f8bfc1410d..27a14030a6 100644 --- a/app/Console/Commands/Upgrade/AccountCurrencies.php +++ b/app/Console/Commands/Upgrade/AccountCurrencies.php @@ -59,6 +59,7 @@ class AccountCurrencies extends Command /** @var UserRepositoryInterface */ private $userRepos; + /** * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon the account. * diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php index bc6a2aead2..6681fc030f 100644 --- a/app/Console/Commands/Upgrade/BackToJournals.php +++ b/app/Console/Commands/Upgrade/BackToJournals.php @@ -51,6 +51,7 @@ class BackToJournals extends Command */ protected $signature = 'firefly-iii:back-to-journals {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php index 990b02bbf8..37ed9ff665 100644 --- a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php +++ b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php @@ -47,6 +47,7 @@ class BudgetLimitCurrency extends Command */ protected $signature = 'firefly-iii:bl-currency {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/CCLiabilities.php b/app/Console/Commands/Upgrade/CCLiabilities.php index e5904a7198..36a23a96a8 100644 --- a/app/Console/Commands/Upgrade/CCLiabilities.php +++ b/app/Console/Commands/Upgrade/CCLiabilities.php @@ -50,6 +50,7 @@ class CCLiabilities extends Command */ protected $signature = 'firefly-iii:cc-liabilities {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/MigrateAttachments.php b/app/Console/Commands/Upgrade/MigrateAttachments.php index 9e2270d7d2..6120a2a4de 100644 --- a/app/Console/Commands/Upgrade/MigrateAttachments.php +++ b/app/Console/Commands/Upgrade/MigrateAttachments.php @@ -48,6 +48,7 @@ class MigrateAttachments extends Command */ protected $signature = 'firefly-iii:migrate-attachments {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/MigrateJournalNotes.php b/app/Console/Commands/Upgrade/MigrateJournalNotes.php index a234c2948f..72760471d8 100644 --- a/app/Console/Commands/Upgrade/MigrateJournalNotes.php +++ b/app/Console/Commands/Upgrade/MigrateJournalNotes.php @@ -49,6 +49,7 @@ class MigrateJournalNotes extends Command */ protected $signature = 'firefly-iii:migrate-notes {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php index 30eca6aec4..e02495bd89 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php @@ -47,6 +47,7 @@ class MigrateRecurrenceMeta extends Command */ protected $signature = 'firefly-iii:migrate-recurrence-meta {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/MigrateTagLocations.php b/app/Console/Commands/Upgrade/MigrateTagLocations.php index bc0f209a55..b1693b9f40 100644 --- a/app/Console/Commands/Upgrade/MigrateTagLocations.php +++ b/app/Console/Commands/Upgrade/MigrateTagLocations.php @@ -48,6 +48,7 @@ class MigrateTagLocations extends Command */ protected $signature = 'firefly-iii:migrate-tag-locations {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/MigrateToGroups.php b/app/Console/Commands/Upgrade/MigrateToGroups.php index 29a922cad3..fbcd53f001 100644 --- a/app/Console/Commands/Upgrade/MigrateToGroups.php +++ b/app/Console/Commands/Upgrade/MigrateToGroups.php @@ -69,6 +69,7 @@ class MigrateToGroups extends Command /** @var JournalDestroyService */ private $service; + /** * Execute the console command. * @@ -289,7 +290,6 @@ class MigrateToGroups extends Command * @param TransactionJournal $journal * * @throws Exception - * */ private function makeMultiGroup(TransactionJournal $journal): void { diff --git a/app/Console/Commands/Upgrade/MigrateToRules.php b/app/Console/Commands/Upgrade/MigrateToRules.php index 36c40affab..5029dbd70d 100644 --- a/app/Console/Commands/Upgrade/MigrateToRules.php +++ b/app/Console/Commands/Upgrade/MigrateToRules.php @@ -63,6 +63,7 @@ class MigrateToRules extends Command /** @var UserRepositoryInterface */ private $userRepository; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php index d021e088ff..ce2f40f6a6 100644 --- a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php @@ -66,6 +66,7 @@ class OtherCurrenciesCorrections extends Command /** @var JournalRepositoryInterface */ private $journalRepos; + /** * Execute the console command. * @@ -265,7 +266,6 @@ class OtherCurrenciesCorrections extends Command * * Both source and destination must match the respective currency preference of the related asset account. * So FF3 must verify all transactions. - * */ private function updateOtherJournalsCurrencies(): void { diff --git a/app/Console/Commands/Upgrade/RenameAccountMeta.php b/app/Console/Commands/Upgrade/RenameAccountMeta.php index 6a6e369a8d..01aaa1b6fd 100644 --- a/app/Console/Commands/Upgrade/RenameAccountMeta.php +++ b/app/Console/Commands/Upgrade/RenameAccountMeta.php @@ -45,6 +45,7 @@ class RenameAccountMeta extends Command */ protected $signature = 'firefly-iii:rename-account-meta {--F|force : Force the execution of this command.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/TransactionIdentifier.php b/app/Console/Commands/Upgrade/TransactionIdentifier.php index a60db0b924..d220a8b27e 100644 --- a/app/Console/Commands/Upgrade/TransactionIdentifier.php +++ b/app/Console/Commands/Upgrade/TransactionIdentifier.php @@ -57,6 +57,7 @@ class TransactionIdentifier extends Command /** @var JournalRepositoryInterface */ private $journalRepository; + /** * This method gives all transactions which are part of a split journal (so more than 2) a sort of "order" so they are easier * to easier to match to their counterpart. When a journal is split, it has two or three transactions: -3, -4 and -5 for example. diff --git a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php index 995a70820c..d8a9e4eff7 100644 --- a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php @@ -78,6 +78,7 @@ class TransferCurrenciesCorrections extends Command /** @var Transaction The source transaction of the current journal. */ private $sourceTransaction; + /** * Execute the console command. * @@ -185,7 +186,6 @@ class TransferCurrenciesCorrections extends Command * If the destination account currency is the same as the source currency, * both foreign_amount and foreign_currency_id fields must be NULL * for both transactions (because foreign currency info would not make sense) - * */ private function fixInvalidForeignCurrency(): void { diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php index 73a8a0d888..0167595dad 100644 --- a/app/Console/Commands/Upgrade/UpgradeDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php @@ -48,6 +48,7 @@ class UpgradeDatabase extends Command */ protected $signature = 'firefly-iii:upgrade-database {--F|force : Force all upgrades.}'; + /** * Execute the console command. * diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index a5cbca8614..67cd1db0f0 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -49,6 +49,7 @@ class UpgradeFireflyInstructions extends Command */ protected $signature = 'firefly:instructions {task}'; + /** * Execute the console command. */ @@ -69,7 +70,7 @@ class UpgradeFireflyInstructions extends Command app('telemetry')->feature('system.database.driver', env('DB_CONNECTION', '(unknown)')); app('telemetry')->feature('system.os.is_docker', $isDocker); app('telemetry')->feature('system.command.executed', $this->signature); - app('telemetry')->feature('system.users.count', (string)User::count()); + app('telemetry')->feature('system.users.count', (string) User::count()); return 0; }