diff --git a/app/Console/Commands/Correction/CorrectDatabase.php b/app/Console/Commands/Correction/CorrectDatabase.php index 2cc972a861..29cc6f4e2b 100644 --- a/app/Console/Commands/Correction/CorrectDatabase.php +++ b/app/Console/Commands/Correction/CorrectDatabase.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Correction; - use Artisan; use Illuminate\Console\Command; use Schema; @@ -48,7 +47,6 @@ class CorrectDatabase extends Command */ protected $signature = 'firefly-iii:correct-database'; - /** * Execute the console command. */ diff --git a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php index fb5d5e97a9..8e5c1f53ea 100644 --- a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php +++ b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php @@ -53,7 +53,6 @@ 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 f98c76274e..8586aa0f50 100644 --- a/app/Console/Commands/Correction/CreateAccessTokens.php +++ b/app/Console/Commands/Correction/CreateAccessTokens.php @@ -46,7 +46,6 @@ 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 6118c9920d..0bdf1d924d 100644 --- a/app/Console/Commands/Correction/CreateLinkTypes.php +++ b/app/Console/Commands/Correction/CreateLinkTypes.php @@ -44,7 +44,6 @@ 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 7daec17572..bb5a0c52bf 100644 --- a/app/Console/Commands/Correction/DeleteEmptyGroups.php +++ b/app/Console/Commands/Correction/DeleteEmptyGroups.php @@ -46,7 +46,6 @@ 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 a61250f692..01aa71d030 100644 --- a/app/Console/Commands/Correction/DeleteEmptyJournals.php +++ b/app/Console/Commands/Correction/DeleteEmptyJournals.php @@ -48,7 +48,6 @@ 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 d0414029c1..71085e35b2 100644 --- a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php +++ b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php @@ -48,7 +48,6 @@ 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 e374905cac..f96b426eee 100644 --- a/app/Console/Commands/Correction/DeleteZeroAmount.php +++ b/app/Console/Commands/Correction/DeleteZeroAmount.php @@ -47,7 +47,6 @@ 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 3901b7036b..a3b2f6135e 100644 --- a/app/Console/Commands/Correction/EnableCurrencies.php +++ b/app/Console/Commands/Correction/EnableCurrencies.php @@ -50,7 +50,6 @@ 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 1cf44a765a..f5df607411 100644 --- a/app/Console/Commands/Correction/FixAccountOrder.php +++ b/app/Console/Commands/Correction/FixAccountOrder.php @@ -47,7 +47,6 @@ 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 80d5ab9bcb..5736970505 100644 --- a/app/Console/Commands/Correction/FixAccountTypes.php +++ b/app/Console/Commands/Correction/FixAccountTypes.php @@ -53,7 +53,6 @@ class FixAccountTypes extends Command private array $expected; private AccountFactory $factory; - /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixGroupAccounts.php b/app/Console/Commands/Correction/FixGroupAccounts.php index 37bb4986dc..9cc6ed924c 100644 --- a/app/Console/Commands/Correction/FixGroupAccounts.php +++ b/app/Console/Commands/Correction/FixGroupAccounts.php @@ -49,7 +49,6 @@ class FixGroupAccounts extends Command */ protected $signature = 'firefly-iii:unify-group-accounts'; - /** * Execute the console command. * @@ -75,7 +74,6 @@ class FixGroupAccounts extends Command $this->line('Updated inconsistent transaction groups.'); - return 0; } } diff --git a/app/Console/Commands/Correction/FixLongDescriptions.php b/app/Console/Commands/Correction/FixLongDescriptions.php index 12ade346d2..32fa810ec7 100644 --- a/app/Console/Commands/Correction/FixLongDescriptions.php +++ b/app/Console/Commands/Correction/FixLongDescriptions.php @@ -47,7 +47,6 @@ class FixLongDescriptions extends Command */ protected $signature = 'firefly-iii:fix-long-descriptions'; - /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/FixPiggies.php b/app/Console/Commands/Correction/FixPiggies.php index eb7875c3ed..274e5265b4 100644 --- a/app/Console/Commands/Correction/FixPiggies.php +++ b/app/Console/Commands/Correction/FixPiggies.php @@ -51,7 +51,6 @@ 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 c34bb68a31..ac6e047558 100644 --- a/app/Console/Commands/Correction/FixRecurringTransactions.php +++ b/app/Console/Commands/Correction/FixRecurringTransactions.php @@ -54,7 +54,6 @@ class FixRecurringTransactions extends Command /** @var UserRepositoryInterface */ private $userRepos; - /** * Execute the console command. * @@ -65,8 +64,6 @@ class FixRecurringTransactions extends Command $start = microtime(true); $this->stupidLaravel(); $this->correctTransactions(); - - $end = round(microtime(true) - $start, 2); $this->info(sprintf('Corrected recurring transactions in %s seconds.', $end)); diff --git a/app/Console/Commands/Correction/FixTransactionTypes.php b/app/Console/Commands/Correction/FixTransactionTypes.php index 3c51059e1f..a3a01326e7 100644 --- a/app/Console/Commands/Correction/FixTransactionTypes.php +++ b/app/Console/Commands/Correction/FixTransactionTypes.php @@ -50,7 +50,6 @@ 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 20c6b08e57..28b28ab7e9 100644 --- a/app/Console/Commands/Correction/FixUnevenAmount.php +++ b/app/Console/Commands/Correction/FixUnevenAmount.php @@ -48,7 +48,6 @@ 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 53f7a2d126..f4f2d0d1a4 100644 --- a/app/Console/Commands/Correction/RemoveBills.php +++ b/app/Console/Commands/Correction/RemoveBills.php @@ -45,7 +45,6 @@ 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 8be384f419..75af3c3ff1 100644 --- a/app/Console/Commands/Correction/RenameMetaFields.php +++ b/app/Console/Commands/Correction/RenameMetaFields.php @@ -46,7 +46,6 @@ class RenameMetaFields extends Command private int $count; - /** * Execute the console command. * diff --git a/app/Console/Commands/Correction/TransferBudgets.php b/app/Console/Commands/Correction/TransferBudgets.php index 8022122edc..173b010e1a 100644 --- a/app/Console/Commands/Correction/TransferBudgets.php +++ b/app/Console/Commands/Correction/TransferBudgets.php @@ -46,7 +46,6 @@ 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 ab87a7ac48..aa4a9092d9 100644 --- a/app/Console/Commands/CreateDatabase.php +++ b/app/Console/Commands/CreateDatabase.php @@ -28,7 +28,6 @@ use Illuminate\Console\Command; use PDO; use PDOException; - /** * Class CreateDatabase */ @@ -47,7 +46,6 @@ class CreateDatabase extends Command */ protected $signature = 'firefly-iii:create-database'; - /** * Execute the console command. * diff --git a/app/Console/Commands/CreateFirstUser.php b/app/Console/Commands/CreateFirstUser.php index 3ddec90a24..aa7a4d10b6 100644 --- a/app/Console/Commands/CreateFirstUser.php +++ b/app/Console/Commands/CreateFirstUser.php @@ -47,7 +47,7 @@ class CreateFirstUser extends Command * * @var string */ - protected $signature = 'firefly-iii:create-first-user {email}'; + protected $signature = 'firefly-iii:create-first-user {email}'; private UserRepositoryInterface $repository; /** diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index e06f2ff9b8..d5da37c14a 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -78,7 +78,6 @@ class ExportData extends Command private JournalRepositoryInterface $journalRepository; private User $user; - /** * Execute the console command. * @@ -115,8 +114,6 @@ class ExportData extends Command $exporter->setStart($options['start']); $exporter->setEnd($options['end']); $exporter->setAccounts($options['accounts']); - - $exporter->setExportTransactions($options['export']['transactions']); $exporter->setExportAccounts($options['export']['accounts']); $exporter->setExportBudgets($options['export']['budgets']); @@ -294,6 +291,4 @@ class ExportData extends Command $this->info(sprintf('Wrote %s-export to file "%s".', $key, $file)); } } - - } diff --git a/app/Console/Commands/Integrity/ReportEmptyObjects.php b/app/Console/Commands/Integrity/ReportEmptyObjects.php index fe8f33d061..fe1d9eaa3b 100644 --- a/app/Console/Commands/Integrity/ReportEmptyObjects.php +++ b/app/Console/Commands/Integrity/ReportEmptyObjects.php @@ -48,7 +48,6 @@ 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 ed63e7c54b..c4f7122fb6 100644 --- a/app/Console/Commands/Integrity/ReportIntegrity.php +++ b/app/Console/Commands/Integrity/ReportIntegrity.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Integrity; - use Artisan; use Illuminate\Console\Command; use Schema; @@ -49,7 +48,6 @@ 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 f11366c8f4..a9b6054269 100644 --- a/app/Console/Commands/Integrity/ReportSum.php +++ b/app/Console/Commands/Integrity/ReportSum.php @@ -45,7 +45,6 @@ class ReportSum extends Command */ protected $signature = 'firefly-iii:report-sum'; - /** * Execute the console command. * @@ -58,7 +57,6 @@ class ReportSum extends Command return 0; } - /** * Reports for each user when the sum of their transactions is not zero. */ diff --git a/app/Console/Commands/Integrity/RestoreOAuthKeys.php b/app/Console/Commands/Integrity/RestoreOAuthKeys.php index 9f8c66e76c..4144ebcfbe 100644 --- a/app/Console/Commands/Integrity/RestoreOAuthKeys.php +++ b/app/Console/Commands/Integrity/RestoreOAuthKeys.php @@ -46,7 +46,6 @@ 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 51e2a42abe..b423497fda 100644 --- a/app/Console/Commands/ScanAttachments.php +++ b/app/Console/Commands/ScanAttachments.php @@ -54,7 +54,6 @@ 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 310cc2d19f..b961e755d7 100644 --- a/app/Console/Commands/SetLatestVersion.php +++ b/app/Console/Commands/SetLatestVersion.php @@ -44,7 +44,6 @@ 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 04295f3dc5..d01e63fba3 100644 --- a/app/Console/Commands/Tools/ApplyRules.php +++ b/app/Console/Commands/Tools/ApplyRules.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Tools; - use Carbon\Carbon; use FireflyIII\Console\Commands\VerifiesAccessToken; use FireflyIII\Exceptions\FireflyException; @@ -78,7 +77,6 @@ class ApplyRules extends Command private array $ruleSelection; private Carbon $startDate; - /** * Execute the console command. * @@ -227,8 +225,6 @@ class ApplyRules extends Command /** @var AccountRepositoryInterface $accountRepository */ $accountRepository = app(AccountRepositoryInterface::class); $accountRepository->setUser($this->getUser()); - - foreach ($accountList as $accountId) { $accountId = (int)$accountId; $account = $accountRepository->findNull($accountId); diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.php index 0012981ff5..d65dc729fc 100644 --- a/app/Console/Commands/Tools/Cron.php +++ b/app/Console/Commands/Tools/Cron.php @@ -57,7 +57,6 @@ class Cron extends Command {--date= : Set the date in YYYY-MM-DD to make Firefly III think that\'s the current date.} '; - /** * @return int */ diff --git a/app/Console/Commands/Upgrade/AccountCurrencies.php b/app/Console/Commands/Upgrade/AccountCurrencies.php index ae331fa8e4..3c9a11bad7 100644 --- a/app/Console/Commands/Upgrade/AccountCurrencies.php +++ b/app/Console/Commands/Upgrade/AccountCurrencies.php @@ -59,7 +59,6 @@ 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. * @@ -88,7 +87,6 @@ class AccountCurrencies extends Command $this->info(sprintf('Verified and fixed account currencies in %s seconds.', $end)); $this->markAsExecuted(); - return 0; } @@ -206,8 +204,6 @@ class AccountCurrencies extends Command return; } - - // do not match and opening balance id is not null. if ($accountCurrency !== $obCurrency && null !== $openingBalance) { Log::debug(sprintf('Account (#%d) and OB currency (#%d) are different. Overrule OB, set to account currency.', $accountCurrency, $obCurrency)); diff --git a/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php b/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php index 3af1a62fc5..b3fb1a3bc2 100644 --- a/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php +++ b/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Console\Commands\Upgrade; diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php index e2956bd6ef..a499a83009 100644 --- a/app/Console/Commands/Upgrade/BackToJournals.php +++ b/app/Console/Commands/Upgrade/BackToJournals.php @@ -51,7 +51,6 @@ 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 586d9fae96..0867427b99 100644 --- a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php +++ b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; - use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use Illuminate\Console\Command; @@ -47,7 +46,6 @@ class BudgetLimitCurrency extends Command */ protected $signature = 'firefly-iii:bl-currency {--F|force : Force the execution of this command.}'; - /** * Execute the console command. * @@ -109,7 +107,6 @@ class BudgetLimitCurrency extends Command return false; // @codeCoverageIgnore } - /** * */ diff --git a/app/Console/Commands/Upgrade/CCLiabilities.php b/app/Console/Commands/Upgrade/CCLiabilities.php index e8f442f9df..e5736d230f 100644 --- a/app/Console/Commands/Upgrade/CCLiabilities.php +++ b/app/Console/Commands/Upgrade/CCLiabilities.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; - use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use Illuminate\Console\Command; @@ -34,8 +33,6 @@ use Illuminate\Support\Collection; */ class CCLiabilities extends Command { - - public const CONFIG_NAME = '480_cc_liabilities'; /** * The console command description. @@ -50,7 +47,6 @@ class CCLiabilities extends Command */ protected $signature = 'firefly-iii:cc-liabilities {--F|force : Force the execution of this command.}'; - /** * Execute the console command. * @@ -108,7 +104,6 @@ class CCLiabilities extends Command return false; // @codeCoverageIgnore } - /** * */ diff --git a/app/Console/Commands/Upgrade/MigrateAttachments.php b/app/Console/Commands/Upgrade/MigrateAttachments.php index a02d72f793..512adf9562 100644 --- a/app/Console/Commands/Upgrade/MigrateAttachments.php +++ b/app/Console/Commands/Upgrade/MigrateAttachments.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; - use FireflyIII\Models\Attachment; use FireflyIII\Models\Note; use Illuminate\Console\Command; @@ -48,7 +47,6 @@ class MigrateAttachments extends Command */ protected $signature = 'firefly-iii:migrate-attachments {--F|force : Force the execution of this command.}'; - /** * Execute the console command. * @@ -118,7 +116,6 @@ class MigrateAttachments extends Command return false; // @codeCoverageIgnore } - /** * */ diff --git a/app/Console/Commands/Upgrade/MigrateJournalNotes.php b/app/Console/Commands/Upgrade/MigrateJournalNotes.php index 5b1ef28746..685e1a77a4 100644 --- a/app/Console/Commands/Upgrade/MigrateJournalNotes.php +++ b/app/Console/Commands/Upgrade/MigrateJournalNotes.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; - use Exception; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournalMeta; @@ -49,7 +48,6 @@ class MigrateJournalNotes extends Command */ protected $signature = 'firefly-iii:migrate-notes {--F|force : Force the execution of this command.}'; - /** * Execute the console command. * @@ -117,7 +115,6 @@ class MigrateJournalNotes extends Command return false; // @codeCoverageIgnore } - /** * */ diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php index 0a35c94c5b..bb1365ac8f 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php @@ -47,7 +47,6 @@ 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/MigrateRecurrenceType.php b/app/Console/Commands/Upgrade/MigrateRecurrenceType.php index af5e5a7a7a..51d32603c1 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceType.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceType.php @@ -1,5 +1,27 @@ . + */ + +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Models\Recurrence; diff --git a/app/Console/Commands/Upgrade/MigrateTagLocations.php b/app/Console/Commands/Upgrade/MigrateTagLocations.php index b6a9bacbad..b201db99f2 100644 --- a/app/Console/Commands/Upgrade/MigrateTagLocations.php +++ b/app/Console/Commands/Upgrade/MigrateTagLocations.php @@ -48,7 +48,6 @@ class MigrateTagLocations extends Command */ protected $signature = 'firefly-iii:migrate-tag-locations {--F|force : Force the execution of this command.}'; - /** * Execute the console command. * @@ -130,6 +129,4 @@ class MigrateTagLocations extends Command { app('fireflyconfig')->set(self::CONFIG_NAME, true); } - - } diff --git a/app/Console/Commands/Upgrade/MigrateToGroups.php b/app/Console/Commands/Upgrade/MigrateToGroups.php index 7e12b33577..48f5d709f4 100644 --- a/app/Console/Commands/Upgrade/MigrateToGroups.php +++ b/app/Console/Commands/Upgrade/MigrateToGroups.php @@ -104,8 +104,6 @@ class MigrateToGroups extends Command if (0 === $this->count) { $this->line('No journals to migrate to groups.'); } - - $this->markAsMigrated(); return 0; diff --git a/app/Console/Commands/Upgrade/MigrateToRules.php b/app/Console/Commands/Upgrade/MigrateToRules.php index d7b8a1a2b3..44024e4077 100644 --- a/app/Console/Commands/Upgrade/MigrateToRules.php +++ b/app/Console/Commands/Upgrade/MigrateToRules.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; - use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Bill; use FireflyIII\Models\Preference; @@ -63,7 +62,6 @@ 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 7aee00ec54..f274d63087 100644 --- a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php @@ -66,7 +66,6 @@ class OtherCurrenciesCorrections extends Command /** @var JournalRepositoryInterface */ private $journalRepos; - /** * Execute the console command. * diff --git a/app/Console/Commands/Upgrade/RenameAccountMeta.php b/app/Console/Commands/Upgrade/RenameAccountMeta.php index d697c17c34..9e12c60d7b 100644 --- a/app/Console/Commands/Upgrade/RenameAccountMeta.php +++ b/app/Console/Commands/Upgrade/RenameAccountMeta.php @@ -45,7 +45,6 @@ class RenameAccountMeta extends Command */ protected $signature = 'firefly-iii:rename-account-meta {--F|force : Force the execution of this command.}'; - /** * Execute the console command. * @@ -108,7 +107,6 @@ class RenameAccountMeta extends Command return false; // @codeCoverageIgnore } - /** * */ diff --git a/app/Console/Commands/Upgrade/TransactionIdentifier.php b/app/Console/Commands/Upgrade/TransactionIdentifier.php index 9ddad9f896..3628af9d9c 100644 --- a/app/Console/Commands/Upgrade/TransactionIdentifier.php +++ b/app/Console/Commands/Upgrade/TransactionIdentifier.php @@ -57,7 +57,6 @@ 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 7cc9cf287b..9524a85c4a 100644 --- a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php @@ -70,8 +70,6 @@ class TransferCurrenciesCorrections extends Command */ public function handle(): int { - - $this->stupidLaravel(); $start = microtime(true); // @codeCoverageIgnoreStart @@ -188,8 +186,6 @@ class TransferCurrenciesCorrections extends Command return; } // @codeCoverageIgnoreEnd - - // both accounts must have currency preference: // @codeCoverageIgnoreStart if ($this->isNoCurrencyPresent()) { diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php index ca3d4ca158..7dd43c5b48 100644 --- a/app/Console/Commands/Upgrade/UpgradeDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php @@ -48,7 +48,6 @@ class UpgradeDatabase extends Command */ protected $signature = 'firefly-iii:upgrade-database {--F|force : Force all upgrades.}'; - /** * Execute the console command. * @@ -58,8 +57,6 @@ class UpgradeDatabase extends Command { $this->callInitialCommands(); - - $commands = [ // there are 14 upgrade commands. 'firefly-iii:transaction-identifiers', diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index f905385b12..b178a1f6ab 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -50,7 +50,6 @@ class UpgradeFireflyInstructions extends Command */ protected $signature = 'firefly:instructions {task}'; - /** * Execute the console command. */ @@ -168,8 +167,6 @@ class UpgradeFireflyInstructions extends Command $text = $config[$compare]; } } - - $this->showLine(); $this->boxed(''); if (null === $text) { diff --git a/app/Events/AdminRequestedTestMessage.php b/app/Events/AdminRequestedTestMessage.php index 87b3652aa2..821064065c 100644 --- a/app/Events/AdminRequestedTestMessage.php +++ b/app/Events/AdminRequestedTestMessage.php @@ -41,8 +41,6 @@ class AdminRequestedTestMessage extends Event public $ipAddress; /** @var User The user */ public $user; - - /** * Create a new event instance. * diff --git a/app/Events/DestroyedTransactionGroup.php b/app/Events/DestroyedTransactionGroup.php index 483dbc1abc..baca5a78f5 100644 --- a/app/Events/DestroyedTransactionGroup.php +++ b/app/Events/DestroyedTransactionGroup.php @@ -37,8 +37,6 @@ class DestroyedTransactionGroup extends Event use SerializesModels; public TransactionGroup $transactionGroup; - - /** * Create a new event instance. * diff --git a/app/Events/DestroyedTransactionLink.php b/app/Events/DestroyedTransactionLink.php index a23465063e..fde76cf98c 100644 --- a/app/Events/DestroyedTransactionLink.php +++ b/app/Events/DestroyedTransactionLink.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Events; - - use FireflyIII\Models\TransactionJournalLink; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/DetectedNewIPAddress.php b/app/Events/DetectedNewIPAddress.php index b381200a83..231f1247d8 100644 --- a/app/Events/DetectedNewIPAddress.php +++ b/app/Events/DetectedNewIPAddress.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Events; - - use FireflyIII\User; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/RegisteredUser.php b/app/Events/RegisteredUser.php index 2518f8214e..a8a8d59fd7 100644 --- a/app/Events/RegisteredUser.php +++ b/app/Events/RegisteredUser.php @@ -40,8 +40,6 @@ class RegisteredUser extends Event public $ipAddress; /** @var User The user */ public $user; - - /** * Create a new event instance. This event is triggered when a new user registers. * diff --git a/app/Events/RequestedNewPassword.php b/app/Events/RequestedNewPassword.php index 2532ccc837..13f04ce363 100644 --- a/app/Events/RequestedNewPassword.php +++ b/app/Events/RequestedNewPassword.php @@ -42,8 +42,6 @@ class RequestedNewPassword extends Event public $token; /** @var User The user */ public $user; - - /** * Create a new event instance. This event is triggered when a users tries to reset his or her password. * diff --git a/app/Events/RequestedReportOnJournals.php b/app/Events/RequestedReportOnJournals.php index e16e0d205c..cfe28a5d9f 100644 --- a/app/Events/RequestedReportOnJournals.php +++ b/app/Events/RequestedReportOnJournals.php @@ -45,8 +45,6 @@ class RequestedReportOnJournals public $groups; /** @var int The ID of the user. */ public $userId; - - /** * Create a new event instance. * diff --git a/app/Events/RequestedSendWebhookMessages.php b/app/Events/RequestedSendWebhookMessages.php index 15ac7b55c2..a46fb630e5 100644 --- a/app/Events/RequestedSendWebhookMessages.php +++ b/app/Events/RequestedSendWebhookMessages.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Events; use Illuminate\Queue\SerializesModels; - - class RequestedSendWebhookMessages extends Event { use SerializesModels; diff --git a/app/Events/RequestedVersionCheckStatus.php b/app/Events/RequestedVersionCheckStatus.php index 45f26a92c9..cdd1aa4d76 100644 --- a/app/Events/RequestedVersionCheckStatus.php +++ b/app/Events/RequestedVersionCheckStatus.php @@ -26,8 +26,6 @@ namespace FireflyIII\Events; use FireflyIII\User; use Illuminate\Queue\SerializesModels; - - /** * Class RequestedVersionCheckStatus * @@ -39,8 +37,6 @@ class RequestedVersionCheckStatus extends Event /** @var User The user */ public $user; - - /** * Create a new event instance. This event is triggered when Firefly III wants to know * what the deal is with the version checker. diff --git a/app/Events/StoredTransactionGroup.php b/app/Events/StoredTransactionGroup.php index 56b80fd217..558dc9015d 100644 --- a/app/Events/StoredTransactionGroup.php +++ b/app/Events/StoredTransactionGroup.php @@ -38,8 +38,6 @@ class StoredTransactionGroup extends Event public bool $applyRules; public TransactionGroup $transactionGroup; - - /** * Create a new event instance. * diff --git a/app/Events/StoredTransactionLink.php b/app/Events/StoredTransactionLink.php index 401a506b0b..087142ca0a 100644 --- a/app/Events/StoredTransactionLink.php +++ b/app/Events/StoredTransactionLink.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Events; - - use FireflyIII\Models\TransactionJournalLink; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/UpdatedTransactionGroup.php b/app/Events/UpdatedTransactionGroup.php index bd3f14e589..e379251fbd 100644 --- a/app/Events/UpdatedTransactionGroup.php +++ b/app/Events/UpdatedTransactionGroup.php @@ -40,8 +40,6 @@ class UpdatedTransactionGroup extends Event public $applyRules; /** @var TransactionGroup The group that was stored. */ public $transactionGroup; - - /** * Create a new event instance. * diff --git a/app/Events/UpdatedTransactionLink.php b/app/Events/UpdatedTransactionLink.php index 6e18ee2463..c2499ec9a2 100644 --- a/app/Events/UpdatedTransactionLink.php +++ b/app/Events/UpdatedTransactionLink.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Events; - - use FireflyIII\Models\TransactionJournalLink; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/UserChangedEmail.php b/app/Events/UserChangedEmail.php index d293b4ed15..c8b3dec0b6 100644 --- a/app/Events/UserChangedEmail.php +++ b/app/Events/UserChangedEmail.php @@ -44,8 +44,6 @@ class UserChangedEmail extends Event public $oldEmail; /** @var User The user itself */ public $user; - - /** * UserChangedEmail constructor. * diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php index 9af5faa991..10a7b7729d 100644 --- a/app/Exceptions/GracefulNotFoundHandler.php +++ b/app/Exceptions/GracefulNotFoundHandler.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Exceptions; - - use Exception; use FireflyIII\Models\Account; use FireflyIII\Models\Attachment; diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 2e94350ecc..b2dede5d2e 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -98,8 +98,6 @@ class Handler extends ExceptionHandler return $handler->render($request, $exception); } - - if ($exception instanceof FireflyException || $exception instanceof ErrorException || $exception instanceof OAuthServerException) { $isDebug = config('app.debug'); diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.php index 74c349d22d..869ebbe9de 100644 --- a/app/Factory/AccountFactory.php +++ b/app/Factory/AccountFactory.php @@ -207,8 +207,6 @@ class AccountFactory if (null !== $result) { Log::debug(sprintf('Found account type based on %d and "%s": "%s"', $accountTypeId, $accountType, $result->type)); } - - return $result; } @@ -233,6 +231,4 @@ class AccountFactory { $this->user = $user; } - - } diff --git a/app/Factory/CategoryFactory.php b/app/Factory/CategoryFactory.php index 9a84dda2a6..b7f15d2618 100644 --- a/app/Factory/CategoryFactory.php +++ b/app/Factory/CategoryFactory.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Factory; - - use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Category; use FireflyIII\User; diff --git a/app/Factory/PiggyBankFactory.php b/app/Factory/PiggyBankFactory.php index 4d337dcf1e..0300464683 100644 --- a/app/Factory/PiggyBankFactory.php +++ b/app/Factory/PiggyBankFactory.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Factory; - - use FireflyIII\Models\PiggyBank; use FireflyIII\User; diff --git a/app/Factory/RecurrenceFactory.php b/app/Factory/RecurrenceFactory.php index 7a9298e88a..237365a404 100644 --- a/app/Factory/RecurrenceFactory.php +++ b/app/Factory/RecurrenceFactory.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Factory; - - use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Recurrence; @@ -44,8 +42,6 @@ class RecurrenceFactory private MessageBag $errors; private User $user; - - /** * Constructor. * diff --git a/app/Factory/TransactionCurrencyFactory.php b/app/Factory/TransactionCurrencyFactory.php index 4e355b3c09..86bb2dacd0 100644 --- a/app/Factory/TransactionCurrencyFactory.php +++ b/app/Factory/TransactionCurrencyFactory.php @@ -102,6 +102,4 @@ class TransactionCurrencyFactory return null; } - - } diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 66739d3209..bfae66d6a5 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -44,8 +44,6 @@ class TransactionFactory private TransactionJournal $journal; private bool $reconciled; private User $user; - - /** * Constructor. * diff --git a/app/Factory/TransactionGroupFactory.php b/app/Factory/TransactionGroupFactory.php index e7f6d99e1a..a6dd321faa 100644 --- a/app/Factory/TransactionGroupFactory.php +++ b/app/Factory/TransactionGroupFactory.php @@ -40,8 +40,6 @@ class TransactionGroupFactory private $journalFactory; /** @var User The user */ private $user; - - /** * TransactionGroupFactory constructor. */ diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 3350b2720e..ac981c7984 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -263,8 +263,6 @@ class TransactionJournalFactory $this->forceDeleteOnError(new Collection([$journal])); throw new FireflyException($e->getMessage()); } - - // verify that journal has two transactions. Otherwise, delete and cancel. $journal->completed = true; $journal->save(); @@ -578,6 +576,4 @@ class TransactionJournalFactory $this->piggyRepository->setUser($this->user); $this->accountRepository->setUser($this->user); } - - } diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index 1e80fe6026..14864429b3 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -65,8 +65,6 @@ class YearReportGenerator implements ReportGeneratorInterface return $result; } - - /** * Set the accounts. * diff --git a/app/Generator/Webhook/MessageGeneratorInterface.php b/app/Generator/Webhook/MessageGeneratorInterface.php index 8d02908203..066a203fa1 100644 --- a/app/Generator/Webhook/MessageGeneratorInterface.php +++ b/app/Generator/Webhook/MessageGeneratorInterface.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Generator\Webhook; diff --git a/app/Generator/Webhook/StandardMessageGenerator.php b/app/Generator/Webhook/StandardMessageGenerator.php index 751dd6260d..f00d164bf6 100644 --- a/app/Generator/Webhook/StandardMessageGenerator.php +++ b/app/Generator/Webhook/StandardMessageGenerator.php @@ -1,25 +1,5 @@ . - */ - declare(strict_types=1); /* * WebhookMessageGenerator.php diff --git a/app/Handlers/Events/APIEventHandler.php b/app/Handlers/Events/APIEventHandler.php index b04c80ed5d..67f8f929f8 100644 --- a/app/Handlers/Events/APIEventHandler.php +++ b/app/Handlers/Events/APIEventHandler.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Handlers\Events; - - use Exception; use FireflyIII\Mail\AccessTokenCreatedMail; use FireflyIII\Repositories\User\UserRepositoryInterface; @@ -82,8 +80,6 @@ class APIEventHandler } return true; - - } } diff --git a/app/Handlers/Events/DestroyedGroupEventHandler.php b/app/Handlers/Events/DestroyedGroupEventHandler.php index 74d58492c6..b0c3c20864 100644 --- a/app/Handlers/Events/DestroyedGroupEventHandler.php +++ b/app/Handlers/Events/DestroyedGroupEventHandler.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Handlers\Events; - - use FireflyIII\Events\DestroyedTransactionGroup; use FireflyIII\Events\RequestedSendWebhookMessages; use FireflyIII\Generator\Webhook\MessageGeneratorInterface; diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index f2606086a4..095ca2f773 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -318,8 +318,6 @@ class UserEventHandler 'time' => now(config('app.timezone'))->format('Y-m-d H:i:s'), 'notified' => false, ]; - - } $preference = array_values($preference); app('preferences')->setForUser($user, 'login_ip_history', $preference); diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php index 7399974dc4..c40be1054c 100644 --- a/app/Handlers/Events/VersionCheckEventHandler.php +++ b/app/Handlers/Events/VersionCheckEventHandler.php @@ -23,16 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Handlers\Events; - - use FireflyIII\Events\RequestedVersionCheckStatus; use FireflyIII\Helpers\Update\UpdateTrait; use FireflyIII\Models\Configuration; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Log; - - /** * Class VersionCheckEventHandler */ diff --git a/app/Handlers/Events/WebhookEventHandler.php b/app/Handlers/Events/WebhookEventHandler.php index cb6a4ea66e..434d4653b1 100644 --- a/app/Handlers/Events/WebhookEventHandler.php +++ b/app/Handlers/Events/WebhookEventHandler.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Handlers\Events; - - use FireflyIII\Jobs\SendWebhookMessage; use FireflyIII\Models\WebhookMessage; use Log; diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index ef89e71efe..f24a957001 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -55,8 +55,6 @@ class AttachmentHelper implements AttachmentHelperInterface /** @var Filesystem The disk where attachments are stored. */ protected $uploadDisk; - - /** * AttachmentHelper constructor. * @@ -71,8 +69,6 @@ class AttachmentHelper implements AttachmentHelperInterface $this->attachments = new Collection; $this->uploadDisk = Storage::disk('upload'); } - - /** * Returns the content of an attachment. * diff --git a/app/Helpers/Collector/Extensions/AccountCollection.php b/app/Helpers/Collector/Extensions/AccountCollection.php index 0b4f32361d..c0409333e4 100644 --- a/app/Helpers/Collector/Extensions/AccountCollection.php +++ b/app/Helpers/Collector/Extensions/AccountCollection.php @@ -52,8 +52,6 @@ trait AccountCollection return $this; } - - /** * These accounts must not be source accounts. * @@ -72,8 +70,6 @@ trait AccountCollection return $this; } - - /** * Define which accounts can be part of the source and destination transactions. * @@ -119,8 +115,6 @@ trait AccountCollection return $this; } - - /** * Define which accounts can be part of the source and destination transactions. * @@ -139,8 +133,6 @@ trait AccountCollection return $this; } - - /** * Define which accounts can be part of the source and destination transactions. * @@ -159,8 +151,6 @@ trait AccountCollection return $this; } - - /** * Either account can be set, but NOT both. This effectively excludes internal transfers. * @@ -197,8 +187,6 @@ trait AccountCollection return $this; } - - /** * Will include the source and destination account names and types. * @@ -225,8 +213,6 @@ trait AccountCollection $this->fields[] = 'dest_account.name as destination_account_name'; $this->fields[] = 'dest_account.iban as destination_account_iban'; $this->fields[] = 'dest_account_type.type as destination_account_type'; - - $this->hasAccountInfo = true; } diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.php index 538050e508..c726c945d3 100644 --- a/app/Helpers/Collector/Extensions/MetaCollection.php +++ b/app/Helpers/Collector/Extensions/MetaCollection.php @@ -470,6 +470,4 @@ trait MetaCollection $this->query->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id'); } } - - } diff --git a/app/Helpers/Collector/Extensions/TimeCollection.php b/app/Helpers/Collector/Extensions/TimeCollection.php index fb92e3d41f..7d344d1725 100644 --- a/app/Helpers/Collector/Extensions/TimeCollection.php +++ b/app/Helpers/Collector/Extensions/TimeCollection.php @@ -102,8 +102,6 @@ trait TimeCollection return $this; } - - /** * Collect transactions updated on a specific date. * diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index c12f3da83b..11d5cb155c 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -654,8 +654,6 @@ class GroupCollector implements GroupCollectorInterface } // or parse the rest. $journalId = (int)$augumentedJournal->transaction_journal_id; - - if (array_key_exists($journalId, $groups[$groupId]['transactions'])) { // append data to existing group + journal (for multiple tags or multiple attachments) $groups[$groupId]['transactions'][$journalId] = $this->mergeTags($groups[$groupId]['transactions'][$journalId], $augumentedJournal); diff --git a/app/Helpers/Report/PopupReport.php b/app/Helpers/Report/PopupReport.php index 8230672a3c..543a7a46a5 100644 --- a/app/Helpers/Report/PopupReport.php +++ b/app/Helpers/Report/PopupReport.php @@ -79,8 +79,6 @@ class PopupReport implements PopupReportInterface $repos = app(CurrencyRepositoryInterface::class); $currency = $repos->find((int)$currencyId); } - - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector @@ -116,8 +114,6 @@ class PopupReport implements PopupReportInterface $repos = app(CurrencyRepositoryInterface::class); $currency = $repos->find((int)$currencyId); } - - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setAccounts($attributes['accounts']) diff --git a/app/Helpers/Webhook/Sha3SignatureGenerator.php b/app/Helpers/Webhook/Sha3SignatureGenerator.php index 8077432f9d..8f06f1604a 100644 --- a/app/Helpers/Webhook/Sha3SignatureGenerator.php +++ b/app/Helpers/Webhook/Sha3SignatureGenerator.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Helpers\Webhook; diff --git a/app/Helpers/Webhook/SignatureGeneratorInterface.php b/app/Helpers/Webhook/SignatureGeneratorInterface.php index cf27c888b1..ebbc8a5278 100644 --- a/app/Helpers/Webhook/SignatureGeneratorInterface.php +++ b/app/Helpers/Webhook/SignatureGeneratorInterface.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Helpers\Webhook; diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index 6e37dbd1f8..d2a8f28e54 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index 1d45e1a99e..35049ecc49 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -166,8 +166,6 @@ class EditController extends Controller ) ); } - - /** * Update the account. * diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 6791f5be58..028e2cfce6 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -181,6 +181,4 @@ class IndexController extends Controller return prefixView('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts')); } - - } diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 647fff39ef..d3dab251f0 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -95,8 +95,6 @@ class ReconcileController extends Controller if (!$this->isEditableAccount($account)) { return $this->redirectAccountToAccount($account); // @codeCoverageIgnore } - - if (AccountType::ASSET !== $account->accountType->type) { // @codeCoverageIgnoreStart session()->flash('error', (string) trans('firefly.must_be_asset_account')); diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 0c22048ff8..852e87ace7 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -72,9 +72,6 @@ class ShowController extends Controller } ); } - - - /** * Show an account. * @@ -167,8 +164,6 @@ class ShowController extends Controller if (!$this->isEditableAccount($account)) { return $this->redirectAccountToAccount($account); // @codeCoverageIgnore } - - $location = $this->repository->getLocation($account); $isLiability = $this->repository->isLiability($account); $attachments = $this->repository->getAttachments($account); diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index bcfda6f939..fd8bbb92dd 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -171,8 +171,6 @@ class AttachmentController extends Controller return $attachment; } ); - - return prefixView('attachments.index', compact('set')); } diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index f5f2c776fd..edfdbb3399 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -67,8 +67,6 @@ class LoginController extends Controller parent::__construct(); $this->middleware('guest')->except('logout'); } - - /** * Handle a login request to the application. * @@ -216,8 +214,6 @@ class LoginController extends Controller $cookieName = config('google2fa.cookie_name', 'google2fa_token'); request()->cookies->set($cookieName, 'invalid'); } - - return prefixView('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title')); } diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php index 3b05ee956a..7e8271b4da 100644 --- a/app/Http/Controllers/Bill/CreateController.php +++ b/app/Http/Controllers/Bill/CreateController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; - - use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php index 634a40cc56..80db43dcdb 100644 --- a/app/Http/Controllers/Bill/DeleteController.php +++ b/app/Http/Controllers/Bill/DeleteController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php index 37ec000360..69cc71b0c1 100644 --- a/app/Http/Controllers/Bill/EditController.php +++ b/app/Http/Controllers/Bill/EditController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; - - use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\BillUpdateRequest; @@ -64,8 +62,6 @@ class EditController extends Controller } ); } - - /** * Edit a bill. * @@ -112,8 +108,6 @@ class EditController extends Controller return prefixView('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled')); } - - /** * Update a bill. * diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php index 84b15d9e4f..cf78dd5d17 100644 --- a/app/Http/Controllers/Bill/IndexController.php +++ b/app/Http/Controllers/Bill/IndexController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; - - use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Bill; @@ -73,8 +71,6 @@ class IndexController extends Controller { $this->cleanupObjectGroups(); $this->repository->correctOrder(); - - $start = session('start'); $end = session('end'); $collection = $this->repository->getBills(); @@ -100,8 +96,6 @@ class IndexController extends Controller 'bills' => [], ], ]; - - /** @var Bill $bill */ foreach ($collection as $bill) { $array = $transformer->transform($bill); @@ -145,8 +139,6 @@ class IndexController extends Controller return prefixView('bills.index', compact('bills', 'sums', 'total', 'totals')); } - - /** * @param array $bills * diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php index c8c9484eaf..f392a48f26 100644 --- a/app/Http/Controllers/Bill/ShowController.php +++ b/app/Http/Controllers/Bill/ShowController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; - - use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; @@ -118,8 +116,6 @@ class ShowController extends Controller return redirect(route('bills.show', [$bill->id])); } - - /** * Show a bill. * @@ -182,8 +178,6 @@ class ShowController extends Controller } // @codeCoverageIgnoreEnd - - return prefixView('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle')); } diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php index e5d8d0f57a..d2de3e194f 100644 --- a/app/Http/Controllers/Budget/AvailableBudgetController.php +++ b/app/Http/Controllers/Budget/AvailableBudgetController.php @@ -127,8 +127,6 @@ class AvailableBudgetController extends Controller return true; } ); - - $page = (int)($request->get('page') ?? 1); return prefixView('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies')); @@ -245,8 +243,6 @@ class AvailableBudgetController extends Controller return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')])); } - - $this->abRepository->update($availableBudget, ['amount' => $amount]); session()->flash('success', trans('firefly.updated_ab')); diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php index 3ace4acb71..c281774a4b 100644 --- a/app/Http/Controllers/Budget/BudgetLimitController.php +++ b/app/Http/Controllers/Budget/BudgetLimitController.php @@ -161,8 +161,6 @@ class BudgetLimitController extends Controller if ($request->expectsJson()) { $array = $limit->toArray(); - - // add some extra meta data: $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency); $array['spent'] = $spentArr[$currency->id]['sum'] ?? '0'; diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index d908b03ffb..7c9501b325 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; - - use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\BudgetFormStoreRequest; @@ -50,8 +48,6 @@ class CreateController extends Controller public function __construct() { parent::__construct(); - - $this->middleware( function ($request, $next) { app('view')->share('title', (string) trans('firefly.budgets')); @@ -63,8 +59,6 @@ class CreateController extends Controller } ); } - - /** * Form to create a budget. * @@ -108,8 +102,6 @@ class CreateController extends Controller return prefixView('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods')); } - - /** * Stores a budget. * diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index d547ced8a0..40549eaccc 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; @@ -61,8 +59,6 @@ class DeleteController extends Controller } ); } - - /** * Deletes a budget. * diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index f0a728669d..020193f276 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; - - use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\BudgetFormUpdateRequest; diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 589a60f9a0..2c2b415aa7 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; - - use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; @@ -133,8 +131,6 @@ class ShowController extends Controller return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end')); } - - /** * Show a single budget. * @@ -148,8 +144,6 @@ class ShowController extends Controller /** @var Carbon $start */ $allStart = session('first', Carbon::now()->startOfYear()); $allEnd = today(); - - $page = (int) $request->get('page'); $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; $limits = $this->getLimits($budget, $allStart, $allEnd); diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php index e96c30ae78..8b4650e38b 100644 --- a/app/Http/Controllers/Category/CreateController.php +++ b/app/Http/Controllers/Category/CreateController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; - - use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\CategoryFormRequest; @@ -62,8 +60,6 @@ class CreateController extends Controller } ); } - - /** * Create category. * @@ -81,8 +77,6 @@ class CreateController extends Controller return prefixView('categories.create', compact('subTitle')); } - - /** * Store new category. * diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php index d6b406503d..65165015fe 100644 --- a/app/Http/Controllers/Category/DeleteController.php +++ b/app/Http/Controllers/Category/DeleteController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php index c1552813e8..1e3d3f8a60 100644 --- a/app/Http/Controllers/Category/EditController.php +++ b/app/Http/Controllers/Category/EditController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; - - use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\CategoryFormRequest; @@ -64,8 +62,6 @@ class EditController extends Controller } ); } - - /** * Edit a category. * @@ -119,8 +115,6 @@ class EditController extends Controller if (count($this->attachments->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore } - - $redirect = redirect($this->getPreviousUri('categories.edit.uri')); if (1 === (int)$request->get('return_to_edit')) { diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php index 19c974cfdc..8443e5b910 100644 --- a/app/Http/Controllers/Category/IndexController.php +++ b/app/Http/Controllers/Category/IndexController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; @@ -60,8 +58,6 @@ class IndexController extends Controller } ); } - - /** * Show all categories. * diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 5d3461edf1..3e0844cfb1 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; - - use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Http\Controllers\Controller; @@ -105,8 +103,6 @@ class NoCategoryController extends Controller return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end')); } - - /** * Show all transactions without a category. * diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 4ba3d743b9..ad175fd110 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -65,8 +65,6 @@ class ShowController extends Controller } ); } - - /** * Show a single category. * diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 997a2c26c9..c2ab96d99c 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -75,11 +75,7 @@ class AccountController extends Controller return $next($request); } ); - - } - - /** * Shows the balances for all the user's expense accounts (on the front page). * @@ -333,8 +329,6 @@ class AccountController extends Controller $defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray(); Log::debug('Default set is ', $defaultSet); $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); - - Log::debug('Frontpage preference set is ', $frontPage->data); if (0 === count($frontPage->data)) { app('preferences')->set('frontPageAccounts', $defaultSet); @@ -471,8 +465,6 @@ class AccountController extends Controller { return response()->json($this->accountBalanceChart($accounts, $start, $end)); } - - /** * Shows the balances for all the user's revenue accounts. * diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 3e06e23d3b..b6e385c180 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -50,8 +50,6 @@ class BillController extends Controller parent::__construct(); $this->generator = app(GeneratorInterface::class); } - - /** * Shows all bills and whether or not they've been paid this month (pie chart). * @@ -94,8 +92,6 @@ class BillController extends Controller return response()->json($data); } - - /** * Shows overview for a single bill. * diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index a3518a925a..6e90b688e7 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -77,8 +77,6 @@ class BudgetController extends Controller } ); } - - /** * Shows overview of a single budget. * @@ -143,8 +141,6 @@ class BudgetController extends Controller return response()->json($data); } - - /** * Shows the amount left in a specific budget limit. * @@ -196,8 +192,6 @@ class BudgetController extends Controller return response()->json($data); } - - /** * Shows how much is spent per asset account. * @@ -265,8 +259,6 @@ class BudgetController extends Controller return response()->json($data); } - - /** * Shows how much is spent per category. * @@ -330,8 +322,6 @@ class BudgetController extends Controller return response()->json($data); } - - /** * Shows how much is spent per expense account. * @@ -398,8 +388,6 @@ class BudgetController extends Controller return response()->json($data); } - - /** * Shows a budget list with spent/left/overspent. * @@ -431,8 +419,6 @@ class BudgetController extends Controller return response()->json($data); } - - /** * Shows a budget overview chart (spent and budgeted). * @@ -508,8 +494,6 @@ class BudgetController extends Controller return response()->json($data); } - - /** * Shows a chart for transactions without a budget. * diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 5ecdb02468..1a0541f31d 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -60,8 +60,6 @@ class CategoryController extends Controller // create chart generator: $this->generator = app(GeneratorInterface::class); } - - /** * Show an overview for a category for all time, per month/week/year. * TODO test method, for category refactor. @@ -94,8 +92,6 @@ class CategoryController extends Controller return response()->json($data); } - - /** * Shows the category chart on the front page. * TODO test method, for category refactor. @@ -116,8 +112,6 @@ class CategoryController extends Controller } $frontPageGenerator = new FrontpageChartGenerator($start, $end); - - $chartData = $frontPageGenerator->generate(); $data = $this->generator->multiSet($chartData); $cache->store($data); @@ -153,8 +147,6 @@ class CategoryController extends Controller return response()->json($data); } - - /** * Chart for period for transactions without a category. * TODO test me. @@ -205,8 +197,6 @@ class CategoryController extends Controller $cache->addProperty($end); $cache->addProperty($category->id); $cache->addProperty('chart.category.period-chart'); - - if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } @@ -295,8 +285,6 @@ class CategoryController extends Controller 'type' => 'bar', 'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green ]; - - // loop empty periods: foreach (array_keys($periods) as $period) { $label = $periods[$period]; diff --git a/app/Http/Controllers/Chart/DoubleReportController.php b/app/Http/Controllers/Chart/DoubleReportController.php index 87c62cea35..504e8b712e 100644 --- a/app/Http/Controllers/Chart/DoubleReportController.php +++ b/app/Http/Controllers/Chart/DoubleReportController.php @@ -247,8 +247,6 @@ class DoubleReportController extends Controller return response()->json($data); } - - /** * @param Collection $accounts * @param Collection $others diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index 32e0bbd641..3ce50ae38c 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -64,8 +64,6 @@ class ExpenseReportController extends Controller } ); } - - /** * Main chart that shows income and expense for a combination of expense/revenue accounts. * diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php index a187e74b55..950d231287 100644 --- a/app/Http/Controllers/Chart/TagReportController.php +++ b/app/Http/Controllers/Chart/TagReportController.php @@ -171,8 +171,6 @@ class TagReportController extends Controller return response()->json($data); } - - /** * @param Collection $accounts * @param Collection $tags @@ -427,8 +425,6 @@ class TagReportController extends Controller return response()->json($data); } - - /** * @param Collection $accounts * @param Collection $tags @@ -462,8 +458,6 @@ class TagReportController extends Controller return response()->json($data); } - - /** * TODO duplicate function * diff --git a/app/Http/Controllers/Chart/TransactionController.php b/app/Http/Controllers/Chart/TransactionController.php index 2f8061e919..54263eac1f 100644 --- a/app/Http/Controllers/Chart/TransactionController.php +++ b/app/Http/Controllers/Chart/TransactionController.php @@ -68,8 +68,6 @@ class TransactionController extends Controller if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } - - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end); @@ -115,8 +113,6 @@ class TransactionController extends Controller if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } - - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end); @@ -175,8 +171,6 @@ class TransactionController extends Controller if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } - - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end); @@ -234,8 +228,6 @@ class TransactionController extends Controller if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } - - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index ef272460f9..6d3bbedf34 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -76,8 +76,6 @@ abstract class Controller extends BaseController $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize')); $maxPostSize = app('steam')->phpBytes(ini_get('post_max_size')); $uploadSize = min($maxFileSize, $maxPostSize); - - app('view')->share('uploadSize', $uploadSize); // share is alpha, is beta diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index e800be82bf..1f950ed0b0 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -21,8 +21,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; - - use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Requests\CurrencyFormRequest; use FireflyIII\Models\TransactionCurrency; @@ -67,8 +65,6 @@ class CurrencyController extends Controller } ); } - - /** * Create a currency. * @@ -346,8 +342,6 @@ class CurrencyController extends Controller return prefixView('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner')); } - - /** * Store new currency. * @@ -394,8 +388,6 @@ class CurrencyController extends Controller return $redirect; } - - /** * Updates a currency. * @@ -421,8 +413,6 @@ class CurrencyController extends Controller return redirect(route('currencies.index')); // @codeCoverageIgnoreEnd } - - $currency = $this->repository->update($currency, $data); Log::channel('audit')->info('Updated (POST) currency.', $data); $request->session()->flash('success', (string) trans('firefly.updated_currency', ['name' => $currency->name])); diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php index 30d472d95c..200c2cc775 100644 --- a/app/Http/Controllers/Export/IndexController.php +++ b/app/Http/Controllers/Export/IndexController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Export; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c581bc32be..a1c543e1cc 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -74,8 +74,6 @@ class HomeController extends Controller $isCustomRange = false; Log::debug('Received dateRange', ['start' => $request->get('start'), 'end' => $request->get('end'), 'label' => $request->get('label')]); - - // check if the label is "everything" or "Custom range" which will betray // a possible problem with the budgets. if ($label === (string)trans('firefly.everything') || $label === (string)trans('firefly.customRange')) { @@ -98,8 +96,6 @@ class HomeController extends Controller return response()->json(['ok' => 'ok']); } - - /** * Show index. * @@ -134,8 +130,6 @@ class HomeController extends Controller /** @var BillRepositoryInterface $billRepository */ $billRepository = app(BillRepositoryInterface::class); $billCount = $billRepository->getBills()->count(); - - // collect groups for each transaction. foreach ($accounts as $account) { /** @var GroupCollectorInterface $collector */ diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index 552733d74f..351db67040 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -36,8 +36,6 @@ use Illuminate\Http\Request; */ class AutoCompleteController extends Controller { - - /** * Searches in the titles of all transaction journals. * The result is limited to the top 15 unique results. @@ -78,8 +76,6 @@ class AutoCompleteController extends Controller // give another key for consistency $array[$index]['name'] = sprintf('#%d: %s', $item['transaction_group_id'], $item['description']); } - - return response()->json($array); } diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 98df9ede43..ca69682029 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -61,8 +61,6 @@ class BoxController extends Controller $opsRepository = app(OperationsRepositoryInterface::class); /** @var AvailableBudgetRepositoryInterface $abRepository */ $abRepository = app(AvailableBudgetRepositoryInterface::class); - - /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ @@ -127,8 +125,6 @@ class BoxController extends Controller return response()->json($return); } - - /** * Current total balance. * @@ -209,8 +205,6 @@ class BoxController extends Controller 'size' => count($sums), 'preferred' => $currency->id, ]; - - $cache->store($response); return response()->json($response); @@ -256,8 +250,6 @@ class BoxController extends Controller ); $netWorthSet = $netWorthHelper->getNetWorthByCurrency($filtered, $date); - - $return = []; foreach ($netWorthSet as $data) { /** @var TransactionCurrency $currency */ diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php index ff5bbc7814..297c48f35d 100644 --- a/app/Http/Controllers/Json/BudgetController.php +++ b/app/Http/Controllers/Json/BudgetController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Json; - - use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionCurrency; diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index fdcea33607..1aabc1a206 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -162,8 +162,6 @@ class ReconcileController extends Controller $view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage()); } // @codeCoverageIgnoreEnd - - $return = [ 'post_uri' => $route, 'html' => $view, diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index 3c647a4682..4fa046cd72 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -118,8 +118,6 @@ class RecurrenceController extends Controller $occurrences = $this->recurring->getXOccurrences($repetition, $actualStart, $repetitions); break; } - - /** @var Carbon $current */ foreach ($occurrences as $current) { if ($current->gte($start)) { @@ -179,8 +177,6 @@ class RecurrenceController extends Controller ]; } Log::debug('Dropdown is', $result); - - return response()->json($result); } } diff --git a/app/Http/Controllers/Json/RuleController.php b/app/Http/Controllers/Json/RuleController.php index 5a070e7b29..34b9dd124f 100644 --- a/app/Http/Controllers/Json/RuleController.php +++ b/app/Http/Controllers/Json/RuleController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Json; - - use FireflyIII\Http\Controllers\Controller; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -89,8 +87,6 @@ class RuleController extends Controller Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage())); $view = 'Could not render view.'; } - - return response()->json(['html' => $view]); } diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php index 1b298fb074..111b2024fc 100644 --- a/app/Http/Controllers/ObjectGroup/DeleteController.php +++ b/app/Http/Controllers/ObjectGroup/DeleteController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\ObjectGroup; use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface; diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php index aa5b3214f2..ec4a48c05e 100644 --- a/app/Http/Controllers/ObjectGroup/EditController.php +++ b/app/Http/Controllers/ObjectGroup/EditController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\ObjectGroupFormRequest; use FireflyIII\Models\ObjectGroup; @@ -75,8 +73,6 @@ class EditController extends Controller return prefixView('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup')); } - - /** * Update a piggy bank. * diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php index 1c8b5e7362..4100f2df28 100644 --- a/app/Http/Controllers/ObjectGroup/IndexController.php +++ b/app/Http/Controllers/ObjectGroup/IndexController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\ObjectGroup; use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface; diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php index 95ced60014..03d8a9d359 100644 --- a/app/Http/Controllers/PiggyBank/AmountController.php +++ b/app/Http/Controllers/PiggyBank/AmountController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; - - use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\PiggyBank; diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php index 45ff1bc280..41c6f8743b 100644 --- a/app/Http/Controllers/PiggyBank/CreateController.php +++ b/app/Http/Controllers/PiggyBank/CreateController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; - - use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\PiggyBankStoreRequest; @@ -82,8 +80,6 @@ class CreateController extends Controller return prefixView('piggy-banks.create', compact('subTitle', 'subTitleIcon')); } - - /** * Store a new piggy bank. * @@ -115,8 +111,6 @@ class CreateController extends Controller if (count($this->attachments->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore } - - $redirect = redirect($this->getPreviousUri('piggy-banks.create.uri')); if (1 === (int) $request->get('create_another')) { diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php index 27803dfbd1..538916b550 100644 --- a/app/Http/Controllers/PiggyBank/DeleteController.php +++ b/app/Http/Controllers/PiggyBank/DeleteController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php index 6e81b8f793..3eafabb5c2 100644 --- a/app/Http/Controllers/PiggyBank/EditController.php +++ b/app/Http/Controllers/PiggyBank/EditController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; - - use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\PiggyBankUpdateRequest; @@ -105,8 +103,6 @@ class EditController extends Controller return prefixView('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled')); } - - /** * Update a piggy bank. * @@ -136,8 +132,6 @@ class EditController extends Controller if (count($this->attachments->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore } - - $redirect = redirect($this->getPreviousUri('piggy-banks.edit.uri')); if (1 === (int) $request->get('return_to_edit')) { diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php index 56df847f53..002995ca56 100644 --- a/app/Http/Controllers/PiggyBank/IndexController.php +++ b/app/Http/Controllers/PiggyBank/IndexController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; - - use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\PiggyBank; diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.php index e28943051d..6b508de0b2 100644 --- a/app/Http/Controllers/PiggyBank/ShowController.php +++ b/app/Http/Controllers/PiggyBank/ShowController.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; - - use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\PiggyBank; diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 7ebd09fb6a..9cb593ce9b 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -75,6 +75,4 @@ class ReportController extends Controller return response()->json(['html' => $html]); } - - } diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 3c8849be03..b32a89bd7c 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -154,8 +154,6 @@ class CreateController extends Controller 'apply_rules' => true, ]; } - - $request->session()->flash('preFilled', $preFilled); return prefixView( @@ -195,8 +193,6 @@ class CreateController extends Controller RecurrenceRepetition::WEEKEND_TO_FRIDAY => (string) trans('firefly.jump_to_friday'), RecurrenceRepetition::WEEKEND_TO_MONDAY => (string) trans('firefly.jump_to_monday'), ]; - - $hasOldInput = null !== $request->old('_token'); // flash some data $preFilled = [ 'first_date' => $tomorrow->format('Y-m-d'), @@ -211,8 +207,6 @@ class CreateController extends Controller compact('tomorrow', 'oldRepetitionType', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets') ); } - - /** * Store a recurring transaction. * diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index b58e940eb6..27677a923f 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Recurring; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Recurrence; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 1d94838b01..14c5e398d3 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Recurring; - - use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; @@ -178,8 +176,6 @@ class EditController extends Controller if (count($this->attachments->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore } - - app('preferences')->mark(); $redirect = redirect($this->getPreviousUri('recurrences.edit.uri')); if (1 === (int) $request->get('return_to_edit')) { @@ -192,6 +188,4 @@ class EditController extends Controller // redirect to previous URL. return $redirect; } - - } diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index de1404bb9f..67b9adf289 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Recurring; - - use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php index 652aaed8d0..7d3c1d8613 100644 --- a/app/Http/Controllers/Recurring/ShowController.php +++ b/app/Http/Controllers/Recurring/ShowController.php @@ -66,8 +66,6 @@ class ShowController extends Controller } ); } - - /** * Show a single recurring transaction. * diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index 1d823b8e20..3f4eb79ad9 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -56,8 +56,6 @@ class BalanceController extends Controller } ); } - - /** * Show overview of budget balances. * @@ -136,8 +134,6 @@ class BalanceController extends Controller $report['budgets'][$budgetId]['spent'] = $spent; // get transactions in budget } - - try { $result = prefixView('reports.partials.balance', compact('report'))->render(); // @codeCoverageIgnoreStart diff --git a/app/Http/Controllers/Report/BillController.php b/app/Http/Controllers/Report/BillController.php index e8cea95237..10b62c5c08 100644 --- a/app/Http/Controllers/Report/BillController.php +++ b/app/Http/Controllers/Report/BillController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; - - use Carbon\Carbon; use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Http\Controllers\Controller; @@ -52,13 +50,9 @@ class BillController extends Controller if ($cache->has()) { return $cache->get(); // @codeCoverageIgnore } - - /** @var ReportHelperInterface $helper */ $helper = app(ReportHelperInterface::class); $report = $helper->getBillReport($accounts, $start, $end); - - try { $result = prefixView('reports.partials.bills', compact('report'))->render(); // @codeCoverageIgnoreStart diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index 1a9eeb9a57..ebe22808fd 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -321,8 +321,6 @@ class BudgetController extends Controller $periods = app('navigation')->listOfPeriods($start, $end); $keyFormat = app('navigation')->preferredCarbonFormat($start, $end); - - // list expenses for budgets in account(s) $expenses = $this->opsRepository->listExpenses($start, $end, $accounts); diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index d5558f4ee6..db532cf95f 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -124,8 +124,6 @@ class CategoryController extends Controller } } } - - // loop income. foreach ($earned as $currency) { $currencyId = $currency['currency_id']; @@ -143,8 +141,6 @@ class CategoryController extends Controller 'currency_decimal_places' => $currency['currency_decimal_places'], 'categories' => [], ]; - - $report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']] = $report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']] ?? diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index 04ee93f96e..4c4b4a503d 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -57,8 +57,6 @@ class OperationsController extends Controller } ); } - - /** * View of income and expense. * diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.php index 50edfafe84..10a0586aca 100644 --- a/app/Http/Controllers/Report/TagController.php +++ b/app/Http/Controllers/Report/TagController.php @@ -118,8 +118,6 @@ class TagController extends Controller } } } - - // loop income. foreach ($earned as $currency) { $currencyId = $currency['currency_id']; @@ -137,8 +135,6 @@ class TagController extends Controller 'currency_decimal_places' => $currency['currency_decimal_places'], 'tags' => [], ]; - - $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']] = $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']] ?? diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 8dc4988fe1..9e75606025 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -406,8 +406,6 @@ class ReportController extends Controller return redirect($uri); } - - /** * Get a tag report. * diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php index c2b5e6f8b0..f19d1f37a4 100644 --- a/app/Http/Controllers/Rule/DeleteController.php +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Rule; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Rule; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php index 873a040549..34b8ede876 100644 --- a/app/Http/Controllers/Rule/EditController.php +++ b/app/Http/Controllers/Rule/EditController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Rule; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\RuleFormRequest; use FireflyIII\Models\Rule; @@ -98,8 +96,6 @@ class EditController extends Controller } $oldTriggers = $this->parseFromOperators($operators); } - - // has old input? if (count($request->old()) > 0) { $oldTriggers = $this->getPreviousTriggers($request); diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index ecab505702..db6877c3b0 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Rule; - - use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\SelectTransactionsRequest; @@ -103,8 +101,6 @@ class SelectController extends Controller return redirect()->route('rules.index'); } - - /** * View to select transactions by a rule. * @@ -206,8 +202,6 @@ class SelectController extends Controller if (0 === count($triggers)) { return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore } - - // create new rule engine: $newRuleEngine = app(RuleEngineInterface::class); @@ -235,6 +229,4 @@ class SelectController extends Controller return response()->json(['html' => $view, 'warning' => $warning]); } - - } diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php index 31e7969d72..5f5debef6a 100644 --- a/app/Http/Controllers/RuleGroup/CreateController.php +++ b/app/Http/Controllers/RuleGroup/CreateController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\RuleGroup; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\RuleGroupFormRequest; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php index f83f73d9ec..f65deeb4f2 100644 --- a/app/Http/Controllers/RuleGroup/DeleteController.php +++ b/app/Http/Controllers/RuleGroup/DeleteController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\RuleGroup; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; @@ -61,8 +59,6 @@ class DeleteController extends Controller } ); } - - /** * Delete a rule group. * diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php index 6dbe96807a..2b349cbfca 100644 --- a/app/Http/Controllers/RuleGroup/EditController.php +++ b/app/Http/Controllers/RuleGroup/EditController.php @@ -79,8 +79,6 @@ class EditController extends Controller return redirect(route('rules.index')); } - - /** * Edit a rule group. * @@ -97,8 +95,6 @@ class EditController extends Controller $preFilled = [ 'active' => $hasOldInput ? (bool)$request->old('active') : $ruleGroup->active, ]; - - // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('rule-groups.edit.fromUpdate')) { $this->rememberPreviousUri('rule-groups.edit.uri'); diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.php index bb57a6cb72..cd17264bfe 100644 --- a/app/Http/Controllers/RuleGroup/ExecutionController.php +++ b/app/Http/Controllers/RuleGroup/ExecutionController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\RuleGroup; - - use Carbon\Carbon; use Exception; use FireflyIII\Http\Controllers\Controller; @@ -63,8 +61,6 @@ class ExecutionController extends Controller } ); } - - /** * Execute the given rulegroup on a set of existing transactions. * @@ -117,6 +113,4 @@ class ExecutionController extends Controller return prefixView('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle')); } - - } diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 0d6e4d6fef..a5e0742b92 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\System; - - use Artisan; use Cache; use Exception; @@ -49,8 +47,6 @@ class InstallController extends Controller public const OTHER_ERROR = 'An unknown error prevented Firefly III from executing the upgrade commands. Sorry.'; private array $upgradeCommands; private string $lastError; - - /** @noinspection MagicMethodsValidityInspection */ /** @noinspection PhpMissingParentConstructorInspection */ /** diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 70433f63c1..ea3656db00 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -329,8 +329,6 @@ class TagController extends Controller if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments')); // @codeCoverageIgnore } - - $redirect = redirect($this->getPreviousUri('tags.create.uri')); if (1 === (int) $request->get('create_another')) { // @codeCoverageIgnoreStart @@ -372,8 +370,6 @@ class TagController extends Controller if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments')); // @codeCoverageIgnore } - - $redirect = redirect($this->getPreviousUri('tags.edit.uri')); if (1 === (int) $request->get('return_to_edit')) { // @codeCoverageIgnoreStart diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index f630f3ec71..70e4c86231 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\BulkEditJournalRequest; use FireflyIII\Models\TransactionJournal; @@ -40,8 +38,6 @@ class BulkController extends Controller { /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; - - /** * BulkController constructor. * @@ -86,8 +82,6 @@ class BulkController extends Controller return prefixView('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList')); } - - /** * Update all journals. * diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 6e75b311fb..58eb195abb 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -76,8 +76,6 @@ class ConvertController extends Controller } ); } - - /** * Show overview of a to be converted transaction. * diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php index c8f3c8c6d5..9ef84adbef 100644 --- a/app/Http/Controllers/Transaction/CreateController.php +++ b/app/Http/Controllers/Transaction/CreateController.php @@ -112,8 +112,6 @@ class CreateController extends Controller $previousUri = str_replace($search, '', $previousUri); session()->put('preFilled', $preFilled); - - return prefixView( 'transactions.create', compact( diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php index 7846e1f830..e82fe335b4 100644 --- a/app/Http/Controllers/Transaction/DeleteController.php +++ b/app/Http/Controllers/Transaction/DeleteController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionGroup; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; @@ -120,6 +118,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUri('transactions.delete.uri')); } - - } diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php index 6dc9475688..4c08faa222 100644 --- a/app/Http/Controllers/Transaction/EditController.php +++ b/app/Http/Controllers/Transaction/EditController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; - - use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionGroup; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -58,8 +56,6 @@ class EditController extends Controller } ); } - - /** * @param TransactionGroup $transactionGroup * @@ -87,8 +83,6 @@ class EditController extends Controller $parts = parse_url($previousUri); $search = sprintf('?%s', $parts['query'] ?? ''); $previousUri = str_replace($search, '', $previousUri); - - return prefixView( 'transactions.edit', compact( diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php index c82cbeedd9..bde64ee96e 100644 --- a/app/Http/Controllers/Transaction/IndexController.php +++ b/app/Http/Controllers/Transaction/IndexController.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; - - use Carbon\Carbon; use Exception; use FireflyIII\Helpers\Collector\GroupCollectorInterface; diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 96ecbc05b8..d8a5d3d2f0 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -110,8 +110,6 @@ class MassController extends Controller } } } - - app('preferences')->mark(); session()->flash('success', (string) trans_choice('firefly.mass_deleted_transactions_success', $count)); diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index d6bbca217c..7ddba39dff 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -73,8 +73,6 @@ class Authenticate return $next($request); } - - /** * Determine if the user is logged in to any of the given guards. * diff --git a/app/Http/Middleware/InstallationId.php b/app/Http/Middleware/InstallationId.php index 20a8177349..a15e528ccb 100644 --- a/app/Http/Middleware/InstallationId.php +++ b/app/Http/Middleware/InstallationId.php @@ -20,8 +20,6 @@ */ declare(strict_types=1); - - namespace FireflyIII\Http\Middleware; use Closure; @@ -50,8 +48,6 @@ class InstallationId */ public function handle($request, Closure $next) { - - $this->generateInstallationId(); return $next($request); diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index ea0b291e23..cb728680f9 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -76,8 +76,6 @@ class Installer OAuthKeys::verifyKeysRoutine(); // update scheme version // update firefly version - - return $next($request); } diff --git a/app/Http/Middleware/InterestingMessage.php b/app/Http/Middleware/InterestingMessage.php index 45f0eafab6..cbd18c0fdb 100644 --- a/app/Http/Middleware/InterestingMessage.php +++ b/app/Http/Middleware/InterestingMessage.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Middleware; - - use Closure; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 61f07ec599..75c5d16508 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -172,8 +172,6 @@ class RecurrenceFormRequest extends FormRequest } return $return; - - } /** @@ -324,8 +322,6 @@ class RecurrenceFormRequest extends FormRequest $destinationId = (int)$data['destination_id']; break; } - - // validate source account. $validSource = $accountValidator->validateSource($sourceId, null, null); diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index fdc219989e..a357525f66 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -174,8 +174,6 @@ class CreateRecurringTransactions implements ShouldQueue return false; } - - // is no longer running if ($this->repeatUntilHasPassed($recurrence)) { Log::info( diff --git a/app/Jobs/SubmitTelemetryData.php b/app/Jobs/SubmitTelemetryData.php index c29623bdae..323d5fe409 100644 --- a/app/Jobs/SubmitTelemetryData.php +++ b/app/Jobs/SubmitTelemetryData.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Jobs; - - use Carbon\Carbon; use Exception; use FireflyIII\Exceptions\FireflyException; diff --git a/app/Mail/AccessTokenCreatedMail.php b/app/Mail/AccessTokenCreatedMail.php index 848dfbac58..0d1da11266 100644 --- a/app/Mail/AccessTokenCreatedMail.php +++ b/app/Mail/AccessTokenCreatedMail.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Mail; - - use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/NewIPAddressWarningMail.php b/app/Mail/NewIPAddressWarningMail.php index 855b97076b..5bb38a20cf 100644 --- a/app/Mail/NewIPAddressWarningMail.php +++ b/app/Mail/NewIPAddressWarningMail.php @@ -21,29 +21,9 @@ */ declare(strict_types=1); -/* - * NewIPAddressWarningMail.php - * Copyright (c) 2020 james@firefly-iii.org - * - * This file is part of Firefly III (https://github.com/firefly-iii). - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ namespace FireflyIII\Mail; - use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/OAuthTokenCreatedMail.php b/app/Mail/OAuthTokenCreatedMail.php index 2e2e8e2d7e..9a5342bd57 100644 --- a/app/Mail/OAuthTokenCreatedMail.php +++ b/app/Mail/OAuthTokenCreatedMail.php @@ -27,8 +27,6 @@ use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; use Laravel\Passport\Client; - - /** * Class OAuthTokenCreatedMail * diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index da83308d88..dc9f1281a6 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -28,8 +28,6 @@ use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Carbon; - - /** * FireflyIII\Models\AccountType * diff --git a/app/Models/Budget.php b/app/Models/Budget.php index d018ebfbfc..826567ef12 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -137,8 +137,6 @@ class Budget extends Model { return $this->hasMany(BudgetLimit::class); } - - /** * @codeCoverageIgnore * @return MorphMany diff --git a/app/Models/Category.php b/app/Models/Category.php index b2d6491d29..36d5dcb30d 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -121,8 +121,6 @@ class Category extends Model { return $this->belongsToMany(TransactionJournal::class, 'category_transaction_journal', 'category_id'); } - - /** * @codeCoverageIgnore * @return MorphMany diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index 71716dc57d..ff50e87374 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - - /** * FireflyIII\Models\LinkType * diff --git a/app/Models/Location.php b/app/Models/Location.php index bf6544f514..c8846cf06e 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use Eloquent; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; @@ -32,8 +30,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Support\Carbon; - - /** * FireflyIII\Models\Location * diff --git a/app/Models/Note.php b/app/Models/Note.php index f5543f5d11..245dbaf4b4 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -85,6 +85,4 @@ class Note extends Model { return $this->morphTo(); } - - } diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index 9f11cc4268..0ec8c58207 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -23,14 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - - /** * FireflyIII\Models\ObjectGroup * diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 63e011f844..419be6f8b2 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - - /** * FireflyIII\Models\PiggyBank * diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 12d6b5f9e3..666049215d 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -27,8 +27,6 @@ use Eloquent; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; - - /** * FireflyIII\Models\PiggyBankEvent * diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 2701636f7f..5c77df9618 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use Eloquent; use FireflyIII\User; use Illuminate\Database\Eloquent\Collection; diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index e2eb6c773d..43af735266 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use Eloquent; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 6a79933e9b..b5aac5c1be 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use Carbon\Carbon; use Eloquent; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index 137d59ef73..832f36c90c 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use Eloquent; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index 8db83e6914..f2030342c6 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use Eloquent; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 6bc281100d..3a02993817 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - - /** * FireflyIII\Models\RuleGroup * diff --git a/app/Models/Telemetry.php b/app/Models/Telemetry.php index b08e5ee52d..e9ebd9b239 100644 --- a/app/Models/Telemetry.php +++ b/app/Models/Telemetry.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Models; - - use Eloquent; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index b1ba081fea..96a46a5609 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -30,8 +30,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Query\Builder; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - - /** * FireflyIII\Models\TransactionCurrency * diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 3564d998db..9fb3210c50 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -32,8 +32,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Query\Builder; use Illuminate\Support\Carbon; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - - /** * FireflyIII\Models\TransactionGroup * diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 5bbdd544cf..922caf3382 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -37,8 +37,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - - /** * FireflyIII\Models\TransactionJournal * diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index 18705d949d..43fc74d58c 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Models; - - use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/WebhookAttempt.php b/app/Models/WebhookAttempt.php index 2fc8420963..b138bdd80d 100644 --- a/app/Models/WebhookAttempt.php +++ b/app/Models/WebhookAttempt.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Models; - - use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php index a05653866c..be3bc14a6c 100644 --- a/app/Models/WebhookMessage.php +++ b/app/Models/WebhookMessage.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Models; - - use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -137,6 +115,4 @@ class WebhookMessage extends Model { return $this->hasMany(WebhookAttempt::class); } - - } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index b7fe1c1fed..1876d368fc 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -64,11 +64,7 @@ class AuthServiceProvider extends ServiceProvider ); $this->registerPolicies(); - - Passport::routes(); Passport::tokensExpireIn(now()->addDays(14)); - - } } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 0a3d376d66..a31b381d4e 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -177,8 +177,6 @@ class EventServiceProvider extends ServiceProvider Session::flash('error', 'Possible email error: ' . $e->getMessage()); } Log::debug('If no error above this line, message was sent.'); - - } ); } diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 2707e8f906..cfc57fe7e9 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -176,15 +176,11 @@ class FireflyServiceProvider extends ServiceProvider // chart generator: $this->app->bind(GeneratorInterface::class, ChartJsGenerator::class); - - // other generators $this->app->bind(UserRepositoryInterface::class, UserRepository::class); $this->app->bind(TransactionTypeRepositoryInterface::class, TransactionTypeRepository::class); $this->app->bind(AttachmentHelperInterface::class, AttachmentHelper::class); - - $this->app->bind( ObjectGroupRepositoryInterface::class, static function (Application $app) { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 92a4e98af2..6658a402b7 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -37,8 +37,6 @@ class RouteServiceProvider extends ServiceProvider * @var string */ public const HOME = '/'; - - /** * This namespace is applied to your controller routes. * diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index b4e973d808..36851b406f 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -31,8 +31,6 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; use Illuminate\Support\Collection; - - /** * Interface AccountRepositoryInterface. */ diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index bde3ae8ad6..85c9c76a4d 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -76,8 +76,6 @@ class AccountTasker implements AccountTaskerInterface 'currency_symbol' => $currency->symbol, 'currency_name' => $currency->name, 'currency_decimal_places' => $currency->decimal_places,]; - - $entry = [ 'name' => $account->name, 'id' => $account->id, diff --git a/app/Repositories/Account/OperationsRepository.php b/app/Repositories/Account/OperationsRepository.php index 13359b22b4..fcdd660788 100644 --- a/app/Repositories/Account/OperationsRepository.php +++ b/app/Repositories/Account/OperationsRepository.php @@ -58,8 +58,6 @@ class OperationsRepository implements OperationsRepositoryInterface $collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation()->withTagInformation(); $journals = $collector->getExtractedJournals(); $array = []; - - foreach ($journals as $journal) { $currencyId = (int)$journal['currency_id']; $array[$currencyId] = $array[$currencyId] ?? [ @@ -114,8 +112,6 @@ class OperationsRepository implements OperationsRepositoryInterface $collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation()->withTagInformation(); $journals = $collector->getExtractedJournals(); $array = []; - - foreach ($journals as $journal) { $currencyId = (int)$journal['currency_id']; $array[$currencyId] = $array[$currencyId] ?? [ diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php index 81cf81138b..e8553b0180 100644 --- a/app/Repositories/Budget/BudgetLimitRepository.php +++ b/app/Repositories/Budget/BudgetLimitRepository.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Budget; - - use Carbon\Carbon; use Exception; use FireflyIII\Exceptions\FireflyException; @@ -428,8 +426,6 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface } catch (Exception $e) { Log::debug(sprintf('Could not delete limit: %s', $e->getMessage())); } - - return null; } // update if exists: diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 3ce432a28a..6f2a8516e5 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -422,8 +422,6 @@ class BudgetRepository implements BudgetRepositoryInterface if (null === $currency) { $currency = app('amount')->getDefaultCurrencyByUser($this->user); } - - if (null === $autoBudget && array_key_exists('auto_budget_type', $data) && array_key_exists('auto_budget_amount', $data) @@ -463,8 +461,6 @@ class BudgetRepository implements BudgetRepositoryInterface if (null !== $autoBudget) { $autoBudget->save(); } - - return $budget; } diff --git a/app/Repositories/Budget/NoBudgetRepository.php b/app/Repositories/Budget/NoBudgetRepository.php index 8b3362e135..cf960845a5 100644 --- a/app/Repositories/Budget/NoBudgetRepository.php +++ b/app/Repositories/Budget/NoBudgetRepository.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Budget; - - use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionCurrency; diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.php index ca58eebfef..74ddcedffb 100644 --- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Budget; - - use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.php index 9b3fcd2c64..d054290e14 100644 --- a/app/Repositories/Budget/OperationsRepository.php +++ b/app/Repositories/Budget/OperationsRepository.php @@ -87,8 +87,6 @@ class OperationsRepository implements OperationsRepositoryInterface { $carbonFormat = app('navigation')->preferredCarbonFormat($start, $end); $data = []; - - // get all transactions: /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); @@ -183,8 +181,6 @@ class OperationsRepository implements OperationsRepositoryInterface // add journal to array: // only a subset of the fields. $journalId = (int)$journal['transaction_journal_id']; - - $array[$currencyId]['budgets'][$budgetId]['transaction_journals'][$journalId] = [ 'amount' => app('steam')->negative($journal['amount']), 'destination_account_id' => $journal['destination_account_id'], @@ -347,8 +343,6 @@ class OperationsRepository implements OperationsRepositoryInterface $array[$foreignId]['sum'] = bcadd($array[$foreignId]['sum'], app('steam')->negative($journal['foreign_amount'])); } } - - return $array; } diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.php index 4296d13179..265dbbbc66 100644 --- a/app/Repositories/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/Budget/OperationsRepositoryInterface.php @@ -43,8 +43,6 @@ interface OperationsRepositoryInterface * @return string */ public function budgetedPerDay(Budget $budget): string; - - /** * @param Collection $budgets * @param Collection $accounts diff --git a/app/Repositories/Category/NoCategoryRepository.php b/app/Repositories/Category/NoCategoryRepository.php index 6883394a52..73e2d28e6a 100644 --- a/app/Repositories/Category/NoCategoryRepository.php +++ b/app/Repositories/Category/NoCategoryRepository.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Category; - - use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; @@ -130,8 +128,6 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface 'name' => (string)trans('firefly.noCategory'), 'transaction_journals' => [], ]; - - // add journal to array: // only a subset of the fields. $journalId = (int)$journal['transaction_journal_id']; diff --git a/app/Repositories/Category/NoCategoryRepositoryInterface.php b/app/Repositories/Category/NoCategoryRepositoryInterface.php index 592526bd09..5285ffea95 100644 --- a/app/Repositories/Category/NoCategoryRepositoryInterface.php +++ b/app/Repositories/Category/NoCategoryRepositoryInterface.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Category; - - use Carbon\Carbon; use FireflyIII\User; use Illuminate\Support\Collection; @@ -97,6 +95,4 @@ interface NoCategoryRepositoryInterface * @return array */ public function sumTransfers(Carbon $start, Carbon $end, ?Collection $accounts = null): array; - - } diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.php index a640186676..3b7319a049 100644 --- a/app/Repositories/Category/OperationsRepository.php +++ b/app/Repositories/Category/OperationsRepository.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Category; - - use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; @@ -101,8 +99,6 @@ class OperationsRepository implements OperationsRepositoryInterface // add journal to array: // only a subset of the fields. $journalId = (int)$journal['transaction_journal_id']; - - $array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [ 'amount' => app('steam')->negative($journal['amount']), 'date' => $journal['date'], @@ -180,8 +176,6 @@ class OperationsRepository implements OperationsRepositoryInterface // add journal to array: // only a subset of the fields. $journalId = (int)$journal['transaction_journal_id']; - - $array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [ 'amount' => app('steam')->positive($journal['amount']), 'date' => $journal['date'], diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index 80fdee57c5..1f2601c059 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -171,8 +171,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface { /** @var UserRepositoryInterface $repository */ $repository = app(UserRepositoryInterface::class); - - if ($repository->hasRole($this->user, 'owner')) { /** @var CurrencyDestroyService $service */ $service = app(CurrencyDestroyService::class); diff --git a/app/Repositories/Journal/JournalCLIRepository.php b/app/Repositories/Journal/JournalCLIRepository.php index 449cf7bdff..691e2c6638 100644 --- a/app/Repositories/Journal/JournalCLIRepository.php +++ b/app/Repositories/Journal/JournalCLIRepository.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Journal; - - use Carbon\Carbon; use DB; use Exception; diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 45f9e760cc..1268306c39 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -43,8 +43,6 @@ use Illuminate\Support\Collection; */ class JournalRepository implements JournalRepositoryInterface { - - /** @var User */ private $user; diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index 6602e06d99..c6a0028461 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -347,8 +347,6 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface } $journalLink->link_type_id = $data['link_type_id'] ? $data['link_type_id'] : $journalLink->link_type_id; - - $journalLink->save(); if (array_key_exists('notes', $data) && null !== $data['notes']) { $this->setNoteText($journalLink, $data['notes']); diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 76eba29447..84793d7e5d 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\PiggyBank; - - use Carbon\Carbon; use Exception; use FireflyIII\Exceptions\FireflyException; diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index a9aa50798c..7055e4cf2b 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -230,8 +230,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface } Log::debug(sprintf('The currency is %s and the amount is %s', $currency->code, $amount)); - - $room = bcsub((string)$piggyBank->targetamount, (string)$repetition->currentamount); $compare = bcmul($repetition->currentamount, '-1'); Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name)); @@ -309,8 +307,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface $currentAmount = $this->getRepetition($piggy)->currentamount ?? '0'; $piggy->name = $piggy->name . ' (' . app('amount')->formatAnything($currency, $currentAmount, false) . ')'; } - - return $set; } diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 05780c8bbe..9b9072ded5 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -55,8 +55,6 @@ class RecurringRepository implements RecurringRepositoryInterface use CalculateRangeOccurrences, CalculateXOccurrences, CalculateXOccurrencesSince, FiltersWeekends; private User $user; - - /** * Destroy a recurring transaction. * @@ -242,8 +240,6 @@ class RecurringRepository implements RecurringRepositoryInterface if ('yearly' === $repetition->repetition_type) { $occurrences = $this->getYearlyInRange($mutator, $end, $skipMod, $repetition->repetition_moment); } - - // filter out all the weekend days: return $this->filterWeekends($repetition, $occurrences); } diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index ffab9e36e8..511c7c5d96 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -31,8 +31,6 @@ use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\User; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; - - /** * Interface RecurringRepositoryInterface * diff --git a/app/Repositories/Tag/OperationsRepository.php b/app/Repositories/Tag/OperationsRepository.php index 38e424a96f..e918d781fb 100644 --- a/app/Repositories/Tag/OperationsRepository.php +++ b/app/Repositories/Tag/OperationsRepository.php @@ -69,8 +69,6 @@ class OperationsRepository implements OperationsRepositoryInterface $journals = $collector->getExtractedJournals(); $array = []; $listedJournals = []; - - foreach ($journals as $journal) { $currencyId = (int)$journal['currency_id']; $array[$currencyId] = $array[$currencyId] ?? [ diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 80ddfecf57..0acb5964b5 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -547,8 +547,6 @@ class TagRepository implements TagRepositoryInterface } $min = -1 === bccomp($amount, $min) ? $amount : $min; } - - if (null === $min) { $min = '0'; } diff --git a/app/Repositories/Telemetry/TelemetryRepositoryInterface.php b/app/Repositories/Telemetry/TelemetryRepositoryInterface.php index 532dd38154..898251fc53 100644 --- a/app/Repositories/Telemetry/TelemetryRepositoryInterface.php +++ b/app/Repositories/Telemetry/TelemetryRepositoryInterface.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Telemetry; - - use Illuminate\Pagination\LengthAwarePaginator; /** diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index bc5ea3ff35..99575cdade 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\TransactionGroup; - - use Carbon\Carbon; use DB; use Exception; @@ -366,8 +364,6 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface Log::error($e->getTraceAsString()); throw new FireflyException($e->getMessage()); } - - } /** diff --git a/app/Repositories/Webhook/WebhookRepository.php b/app/Repositories/Webhook/WebhookRepository.php index 81d2cff16e..871fc9e8b6 100644 --- a/app/Repositories/Webhook/WebhookRepository.php +++ b/app/Repositories/Webhook/WebhookRepository.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Repositories\Webhook; diff --git a/app/Repositories/Webhook/WebhookRepositoryInterface.php b/app/Repositories/Webhook/WebhookRepositoryInterface.php index 6ea5b3ecc2..3fe28ca2e7 100644 --- a/app/Repositories/Webhook/WebhookRepositoryInterface.php +++ b/app/Repositories/Webhook/WebhookRepositoryInterface.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Repositories\Webhook; diff --git a/app/Rules/IsDuplicateTransaction.php b/app/Rules/IsDuplicateTransaction.php index e47ab72012..44ffafb6b3 100644 --- a/app/Rules/IsDuplicateTransaction.php +++ b/app/Rules/IsDuplicateTransaction.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Rules; - - use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Rules/IsTransferAccount.php b/app/Rules/IsTransferAccount.php index 8f01c63d75..cca24a5b62 100644 --- a/app/Rules/IsTransferAccount.php +++ b/app/Rules/IsTransferAccount.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Rules; - - use FireflyIII\Models\TransactionType; use FireflyIII\Validation\AccountValidator; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Rules/IsValidAttachmentModel.php b/app/Rules/IsValidAttachmentModel.php index d75ecb9074..fa67b3d0e9 100644 --- a/app/Rules/IsValidAttachmentModel.php +++ b/app/Rules/IsValidAttachmentModel.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Rules; - - use FireflyIII\Models\Account; use FireflyIII\Models\Bill; use FireflyIII\Models\Budget; diff --git a/app/Rules/LessThanPiggyTarget.php b/app/Rules/LessThanPiggyTarget.php index d56fdc3fce..914667a22c 100644 --- a/app/Rules/LessThanPiggyTarget.php +++ b/app/Rules/LessThanPiggyTarget.php @@ -21,8 +21,6 @@ */ declare(strict_types=1); - - namespace FireflyIII\Rules; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Rules/ValidJournals.php b/app/Rules/ValidJournals.php index 4ad6509e5b..3482fc7579 100644 --- a/app/Rules/ValidJournals.php +++ b/app/Rules/ValidJournals.php @@ -21,8 +21,6 @@ */ declare(strict_types=1); - - namespace FireflyIII\Rules; use FireflyIII\Models\TransactionJournal; diff --git a/app/Rules/ValidRecurrenceRepetitionValue.php b/app/Rules/ValidRecurrenceRepetitionValue.php index 06d2e4c0c1..d6d4ac7893 100644 --- a/app/Rules/ValidRecurrenceRepetitionValue.php +++ b/app/Rules/ValidRecurrenceRepetitionValue.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Rules; - - use Carbon\Carbon; use Illuminate\Contracts\Validation\Rule; use InvalidArgumentException; diff --git a/app/Services/Internal/Destroy/AccountDestroyService.php b/app/Services/Internal/Destroy/AccountDestroyService.php index b54bc98ded..a23d4f39f3 100644 --- a/app/Services/Internal/Destroy/AccountDestroyService.php +++ b/app/Services/Internal/Destroy/AccountDestroyService.php @@ -66,8 +66,6 @@ class AccountDestroyService // delete account meta: $account->accountMeta()->delete(); - - // delete account. try { $account->delete(); diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index 06a75ef635..0f8a7c8343 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -66,8 +66,6 @@ trait AccountServiceTrait return null; } - - return $iban; } diff --git a/app/Services/Internal/Support/BillServiceTrait.php b/app/Services/Internal/Support/BillServiceTrait.php index 652fe9117d..17b0476a3f 100644 --- a/app/Services/Internal/Support/BillServiceTrait.php +++ b/app/Services/Internal/Support/BillServiceTrait.php @@ -61,8 +61,6 @@ trait BillServiceTrait $ruleAction->save(); } } - - /** * @param Bill $bill * @param string $note diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index b0787c3e05..b2974b289b 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -41,8 +41,6 @@ use FireflyIII\Models\RecurrenceTransactionMeta; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Validation\AccountValidator; use Log; - - /** * Trait RecurringTransactionTrait * @@ -136,8 +134,6 @@ trait RecurringTransactionTrait $validator = app(AccountValidator::class); $validator->setUser($recurrence->user); $validator->setTransactionType($recurrence->transactionType->type); - - if (!$validator->validateSource($source->id, null, null)) { throw new FireflyException(sprintf('Source invalid: %s', $validator->sourceError)); // @codeCoverageIgnore } diff --git a/app/Services/Internal/Update/BillUpdateService.php b/app/Services/Internal/Update/BillUpdateService.php index 5749cfae57..f15570ba54 100644 --- a/app/Services/Internal/Update/BillUpdateService.php +++ b/app/Services/Internal/Update/BillUpdateService.php @@ -76,8 +76,6 @@ class BillUpdateService 'amount_max' => $bill->amount_max, 'transaction_currency_name' => $bill->transactionCurrency->name, ]; - - // update note: if (array_key_exists('notes', $data)) { $this->updateNote($bill, (string)$data['notes']); diff --git a/app/Services/Internal/Update/CategoryUpdateService.php b/app/Services/Internal/Update/CategoryUpdateService.php index 4d51a254cd..c3e96764f6 100644 --- a/app/Services/Internal/Update/CategoryUpdateService.php +++ b/app/Services/Internal/Update/CategoryUpdateService.php @@ -39,8 +39,6 @@ use Log; class CategoryUpdateService { private $user; - - /** * Constructor. */ @@ -138,8 +136,6 @@ class CategoryUpdateService ->where('rt_meta.value', $oldName) ->update(['rt_meta.value' => $newName]); } - - /** * @param Category $category * @param array $data diff --git a/app/Services/Internal/Update/GroupCloneService.php b/app/Services/Internal/Update/GroupCloneService.php index 81abc35a3f..c08ae5d5e0 100644 --- a/app/Services/Internal/Update/GroupCloneService.php +++ b/app/Services/Internal/Update/GroupCloneService.php @@ -51,8 +51,6 @@ class GroupCloneService foreach ($group->transactionJournals as $journal) { $this->cloneJournal($journal, $newGroup, (int)$group->id); } - - return $newGroup; } @@ -147,6 +145,4 @@ class GroupCloneService $newMeta->save(); } } - - } diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 7184b7622d..3203bd3796 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -145,8 +145,6 @@ class JournalUpdateService $this->updateField('description'); $this->updateField('date'); $this->updateField('order'); - - $this->transactionJournal->save(); $this->transactionJournal->refresh(); @@ -294,8 +292,6 @@ class JournalUpdateService $validator->setTransactionType($expectedType); $validator->setUser($this->transactionJournal->user); $validator->source = $this->getValidSourceAccount(); - - $result = $validator->validateDestination($destId, $destName, null); Log::debug(sprintf('hasValidDestinationAccount(%d, "%s") will return %s', $destId, $destName, var_export($result, true))); @@ -393,8 +389,6 @@ class JournalUpdateService // refresh transactions. $this->sourceTransaction->refresh(); $this->destinationTransaction->refresh(); - - Log::debug(sprintf('Will set source to #%d ("%s")', $source->id, $source->name)); Log::debug(sprintf('Will set dest to #%d ("%s")', $destination->id, $destination->name)); } @@ -505,8 +499,6 @@ class JournalUpdateService // do some parsing. Log::debug(sprintf('Create date value from string "%s".', $value)); } - - $this->transactionJournal->$fieldName = $value; Log::debug(sprintf('Updated %s', $fieldName)); } @@ -692,13 +684,9 @@ class JournalUpdateService $origSourceTransaction = $this->getSourceTransaction(); $origSourceTransaction->amount = app('steam')->negative($amount); $origSourceTransaction->save(); - - $destTransaction = $this->getDestinationTransaction(); $destTransaction->amount = app('steam')->positive($amount); $destTransaction->save(); - - // refresh transactions. $this->sourceTransaction->refresh(); $this->destinationTransaction->refresh(); @@ -738,8 +726,6 @@ class JournalUpdateService $source->foreign_currency_id = $foreignCurrency->id; $source->foreign_amount = app('steam')->negative($foreignAmount); $source->save(); - - $dest->foreign_currency_id = $foreignCurrency->id; $dest->foreign_amount = app('steam')->positive($foreignAmount); $dest->save(); diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php index 503430dcab..b7370de5e2 100644 --- a/app/Services/Internal/Update/RecurrenceUpdateService.php +++ b/app/Services/Internal/Update/RecurrenceUpdateService.php @@ -103,8 +103,6 @@ class RecurrenceUpdateService $this->updateRepetitions($recurrence, $data['repetitions'] ?? []); } // update all transactions: - - // update all transactions (and associated meta-data) if (array_key_exists('transactions', $data)) { $this->updateTransactions($recurrence, $data['transactions'] ?? []); @@ -240,8 +238,6 @@ class RecurrenceUpdateService return; } $currencyFactory = app(TransactionCurrencyFactory::class); - - // loop all and try to match them: if ($originalCount === count($transactions)) { Log::debug('Loop and find'); diff --git a/app/Services/Webhook/StandardWebhookSender.php b/app/Services/Webhook/StandardWebhookSender.php index 22fd2136c9..90035f6b31 100644 --- a/app/Services/Webhook/StandardWebhookSender.php +++ b/app/Services/Webhook/StandardWebhookSender.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Services\Webhook; diff --git a/app/Services/Webhook/WebhookSenderInterface.php b/app/Services/Webhook/WebhookSenderInterface.php index 646a68b865..6b827fa9d0 100644 --- a/app/Services/Webhook/WebhookSenderInterface.php +++ b/app/Services/Webhook/WebhookSenderInterface.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Services\Webhook; diff --git a/app/Support/Authentication/RemoteUserGuard.php b/app/Support/Authentication/RemoteUserGuard.php index fc8e28bbd7..9d24ca6f1a 100644 --- a/app/Support/Authentication/RemoteUserGuard.php +++ b/app/Support/Authentication/RemoteUserGuard.php @@ -31,8 +31,6 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\UserProvider; use Illuminate\Contracts\Foundation\Application; use Log; - - /** * Class RemoteUserGuard */ diff --git a/app/Support/Authentication/RemoteUserProvider.php b/app/Support/Authentication/RemoteUserProvider.php index 65cfe296c1..a58b120608 100644 --- a/app/Support/Authentication/RemoteUserProvider.php +++ b/app/Support/Authentication/RemoteUserProvider.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Authentication; - - use FireflyIII\Exceptions\FireflyException; use FireflyIII\User; use Illuminate\Contracts\Auth\Authenticatable; diff --git a/app/Support/Binder/DynamicConfigKey.php b/app/Support/Binder/DynamicConfigKey.php index d753f0c166..745a026a38 100644 --- a/app/Support/Binder/DynamicConfigKey.php +++ b/app/Support/Binder/DynamicConfigKey.php @@ -19,6 +19,8 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace FireflyIII\Support\Binder; use Illuminate\Routing\Route; @@ -51,4 +53,4 @@ class DynamicConfigKey throw new NotFoundHttpException; } -} \ No newline at end of file +} diff --git a/app/Support/Binder/EitherConfigKey.php b/app/Support/Binder/EitherConfigKey.php index 33c1c9d715..922b0262e8 100644 --- a/app/Support/Binder/EitherConfigKey.php +++ b/app/Support/Binder/EitherConfigKey.php @@ -1,4 +1,6 @@ orderBy('tag', 'ASC') ->get(); } - - $list = array_unique(array_map('\strtolower', explode(',', $value))); Log::debug('List of tags is', $list); // @codeCoverageIgnoreStart diff --git a/app/Support/Chart/Budget/FrontpageChartGenerator.php b/app/Support/Chart/Budget/FrontpageChartGenerator.php index 5496e0305b..3ea24b1cb2 100644 --- a/app/Support/Chart/Budget/FrontpageChartGenerator.php +++ b/app/Support/Chart/Budget/FrontpageChartGenerator.php @@ -30,8 +30,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\OperationsRepositoryInterface; use FireflyIII\User; use Illuminate\Support\Collection; - - /** * Class FrontpageChartGenerator */ @@ -237,6 +235,4 @@ class FrontpageChartGenerator $locale = app('steam')->getLocale(); $this->monthAndDayFormat = (string)trans('config.month_and_day', [], $locale); } - - } diff --git a/app/Support/Chart/Category/FrontpageChartGenerator.php b/app/Support/Chart/Category/FrontpageChartGenerator.php index 1969448183..8ff317aefb 100644 --- a/app/Support/Chart/Category/FrontpageChartGenerator.php +++ b/app/Support/Chart/Category/FrontpageChartGenerator.php @@ -184,8 +184,6 @@ class FrontpageChartGenerator return $return; } - - /** * @param array $currencyData * @param array $monetaryData diff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.php index aa210a7927..96bf9d5f96 100644 --- a/app/Support/Cronjobs/AutoBudgetCronjob.php +++ b/app/Support/Cronjobs/AutoBudgetCronjob.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Cronjobs; - - use Carbon\Carbon; use FireflyIII\Jobs\CreateAutoBudgetLimits; use FireflyIII\Models\Configuration; diff --git a/app/Support/Cronjobs/TelemetryCronjob.php b/app/Support/Cronjobs/TelemetryCronjob.php index a7b0ad1f64..624f1f523f 100644 --- a/app/Support/Cronjobs/TelemetryCronjob.php +++ b/app/Support/Cronjobs/TelemetryCronjob.php @@ -50,8 +50,6 @@ class TelemetryCronjob extends AbstractCronjob return; } - - /** @var Configuration $config */ $config = app('fireflyconfig')->get('last_tm_job', 0); $lastTime = (int)$config->data; @@ -83,8 +81,6 @@ class TelemetryCronjob extends AbstractCronjob app('preferences')->mark(); } - - /** * @throws FireflyException */ diff --git a/app/Support/Form/AccountForm.php b/app/Support/Form/AccountForm.php index d1bff36c9e..17c1c59f3a 100644 --- a/app/Support/Form/AccountForm.php +++ b/app/Support/Form/AccountForm.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Form; - - use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -163,8 +161,6 @@ class AccountForm return $this->select($name, $grouped, $value, $options); } - - /** * Same list but all liabilities as well. * diff --git a/app/Support/Form/CurrencyForm.php b/app/Support/Form/CurrencyForm.php index 907d7b867a..5e7e2e888c 100644 --- a/app/Support/Form/CurrencyForm.php +++ b/app/Support/Form/CurrencyForm.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Form; - - use Amount as Amt; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionCurrency; diff --git a/app/Support/Form/FormSupport.php b/app/Support/Form/FormSupport.php index af8a30ca7d..ccad30a682 100644 --- a/app/Support/Form/FormSupport.php +++ b/app/Support/Form/FormSupport.php @@ -36,8 +36,6 @@ use Throwable; */ trait FormSupport { - - /** * @param string $name * @param array $list diff --git a/app/Support/Form/PiggyBankForm.php b/app/Support/Form/PiggyBankForm.php index 900b15a6b1..21e11d31bc 100644 --- a/app/Support/Form/PiggyBankForm.php +++ b/app/Support/Form/PiggyBankForm.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Form; - - use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; diff --git a/app/Support/Form/RuleForm.php b/app/Support/Form/RuleForm.php index b2ca38920e..d1f0748f7b 100644 --- a/app/Support/Form/RuleForm.php +++ b/app/Support/Form/RuleForm.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Form; - - use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use Form; diff --git a/app/Support/Http/Api/TransactionFilter.php b/app/Support/Http/Api/TransactionFilter.php index 5dacf96b94..f0e703860d 100644 --- a/app/Support/Http/Api/TransactionFilter.php +++ b/app/Support/Http/Api/TransactionFilter.php @@ -62,7 +62,5 @@ trait TransactionFilter ]; return $types[$type] ?? $types['default']; - - } } diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.php index 00709a4fe6..e3d1a1adfc 100644 --- a/app/Support/Http/Controllers/AugumentData.php +++ b/app/Support/Http/Controllers/AugumentData.php @@ -198,8 +198,6 @@ trait AugumentData /** @var BudgetLimitRepositoryInterface $blRepository */ $blRepository = app(BudgetLimitRepositoryInterface::class); - - // properties for cache $cache = new CacheProperties; $cache->addProperty($start); diff --git a/app/Support/Http/Controllers/BasicDataSupport.php b/app/Support/Http/Controllers/BasicDataSupport.php index f631a41511..1072b79770 100644 --- a/app/Support/Http/Controllers/BasicDataSupport.php +++ b/app/Support/Http/Controllers/BasicDataSupport.php @@ -29,8 +29,6 @@ namespace FireflyIII\Support\Http\Controllers; */ trait BasicDataSupport { - - /** * Find the ID in a given array. Return '0' of not there (amount). * @@ -43,6 +41,4 @@ trait BasicDataSupport { return $array[$entryId] ?? '0'; } - - } diff --git a/app/Support/Http/Controllers/CreateStuff.php b/app/Support/Http/Controllers/CreateStuff.php index 5df051cbd7..892218c9a0 100644 --- a/app/Support/Http/Controllers/CreateStuff.php +++ b/app/Support/Http/Controllers/CreateStuff.php @@ -32,8 +32,6 @@ use Laravel\Passport\Passport; use Log; use phpseclib\Crypt\RSA as LegacyRSA; use phpseclib3\Crypt\RSA; - - /** * Trait CreateStuff * @@ -106,8 +104,6 @@ trait CreateStuff */ protected function createOAuthKeys(): void // create stuff { - - [$publicKey, $privateKey] = [ Passport::keyPath('oauth-public.key'), Passport::keyPath('oauth-private.key'), diff --git a/app/Support/Http/Controllers/DateCalculation.php b/app/Support/Http/Controllers/DateCalculation.php index c699cd6c63..0a70f06081 100644 --- a/app/Support/Http/Controllers/DateCalculation.php +++ b/app/Support/Http/Controllers/DateCalculation.php @@ -99,8 +99,6 @@ trait DateCalculation return $step; } - - /** * Get a list of the periods that will occur after this date. For example, * March 2018, April 2018, etc. @@ -130,8 +128,6 @@ trait DateCalculation 'start' => clone $currentStart, 'end' => clone $current, ]; - - ++$count; $current->addDay(); } diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.php index 6aa4cc6888..eb3d3bb1f2 100644 --- a/app/Support/Http/Controllers/GetConfigurationData.php +++ b/app/Support/Http/Controllers/GetConfigurationData.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Controllers; - - use Carbon\Carbon; use Log; diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php index fecdf36b28..cdf90716b7 100644 --- a/app/Support/Http/Controllers/PeriodOverview.php +++ b/app/Support/Http/Controllers/PeriodOverview.php @@ -308,8 +308,6 @@ trait PeriodOverview $collector->setRange($start, $end); $collector->setTypes([TransactionType::TRANSFER]); $transferSet = $collector->getExtractedJournals(); - - foreach ($dates as $currentDate) { $spent = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']); $earned = $this->filterJournalsByDate($earnedSet, $currentDate['start'], $currentDate['end']); @@ -362,8 +360,6 @@ trait PeriodOverview /** @var array $dates */ $dates = app('navigation')->blockPeriods($start, $end, $range); $entries = []; - - // get all expenses without a budget. /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); @@ -590,8 +586,6 @@ trait PeriodOverview if ('transfer' === $transactionType || 'transfers' === $transactionType) { $transferred = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']); } - - $entries[] = [ 'title' => $title, diff --git a/app/Support/Http/Controllers/RenderPartialViews.php b/app/Support/Http/Controllers/RenderPartialViews.php index 66ee8e5dc9..f726a488ab 100644 --- a/app/Support/Http/Controllers/RenderPartialViews.php +++ b/app/Support/Http/Controllers/RenderPartialViews.php @@ -320,8 +320,6 @@ trait RenderPartialViews } } asort($triggers); - - $index = 0; $renderedEntries = []; // todo must be repos diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 0d465859b3..e9159111f4 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -43,8 +43,6 @@ use Route as RouteFacade; */ trait RequestInformation { - - /** * Get the domain of FF system. * @@ -169,8 +167,6 @@ trait RequestInformation { $page = $this->getPageName(); $specificPage = $this->getSpecificPageName(); - - // indicator if user has seen the help for this page ( + special page): $key = sprintf('shown_demo_%s%s', $page, $specificPage); // is there an intro for this route? diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index f523ce665b..2f81cbcb4e 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -212,8 +212,6 @@ class Navigation return $currentEnd; } - - if (!isset($functionMap[$repeatFreq])) { Log::error(sprintf('Cannot do endOfPeriod for $repeat_freq "%s"', $repeatFreq)); @@ -303,8 +301,6 @@ class Navigation $increment = 'addYear'; $displayFormat = (string)trans('config.year'); } - - $begin = clone $start; $entries = []; while ($begin < $end) { @@ -581,8 +577,6 @@ class Navigation $tEnd = session('end', Carbon::now()->endOfMonth()); $diffInDays = $tStart->diffInDays($tEnd); $date->subDays($diffInDays * $subtract); - - return $date; } @@ -632,8 +626,6 @@ class Navigation return $fiscalHelper->endOfFiscalYear($end); } - - throw new FireflyException(sprintf('updateEndDate cannot handle range "%s"', $range)); } diff --git a/app/Support/NullArrayObject.php b/app/Support/NullArrayObject.php index 177b361eff..6a25fb8608 100644 --- a/app/Support/NullArrayObject.php +++ b/app/Support/NullArrayObject.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Support; - - use ArrayObject; /** diff --git a/app/Support/ParseDateString.php b/app/Support/ParseDateString.php index 10a5f6fcca..9d4b3d80fe 100644 --- a/app/Support/ParseDateString.php +++ b/app/Support/ParseDateString.php @@ -21,8 +21,6 @@ */ declare(strict_types=1); - - namespace FireflyIII\Support; use Carbon\Carbon; @@ -249,8 +247,6 @@ class ParseDateString return false; } - - /** * @param string $date * diff --git a/app/Support/Report/Category/CategoryReportGenerator.php b/app/Support/Report/Category/CategoryReportGenerator.php index 229c765a80..5e4f9e45d1 100644 --- a/app/Support/Report/Category/CategoryReportGenerator.php +++ b/app/Support/Report/Category/CategoryReportGenerator.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Support\Report\Category; - - use Carbon\Carbon; use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface; use FireflyIII\Repositories\Category\OperationsRepositoryInterface; diff --git a/app/Support/Repositories/Recurring/CalculateRangeOccurrences.php b/app/Support/Repositories/Recurring/CalculateRangeOccurrences.php index 655222d6ae..0c5b82647d 100644 --- a/app/Support/Repositories/Recurring/CalculateRangeOccurrences.php +++ b/app/Support/Repositories/Recurring/CalculateRangeOccurrences.php @@ -56,8 +56,6 @@ trait CalculateRangeOccurrences return $return; } - - /** * Get the number of daily occurrences for a recurring transaction until date $end is reached. Will skip every $skipMod-1 occurrences. * @@ -90,8 +88,6 @@ trait CalculateRangeOccurrences return $return; } - - /** * Get the number of daily occurrences for a recurring transaction until date $end is reached. Will skip every $skipMod-1 occurrences. * diff --git a/app/Support/Repositories/Recurring/CalculateXOccurrences.php b/app/Support/Repositories/Recurring/CalculateXOccurrences.php index c5b8f42e46..17e4ed252a 100644 --- a/app/Support/Repositories/Recurring/CalculateXOccurrences.php +++ b/app/Support/Repositories/Recurring/CalculateXOccurrences.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Repositories\Recurring; - - use Carbon\Carbon; /** @@ -60,8 +58,6 @@ trait CalculateXOccurrences return $return; } - - /** * Calculates the number of monthly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. @@ -98,8 +94,6 @@ trait CalculateXOccurrences return $return; } - - /** * Calculates the number of NDOM occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. @@ -137,8 +131,6 @@ trait CalculateXOccurrences return $return; } - - /** * Calculates the number of weekly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. @@ -180,8 +172,6 @@ trait CalculateXOccurrences return $return; } - - /** * Calculates the number of yearly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. diff --git a/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php b/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php index 195946bdd9..cdf7f4388c 100644 --- a/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php +++ b/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Repositories\Recurring; - - use Carbon\Carbon; use Log; @@ -63,8 +61,6 @@ trait CalculateXOccurrencesSince return $return; } - - /** * Calculates the number of monthly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. @@ -107,8 +103,6 @@ trait CalculateXOccurrencesSince return $return; } - - /** * Calculates the number of NDOM occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. @@ -148,8 +142,6 @@ trait CalculateXOccurrencesSince return $return; } - - /** * Calculates the number of weekly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. @@ -193,8 +185,6 @@ trait CalculateXOccurrencesSince return $return; } - - /** * Calculates the number of yearly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip * over $skipMod -1 recurrences. diff --git a/app/Support/Request/ChecksLogin.php b/app/Support/Request/ChecksLogin.php index cba9f91fd9..a7cbc718f0 100644 --- a/app/Support/Request/ChecksLogin.php +++ b/app/Support/Request/ChecksLogin.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Support\Request; diff --git a/app/Support/Request/GetRuleConfiguration.php b/app/Support/Request/GetRuleConfiguration.php index 18c11d6688..9826382f8a 100644 --- a/app/Support/Request/GetRuleConfiguration.php +++ b/app/Support/Request/GetRuleConfiguration.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Support\Request; diff --git a/app/Support/Search/AccountSearch.php b/app/Support/Search/AccountSearch.php index 4f22a75030..8050ebabc2 100644 --- a/app/Support/Search/AccountSearch.php +++ b/app/Support/Search/AccountSearch.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Search; - - use FireflyIII\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; diff --git a/app/Support/Search/GenericSearchInterface.php b/app/Support/Search/GenericSearchInterface.php index 372f83cb75..86273122a1 100644 --- a/app/Support/Search/GenericSearchInterface.php +++ b/app/Support/Search/GenericSearchInterface.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Search; - - use Illuminate\Support\Collection; /** diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index 9188dba8df..52a41fa83f 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\Support\Search; @@ -829,8 +809,6 @@ private Collection $modifiers; $parts = explode(' ', $value); $value = trim($parts[count($parts) - 1], "() \t\n\r\0\x0B"); } - - $result = $this->currencyRepository->findByCodeNull($value); if (null === $result) { $result = $this->currencyRepository->findByNameNull($value); diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 20b18ef04c..f47cdb7f0c 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -108,8 +108,6 @@ class Steam $repository->setUser($account->user); $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); - - $transactions = $account->transactions() ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59')) diff --git a/app/TransactionRules/Actions/ConvertToDeposit.php b/app/TransactionRules/Actions/ConvertToDeposit.php index 6694c6aee8..6892c22783 100644 --- a/app/TransactionRules/Actions/ConvertToDeposit.php +++ b/app/TransactionRules/Actions/ConvertToDeposit.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\TransactionRules\Actions; - - use DB; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\AccountFactory; diff --git a/app/TransactionRules/Actions/ConvertToTransfer.php b/app/TransactionRules/Actions/ConvertToTransfer.php index b198df51ba..03350c696d 100644 --- a/app/TransactionRules/Actions/ConvertToTransfer.php +++ b/app/TransactionRules/Actions/ConvertToTransfer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\TransactionRules\Actions; - - use DB; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; diff --git a/app/TransactionRules/Actions/ConvertToWithdrawal.php b/app/TransactionRules/Actions/ConvertToWithdrawal.php index 0143d8394b..1303ec642c 100644 --- a/app/TransactionRules/Actions/ConvertToWithdrawal.php +++ b/app/TransactionRules/Actions/ConvertToWithdrawal.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\TransactionRules\Actions; - - use DB; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\AccountFactory; @@ -87,8 +85,6 @@ class ConvertToWithdrawal implements ActionInterface $expenseName = '' === $this->action->action_value ? $journal['source_account_name'] : $this->action->action_value; $expense = $factory->findOrCreate($expenseName, AccountType::EXPENSE); $destinationId = $journal['destination_account_id']; - - Log::debug(sprintf('ConvertToWithdrawal. Action value is "%s", expense name is "%s"', $this->action->action_value, $expenseName)); // update source transaction(s) to be the original destination account @@ -126,15 +122,11 @@ class ConvertToWithdrawal implements ActionInterface */ private function convertTransferArray(array $journal): bool { - - // find or create expense account. $user = User::find($journal['user_id']); /** @var AccountFactory $factory */ $factory = app(AccountFactory::class); $factory->setUser($user); - - $expenseName = '' === $this->action->action_value ? $journal['destination_account_name'] : $this->action->action_value; $expense = $factory->findOrCreate($expenseName, AccountType::EXPENSE); diff --git a/app/TransactionRules/Actions/LinkToBill.php b/app/TransactionRules/Actions/LinkToBill.php index 390a813912..8e8726b512 100644 --- a/app/TransactionRules/Actions/LinkToBill.php +++ b/app/TransactionRules/Actions/LinkToBill.php @@ -78,8 +78,6 @@ class LinkToBill implements ActionInterface $journal['transaction_journal_id'], $billName ) ); - - return false; } } diff --git a/app/TransactionRules/Actions/RemoveAllTags.php b/app/TransactionRules/Actions/RemoveAllTags.php index 9eaf04b776..f373786eec 100644 --- a/app/TransactionRules/Actions/RemoveAllTags.php +++ b/app/TransactionRules/Actions/RemoveAllTags.php @@ -25,8 +25,6 @@ namespace FireflyIII\TransactionRules\Actions; use DB; use FireflyIII\Models\RuleAction; use Log; - - /** * Class RemoveAllTags. */ diff --git a/app/TransactionRules/Actions/SetSourceAccount.php b/app/TransactionRules/Actions/SetSourceAccount.php index 136b42400f..c8711b4e12 100644 --- a/app/TransactionRules/Actions/SetSourceAccount.php +++ b/app/TransactionRules/Actions/SetSourceAccount.php @@ -92,8 +92,6 @@ class SetSourceAccount implements ActionInterface return false; } - - // if this is a deposit, the new source account must be a revenue account and may be created: if (TransactionType::DEPOSIT === $type) { $newAccount = $this->findRevenueAccount(); diff --git a/app/TransactionRules/Actions/UpdatePiggybank.php b/app/TransactionRules/Actions/UpdatePiggybank.php index 3cda581782..84fa7917ea 100644 --- a/app/TransactionRules/Actions/UpdatePiggybank.php +++ b/app/TransactionRules/Actions/UpdatePiggybank.php @@ -21,11 +21,7 @@ */ declare(strict_types=1); - - namespace FireflyIII\TransactionRules\Actions; - - use FireflyIII\Models\PiggyBank; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; diff --git a/app/TransactionRules/Engine/RuleEngineInterface.php b/app/TransactionRules/Engine/RuleEngineInterface.php index 6f00d01350..c5cf66c2cd 100644 --- a/app/TransactionRules/Engine/RuleEngineInterface.php +++ b/app/TransactionRules/Engine/RuleEngineInterface.php @@ -1,5 +1,4 @@ . - */ namespace FireflyIII\TransactionRules\Engine; diff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.php index 007094deb2..0105e3a48b 100644 --- a/app/TransactionRules/Engine/SearchRuleEngine.php +++ b/app/TransactionRules/Engine/SearchRuleEngine.php @@ -245,8 +245,6 @@ class SearchRuleEngine implements RuleEngineInterface if ($this->hasSpecificJournalTrigger($searchArray)) { $date = $this->setDateFromJournalTrigger($searchArray); } - - // build and run the search engine. $searchEngine = app(SearchInterface::class); $searchEngine->setUser($this->user); @@ -407,8 +405,6 @@ class SearchRuleEngine implements RuleEngineInterface } // pick up from the action if it actually acted or not: - - if ($ruleAction->stop_processing) { Log::debug(sprintf('Rule action "%s" asks to break, so break!', $ruleAction->action_type)); diff --git a/app/TransactionRules/Factory/ActionFactory.php b/app/TransactionRules/Factory/ActionFactory.php index 0f353ddc2b..37a8acae7b 100644 --- a/app/TransactionRules/Factory/ActionFactory.php +++ b/app/TransactionRules/Factory/ActionFactory.php @@ -1,25 +1,4 @@ . - */ - /** * ActionFactory.php * Copyright (c) 2019 Robert Horlings diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index 79436a89c6..3f2f7f3c77 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; diff --git a/app/Transformers/AttachmentTransformer.php b/app/Transformers/AttachmentTransformer.php index d410c8dd88..d1aef15bfa 100644 --- a/app/Transformers/AttachmentTransformer.php +++ b/app/Transformers/AttachmentTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\Attachment; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; diff --git a/app/Transformers/AvailableBudgetTransformer.php b/app/Transformers/AvailableBudgetTransformer.php index f6f504f9e1..558038b976 100644 --- a/app/Transformers/AvailableBudgetTransformer.php +++ b/app/Transformers/AvailableBudgetTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\AvailableBudget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\NoBudgetRepositoryInterface; diff --git a/app/Transformers/BudgetLimitTransformer.php b/app/Transformers/BudgetLimitTransformer.php index 7bf3a04280..2c148d0962 100644 --- a/app/Transformers/BudgetLimitTransformer.php +++ b/app/Transformers/BudgetLimitTransformer.php @@ -65,8 +65,6 @@ class BudgetLimitTransformer extends AbstractTransformer $expenses = $repository->sumExpenses( $budgetLimit->start_date, $budgetLimit->end_date, null, new Collection([$budgetLimit->budget]), $budgetLimit->transactionCurrency ); - - $currency = $budgetLimit->transactionCurrency; $amount = $budgetLimit->amount; $currencyDecimalPlaces = 2; diff --git a/app/Transformers/BudgetTransformer.php b/app/Transformers/BudgetTransformer.php index 2be1ba1e36..c6f08544aa 100644 --- a/app/Transformers/BudgetTransformer.php +++ b/app/Transformers/BudgetTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\AutoBudget; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; diff --git a/app/Transformers/CategoryTransformer.php b/app/Transformers/CategoryTransformer.php index 381101856c..4ece2543ca 100644 --- a/app/Transformers/CategoryTransformer.php +++ b/app/Transformers/CategoryTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Category\OperationsRepositoryInterface; diff --git a/app/Transformers/CurrencyExchangeRateTransformer.php b/app/Transformers/CurrencyExchangeRateTransformer.php index d7fdbdea63..2f4f72796a 100644 --- a/app/Transformers/CurrencyExchangeRateTransformer.php +++ b/app/Transformers/CurrencyExchangeRateTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\CurrencyExchangeRate; /** diff --git a/app/Transformers/LinkTypeTransformer.php b/app/Transformers/LinkTypeTransformer.php index 4c9847f0aa..9bdf19cb2f 100644 --- a/app/Transformers/LinkTypeTransformer.php +++ b/app/Transformers/LinkTypeTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\LinkType; /** diff --git a/app/Transformers/ObjectGroupTransformer.php b/app/Transformers/ObjectGroupTransformer.php index e71da4d0c1..e6509fcc30 100644 --- a/app/Transformers/ObjectGroupTransformer.php +++ b/app/Transformers/ObjectGroupTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\ObjectGroup; use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface; diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.php index c5a9e4f48e..ef4e34ed2b 100644 --- a/app/Transformers/PiggyBankEventTransformer.php +++ b/app/Transformers/PiggyBankEventTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; diff --git a/app/Transformers/PiggyBankTransformer.php b/app/Transformers/PiggyBankTransformer.php index 41fac2d3bb..40e8e7cc31 100644 --- a/app/Transformers/PiggyBankTransformer.php +++ b/app/Transformers/PiggyBankTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\Account; use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\PiggyBank; @@ -51,8 +49,6 @@ class PiggyBankTransformer extends AbstractTransformer $this->currencyRepos = app(CurrencyRepositoryInterface::class); $this->piggyRepos = app(PiggyBankRepositoryInterface::class); } - - /** * Transform the piggy bank. * diff --git a/app/Transformers/PreferenceTransformer.php b/app/Transformers/PreferenceTransformer.php index 1455cc0cd8..f48b92f3e8 100644 --- a/app/Transformers/PreferenceTransformer.php +++ b/app/Transformers/PreferenceTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\Preference; /** diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.php index c8e063a96e..1cc028e077 100644 --- a/app/Transformers/RecurrenceTransformer.php +++ b/app/Transformers/RecurrenceTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\CategoryFactory; @@ -196,8 +194,6 @@ class RecurrenceTransformer extends AbstractTransformer $destinationType = $destinationAccount->accountType->type; $destinationIban = $destinationAccount->iban; } - - $amount = number_format((float)$transaction->amount, $transaction->transactionCurrency->decimal_places, '.', ''); $foreignAmount = null; if (null !== $transaction->foreign_currency_id && null !== $transaction->foreign_amount) { diff --git a/app/Transformers/RuleGroupTransformer.php b/app/Transformers/RuleGroupTransformer.php index c771d38567..7e608b922c 100644 --- a/app/Transformers/RuleGroupTransformer.php +++ b/app/Transformers/RuleGroupTransformer.php @@ -56,8 +56,4 @@ class RuleGroupTransformer extends AbstractTransformer ], ]; } - - } - - diff --git a/app/Transformers/RuleTransformer.php b/app/Transformers/RuleTransformer.php index 202df6e659..af403daaae 100644 --- a/app/Transformers/RuleTransformer.php +++ b/app/Transformers/RuleTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleAction; diff --git a/app/Transformers/TagTransformer.php b/app/Transformers/TagTransformer.php index c63918027e..ed2fd634f0 100644 --- a/app/Transformers/TagTransformer.php +++ b/app/Transformers/TagTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\Location; use FireflyIII\Models\Tag; diff --git a/app/Transformers/TransactionLinkTransformer.php b/app/Transformers/TransactionLinkTransformer.php index 7cdb4dd2ae..e53bf42c72 100644 --- a/app/Transformers/TransactionLinkTransformer.php +++ b/app/Transformers/TransactionLinkTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php index 161caa997b..83aee3177a 100644 --- a/app/Transformers/UserTransformer.php +++ b/app/Transformers/UserTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; diff --git a/app/Transformers/WebhookAttemptTransformer.php b/app/Transformers/WebhookAttemptTransformer.php index dd91501787..4e8c8a3990 100644 --- a/app/Transformers/WebhookAttemptTransformer.php +++ b/app/Transformers/WebhookAttemptTransformer.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; - - use FireflyIII\Models\WebhookAttempt; /** diff --git a/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php b/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php index 1555bf35ed..7d8909de01 100644 --- a/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php +++ b/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Validation\AutoBudget; - - use Illuminate\Validation\Validator; /** diff --git a/app/Validation/CurrencyValidation.php b/app/Validation/CurrencyValidation.php index 1220d103d0..b92d9cb3f6 100644 --- a/app/Validation/CurrencyValidation.php +++ b/app/Validation/CurrencyValidation.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Validation; - - use Illuminate\Validation\Validator; use Log; diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index dffebe32d2..8aef97bcec 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -629,8 +629,6 @@ class FireflyValidator extends Validator $response = $responses[$this->data['response']] ?? 0; $delivery = $deliveries[$this->data['delivery']] ?? 0; } - - $url = $this->data['url']; $userId = auth()->user()->id; @@ -672,8 +670,6 @@ class FireflyValidator extends Validator if (!isset($parameters[2]) && isset($data['id']) && (int)$data['id'] > 0) { $exclude = (int)$data['id']; } - - // get entries from table $set = DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at') ->where('id', '!=', $exclude)->get([$field]); diff --git a/app/Validation/GroupValidation.php b/app/Validation/GroupValidation.php index 2e150db636..2e8043eb55 100644 --- a/app/Validation/GroupValidation.php +++ b/app/Validation/GroupValidation.php @@ -133,6 +133,4 @@ trait GroupValidation $validator->errors()->add(sprintf('transactions.%d.source_name', $index), (string)trans('validation.need_id_in_edit')); } } - - } diff --git a/app/Validation/RecurrenceValidation.php b/app/Validation/RecurrenceValidation.php index 35f10bf622..3fa05d77cd 100644 --- a/app/Validation/RecurrenceValidation.php +++ b/app/Validation/RecurrenceValidation.php @@ -90,8 +90,6 @@ trait RecurrenceValidation ) { continue; } - - // validate source account. $sourceId = isset($transaction['source_id']) ? (int)$transaction['source_id'] : null; $sourceName = $transaction['source_name'] ?? null; diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index 5c04015d40..2ea32dae7b 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -201,8 +201,6 @@ trait TransactionValidation $accountValidator->source = $source; } } - - $destinationId = (int)($transaction['destination_id'] ?? 0); $destinationName = $transaction['destination_name'] ?? null; $validDestination = $accountValidator->validateDestination($destinationId, $destinationName, null); diff --git a/config/auth.php b/config/auth.php index 384373dc7a..732c35d54c 100644 --- a/config/auth.php +++ b/config/auth.php @@ -122,8 +122,6 @@ return [ 'expire' => 60, ], ], - - /* |-------------------------------------------------------------------------- | Password Confirmation Timeout diff --git a/config/cache.php b/config/cache.php index 96f9a2ae9b..9510722577 100644 --- a/config/cache.php +++ b/config/cache.php @@ -93,8 +93,6 @@ return [ 'driver' => 'redis', 'connection' => 'default', ], - - 'dynamodb' => [ 'driver' => 'dynamodb', 'key' => env('AWS_ACCESS_KEY_ID'), @@ -117,6 +115,4 @@ return [ */ 'prefix' => env('CACHE_PREFIX', 'firefly'), - - ]; diff --git a/config/debugbar.php b/config/debugbar.php index 0befee210d..7441f1af5d 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -1,6 +1,4 @@ ['address' => envNonEmpty('MAIL_FROM', 'changeme@example.com'), 'name' => 'Firefly III Mailer'], - - - 'markdown' => [ 'theme' => 'default', diff --git a/config/twigbridge.php b/config/twigbridge.php index cb94103aac..4e554bb985 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -1,6 +1,4 @@ date('extension_date')->nullable()->after('end_date'); } ); - - // make column nullable: Schema::table( 'oauth_clients', function (Blueprint $table) { diff --git a/database/migrations/2021_03_12_061213_changes_for_v550b2.php b/database/migrations/2021_03_12_061213_changes_for_v550b2.php index 707b29ebf9..2de58e249b 100644 --- a/database/migrations/2021_03_12_061213_changes_for_v550b2.php +++ b/database/migrations/2021_03_12_061213_changes_for_v550b2.php @@ -1,5 +1,27 @@ . + */ + +declare(strict_types=1); + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/database/seeders/ConfigSeeder.php b/database/seeders/ConfigSeeder.php index 745dbb5468..7005d71345 100644 --- a/database/seeders/ConfigSeeder.php +++ b/database/seeders/ConfigSeeder.php @@ -1,9 +1,7 @@ . - */ - namespace Database\Seeders; use FireflyIII\Models\Configuration; diff --git a/public/browserconfig.xml b/public/browserconfig.xml index ae2d076999..fd60b1270c 100644 --- a/public/browserconfig.xml +++ b/public/browserconfig.xml @@ -1,4 +1,24 @@ + + diff --git a/public/v1/css/gf-source.css b/public/v1/css/gf-source.css index b77a492221..eefd5ebd0a 100644 --- a/public/v1/css/gf-source.css +++ b/public/v1/css/gf-source.css @@ -1,3 +1,23 @@ +/* + * gf-source.css + * Copyright (c) 2021 james@firefly-iii.org + * + * This file is part of Firefly III (https://github.com/firefly-iii). + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + /* source-sans-pro-300 - greek_cyrillic-ext_vietnamese_greek-ext_latin-ext_cyrillic_latin */ @font-face { font-family: 'Source Sans Pro'; diff --git a/public/v2/js/empty.js b/public/v2/js/empty.js index 04e4b3982b..91f76cfdb7 100755 --- a/public/v2/js/empty.js +++ b/public/v2/js/empty.js @@ -1,2 +1,22 @@ +/* + * empty.js + * Copyright (c) 2021 james@firefly-iii.org + * + * This file is part of Firefly III (https://github.com/firefly-iii). + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + (window.webpackJsonp=window.webpackJsonp||[]).push([[5],{330:function(n,o,p){n.exports=p(331)},331:function(n,o,p){p(41)}},[[330,0,1]]]); //# sourceMappingURL=empty.js.map \ No newline at end of file diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 8f3108fa4d..7a39d988a3 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -30,6 +30,3 @@ try { } catch (e) { } - - - diff --git a/routes/api-noauth.php b/routes/api-noauth.php index 44e99eb4d1..b3012655c8 100644 --- a/routes/api-noauth.php +++ b/routes/api-noauth.php @@ -1,4 +1,23 @@ . + */ declare(strict_types=1); @@ -10,4 +29,4 @@ Route::group( static function () { Route::get('{cliToken}', ['uses' => 'CronController@cron', 'as' => 'index']); } -); \ No newline at end of file +); diff --git a/routes/api.php b/routes/api.php index 7be605edc2..ebea292f15 100644 --- a/routes/api.php +++ b/routes/api.php @@ -21,8 +21,6 @@ */ declare(strict_types=1); - - use FireflyIII\Http\Middleware\IsAdmin; /** @@ -158,8 +156,6 @@ Route::group( // TODO Transfers for piggies } ); - - /** * SUMMARY CONTROLLER */ @@ -262,8 +258,6 @@ Route::group( Route::put('{budget}/limits/{budgetLimit}', ['uses' => 'BudgetLimit\UpdateController@update', 'as' => 'limits.update']); Route::delete('{budget}/limits/{budgetLimit}', ['uses' => 'BudgetLimit\DestroyController@destroy', 'as' => 'limits.delete']); Route::get('{budget}/limits/{budgetLimit}/transactions', ['uses' => 'BudgetLimit\ListController@transactions', 'as' => 'limits.transactions']); - - } ); @@ -509,9 +503,6 @@ Route::group( Route::get('user', ['uses' => 'AboutController@user', 'as' => 'user']); } ); - - - // Configuration API routes Route::group( ['namespace' => 'FireflyIII\Api\V1\Controllers\System', 'prefix' => 'configuration', @@ -522,8 +513,6 @@ Route::group( Route::put('{dynamicConfigKey}', ['uses' => 'ConfigurationController@update', 'as' => 'update']); } ); - - // Users API routes: Route::group( ['middleware' => ['auth:api', 'bindings', IsAdmin::class], 'namespace' => 'FireflyIII\Api\V1\Controllers\System', 'prefix' => 'users', diff --git a/routes/web.php b/routes/web.php index 9a41c3999c..c0fe573993 100644 --- a/routes/web.php +++ b/routes/web.php @@ -541,8 +541,6 @@ Route::group( Route::get('export', ['uses' => 'Export\IndexController@export', 'as' => 'export']); } ); - - /** * Object group controller. */ @@ -608,8 +606,6 @@ Route::group( 'budget/total-budgeted/{currency}/{start_date}/{end_date}', ['uses' => 'Json\BudgetController@getBudgetInformation', 'as' => 'budget.total-budgeted'] ); - - // boxes Route::get('box/balance', ['uses' => 'Json\BoxController@balance', 'as' => 'box.balance']); Route::get('box/available', ['uses' => 'Json\BoxController@available', 'as' => 'box.available']); @@ -867,8 +863,6 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/budget', 'as' => 'report-data.budget.'], static function () { - - Route::get('general/{accountList}/{start_date}/{end_date}/', ['uses' => 'BudgetController@general', 'as' => 'general']); // TODO is route still used? Route::get('period/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period', 'as' => 'period']); @@ -906,8 +900,6 @@ Route::group( Route::get('', ['uses' => 'Rule\IndexController@index', 'as' => 'index']); Route::post('move-rule/{rule}/{ruleGroup}', ['uses' => 'Rule\IndexController@moveRule', 'as' => 'move-rule']); - - // select controller Route::get('test', ['uses' => 'Rule\SelectController@testTriggers', 'as' => 'test-triggers']); Route::get('test-rule/{rule}', ['uses' => 'Rule\SelectController@testTriggersByRule', 'as' => 'test-triggers-rule']); diff --git a/tests/Api/Autocomplete/AccountControllerTest.php b/tests/Api/Autocomplete/AccountControllerTest.php index 202d7087bb..d0e35c2775 100644 --- a/tests/Api/Autocomplete/AccountControllerTest.php +++ b/tests/Api/Autocomplete/AccountControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Autocomplete; - - use Laravel\Passport\Passport; use Log; use Tests\TestCase; @@ -60,4 +60,4 @@ class AccountControllerTest extends TestCase $this->assertTrue(true); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Account/StoreControllerTest.php b/tests/Api/Models/Account/StoreControllerTest.php index b753752319..cd68fa6868 100644 --- a/tests/Api/Models/Account/StoreControllerTest.php +++ b/tests/Api/Models/Account/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Account; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -200,4 +200,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Account/UpdateControllerTest.php b/tests/Api/Models/Account/UpdateControllerTest.php index 79cd9ab150..71c8f3107c 100644 --- a/tests/Api/Models/Account/UpdateControllerTest.php +++ b/tests/Api/Models/Account/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Account; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,8 +30,6 @@ use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; use Tests\Traits\TestHelpers; - - /** * Class UpdateControllerTest */ @@ -204,4 +202,4 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.accounts.update', $submission['parameters']); $this->assertPUT($route, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Attachment/StoreControllerTest.php b/tests/Api/Models/Attachment/StoreControllerTest.php index 1d5f499a2e..b57da46fe5 100644 --- a/tests/Api/Models/Attachment/StoreControllerTest.php +++ b/tests/Api/Models/Attachment/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Attachment; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -105,4 +105,4 @@ class StoreControllerTest extends TestCase $address = route('api.v1.attachments.store'); $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Attachment/UpdateControllerTest.php b/tests/Api/Models/Attachment/UpdateControllerTest.php index 33c900a5f7..1cd23005a0 100644 --- a/tests/Api/Models/Attachment/UpdateControllerTest.php +++ b/tests/Api/Models/Attachment/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Attachment; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.attachments.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -99,4 +95,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/AvailableBudget/StoreControllerTest.php b/tests/Api/Models/AvailableBudget/StoreControllerTest.php index bbf45b47c8..f0b173ecfc 100644 --- a/tests/Api/Models/AvailableBudget/StoreControllerTest.php +++ b/tests/Api/Models/AvailableBudget/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\AvailableBudget; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -94,8 +94,6 @@ class StoreControllerTest extends TestCase return $configuration->generateAll(); } - - /** * @param array $submission * @@ -116,4 +114,4 @@ class StoreControllerTest extends TestCase $address = route('api.v1.available_budgets.store'); $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/AvailableBudget/UpdateControllerTest.php b/tests/Api/Models/AvailableBudget/UpdateControllerTest.php index daef6d3b10..52aca6d6ee 100644 --- a/tests/Api/Models/AvailableBudget/UpdateControllerTest.php +++ b/tests/Api/Models/AvailableBudget/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\AvailableBudget; - - use Faker\Factory; use Laravel\Passport\Passport; use Log; @@ -48,8 +48,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @param array $submission * @@ -69,8 +67,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.available_budgets.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -122,4 +118,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Bill/StoreControllerTest.php b/tests/Api/Models/Bill/StoreControllerTest.php index b24262b2af..14570ad99d 100644 --- a/tests/Api/Models/Bill/StoreControllerTest.php +++ b/tests/Api/Models/Bill/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Bill; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -128,8 +128,6 @@ class StoreControllerTest extends TestCase $fieldSet->parameters = [1]; $fieldSet->addField(Field::createBasic('active', 'boolean')); $configuration->addOptionalFieldSet('active', $fieldSet); - - $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $fieldSet->addField(Field::createBasic('notes', 'uuid')); @@ -157,8 +155,6 @@ class StoreControllerTest extends TestCase return $configuration->generateAll(); } - - /** * @param array $submission * @@ -180,4 +176,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Bill/UpdateControllerTest.php b/tests/Api/Models/Bill/UpdateControllerTest.php index bf8ed766fb..189035c9a9 100644 --- a/tests/Api/Models/Bill/UpdateControllerTest.php +++ b/tests/Api/Models/Bill/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Bill; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.bills.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -163,4 +159,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Budget/StoreControllerTest.php b/tests/Api/Models/Budget/StoreControllerTest.php index c386f2b554..cd508b7e26 100644 --- a/tests/Api/Models/Budget/StoreControllerTest.php +++ b/tests/Api/Models/Budget/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Budget; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -105,12 +105,8 @@ class StoreControllerTest extends TestCase $fieldSet->addField(Field::createBasic('auto_budget_amount', 'random-amount')); $fieldSet->addField(Field::createBasic('auto_budget_period', 'random-auto-period')); $configuration->addOptionalFieldSet('auto-code', $fieldSet); - - return $configuration->generateAll(); } - - /** * @param array $submission * @@ -132,4 +128,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Budget/UpdateControllerTest.php b/tests/Api/Models/Budget/UpdateControllerTest.php index c27b067de1..a086476f49 100644 --- a/tests/Api/Models/Budget/UpdateControllerTest.php +++ b/tests/Api/Models/Budget/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Budget; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -67,8 +65,6 @@ class UpdateControllerTest extends TestCase $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -129,10 +125,6 @@ class UpdateControllerTest extends TestCase $field->title = 'auto_budget_type'; $fieldSet->addField($field); $configuration->addOptionalFieldSet('none', $fieldSet); - - return $configuration->generateAll(); } - - -} \ No newline at end of file +} diff --git a/tests/Api/Models/BudgetLimit/StoreControllerTest.php b/tests/Api/Models/BudgetLimit/StoreControllerTest.php index 17c051f987..854c1ba0fb 100644 --- a/tests/Api/Models/BudgetLimit/StoreControllerTest.php +++ b/tests/Api/Models/BudgetLimit/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\BudgetLimit; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -113,8 +113,6 @@ class StoreControllerTest extends TestCase return $configuration->generateAll(); } - - /** * @param array $submission * @@ -136,4 +134,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/BudgetLimit/UpdateControllerTest.php b/tests/Api/Models/BudgetLimit/UpdateControllerTest.php index e9b89dfe2e..3257cd17d2 100644 --- a/tests/Api/Models/BudgetLimit/UpdateControllerTest.php +++ b/tests/Api/Models/BudgetLimit/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\BudgetLimit; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.budgets.limits.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -113,4 +109,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Category/StoreControllerTest.php b/tests/Api/Models/Category/StoreControllerTest.php index 11954bd49c..b5bd9542e2 100644 --- a/tests/Api/Models/Category/StoreControllerTest.php +++ b/tests/Api/Models/Category/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Category; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -79,8 +79,6 @@ class StoreControllerTest extends TestCase return $configuration->generateAll(); } - - /** * @param array $submission * @@ -102,4 +100,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Category/UpdateControllerTest.php b/tests/Api/Models/Category/UpdateControllerTest.php index 17a6a01988..ef5f605c7d 100644 --- a/tests/Api/Models/Category/UpdateControllerTest.php +++ b/tests/Api/Models/Category/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Category; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -65,11 +63,7 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.categories.update', $submission['parameters']); $this->assertPUT($route, $submission); - - } - - /** * @return array */ @@ -90,6 +84,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } - - -} \ No newline at end of file +} diff --git a/tests/Api/Models/ObjectGroup/UpdateControllerTest.php b/tests/Api/Models/ObjectGroup/UpdateControllerTest.php index 61aaa45640..497fb72ab4 100644 --- a/tests/Api/Models/ObjectGroup/UpdateControllerTest.php +++ b/tests/Api/Models/ObjectGroup/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\ObjectGroup; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.object-groups.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -88,4 +84,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/PiggyBank/StoreControllerTest.php b/tests/Api/Models/PiggyBank/StoreControllerTest.php index 9711d5d244..292dd52c4b 100644 --- a/tests/Api/Models/PiggyBank/StoreControllerTest.php +++ b/tests/Api/Models/PiggyBank/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\PiggyBank; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -143,4 +143,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/PiggyBank/UpdateControllerTest.php b/tests/Api/Models/PiggyBank/UpdateControllerTest.php index bbde2ecf85..c4a231b7cb 100644 --- a/tests/Api/Models/PiggyBank/UpdateControllerTest.php +++ b/tests/Api/Models/PiggyBank/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\PiggyBank; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.piggy_banks.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -145,4 +141,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Recurrence/StoreControllerTest.php b/tests/Api/Models/Recurrence/StoreControllerTest.php index 000d0c24ca..129cbbaf23 100644 --- a/tests/Api/Models/Recurrence/StoreControllerTest.php +++ b/tests/Api/Models/Recurrence/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Recurrence; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -93,8 +93,6 @@ class StoreControllerTest extends TestCase $defaultSet->addField(Field::createBasic('transactions/0/source_id', 'random-asset-id')); $defaultSet->addField(Field::createBasic('transactions/0/destination_id', 'random-expense-id')); $configuration->addMandatoryFieldSet($defaultSet); - - $defaultSet = new FieldSet(); $defaultSet->title = 'default_deposit'; $defaultSet->addField(Field::createBasic('type', 'static-deposit')); @@ -190,4 +188,4 @@ class StoreControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Recurrence/UpdateControllerTest.php b/tests/Api/Models/Recurrence/UpdateControllerTest.php index db880f80c8..475ef3fa57 100644 --- a/tests/Api/Models/Recurrence/UpdateControllerTest.php +++ b/tests/Api/Models/Recurrence/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Recurrence; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -67,8 +65,6 @@ class UpdateControllerTest extends TestCase $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -106,8 +102,6 @@ class UpdateControllerTest extends TestCase $field = Field::createBasic('active', 'boolean'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('active', $fieldSet); - - $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $field = Field::createBasic('repetitions/0/type', 'static-ndom'); @@ -115,8 +109,6 @@ class UpdateControllerTest extends TestCase $fieldSet->addField($field); $fieldSet->addField(Field::createBasic('repetitions/0/moment', 'moment-ndom')); $configuration->addOptionalFieldSet('ndom', $fieldSet); - - $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $field = Field::createBasic('repetitions/0/type', 'static-monthly'); @@ -124,8 +116,6 @@ class UpdateControllerTest extends TestCase $fieldSet->addField($field); $fieldSet->addField(Field::createBasic('repetitions/0/moment', 'moment-monthly')); $configuration->addOptionalFieldSet('monthly', $fieldSet); - - $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $field = Field::createBasic('repetitions/0/type', 'static-yearly'); @@ -133,8 +123,6 @@ class UpdateControllerTest extends TestCase $fieldSet->addField($field); $fieldSet->addField(Field::createBasic('repetitions/0/moment', 'random-past-date')); $configuration->addOptionalFieldSet('yearly', $fieldSet); - - $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $field = Field::createBasic('repetitions/0/skip', 'random-skip'); @@ -156,8 +144,6 @@ class UpdateControllerTest extends TestCase $field->ignorableFields = ['transactions/0/foreign_currency_code', 'transactions/0/foreign_currency_symbol']; $fieldSet->addField($field); $configuration->addOptionalFieldSet('foreign1', $fieldSet); - - $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $field = Field::createBasic('transactions/0/budget_id', 'random-budget-id'); @@ -186,4 +172,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Rule/StoreControllerTest.php b/tests/Api/Models/Rule/StoreControllerTest.php index 7d78b2ba6f..65c374c02a 100644 --- a/tests/Api/Models/Rule/StoreControllerTest.php +++ b/tests/Api/Models/Rule/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Rule; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -116,11 +116,7 @@ class StoreControllerTest extends TestCase $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('actions/0/active', 'boolean')); $configuration->addOptionalFieldSet('activeXX', $fieldSet); - - return $configuration->generateAll(); - - } /** @@ -144,4 +140,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Rule/UpdateControllerTest.php b/tests/Api/Models/Rule/UpdateControllerTest.php index df8a76a885..af8b2af25b 100644 --- a/tests/Api/Models/Rule/UpdateControllerTest.php +++ b/tests/Api/Models/Rule/UpdateControllerTest.php @@ -1,4 +1,6 @@ user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +66,6 @@ class UpdateControllerTest extends TestCase $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -165,4 +163,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/RuleGroup/StoreControllerTest.php b/tests/Api/Models/RuleGroup/StoreControllerTest.php index b7cdd263dc..39d140199d 100644 --- a/tests/Api/Models/RuleGroup/StoreControllerTest.php +++ b/tests/Api/Models/RuleGroup/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\RuleGroup; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -112,4 +112,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/RuleGroup/UpdateControllerTest.php b/tests/Api/Models/RuleGroup/UpdateControllerTest.php index 341c59cbf6..3cbafb3df2 100644 --- a/tests/Api/Models/RuleGroup/UpdateControllerTest.php +++ b/tests/Api/Models/RuleGroup/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\RuleGroup; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.rule_groups.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -101,4 +97,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Tag/StoreControllerTest.php b/tests/Api/Models/Tag/StoreControllerTest.php index ae2bd100e5..f15e632f1b 100644 --- a/tests/Api/Models/Tag/StoreControllerTest.php +++ b/tests/Api/Models/Tag/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Tag; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -113,4 +113,4 @@ class StoreControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Tag/UpdateControllerTest.php b/tests/Api/Models/Tag/UpdateControllerTest.php index b78cfb4439..1db7d84adb 100644 --- a/tests/Api/Models/Tag/UpdateControllerTest.php +++ b/tests/Api/Models/Tag/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Tag; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.tags.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -99,4 +95,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Transaction/StoreControllerTest.php b/tests/Api/Models/Transaction/StoreControllerTest.php index c6b6755727..bc31b52ad0 100644 --- a/tests/Api/Models/Transaction/StoreControllerTest.php +++ b/tests/Api/Models/Transaction/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Transaction; - - use Carbon\Carbon; use Laravel\Passport\Passport; use Log; @@ -104,8 +104,6 @@ class StoreControllerTest extends TestCase $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('transactions/0/tags', 'random-tags')); $configuration->addOptionalFieldSet('tags', $fieldSet); - - $array = ['notes', 'internal_reference', 'bunq_payment_id', 'sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep', 'sepa_ci', 'sepa_batch_id']; @@ -117,8 +115,6 @@ class StoreControllerTest extends TestCase return $configuration->generateAll(); } - - /** * @param array $submission * @@ -141,4 +137,4 @@ class StoreControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/Models/Transaction/UpdateControllerTest.php b/tests/Api/Models/Transaction/UpdateControllerTest.php index 58269ee762..924e00a2b2 100644 --- a/tests/Api/Models/Transaction/UpdateControllerTest.php +++ b/tests/Api/Models/Transaction/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\Transaction; - - use Carbon\Carbon; use Laravel\Passport\Passport; use Log; @@ -48,8 +48,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider * @@ -69,8 +67,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.transactions.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -133,8 +129,6 @@ class UpdateControllerTest extends TestCase $field->ignorableFields = ['transactions/0/destination_name', 'transactions/0/destination_iban']; $fieldSet->addField($field); $configuration->addOptionalFieldSet('dest', $fieldSet); - - // optional fields $fieldSet = new FieldSet; $fieldSet->parameters = [1]; @@ -162,8 +156,6 @@ class UpdateControllerTest extends TestCase }; $fieldSet->addField($field); $configuration->addOptionalFieldSet('tags', $fieldSet); - - $array = ['notes', 'internal_reference', 'bunq_payment_id', 'sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep', 'sepa_ci', 'sepa_batch_id']; @@ -173,12 +165,8 @@ class UpdateControllerTest extends TestCase $fieldSet->addField(Field::createBasic('transactions/0/' . $value, 'uuid')); $configuration->addOptionalFieldSet($value, $fieldSet); } - - $result = $configuration->generateAll(); return $result; } - - -} \ No newline at end of file +} diff --git a/tests/Api/Models/TransactionCurrency/StoreControllerTest.php b/tests/Api/Models/TransactionCurrency/StoreControllerTest.php index 0920fe8d94..5c2c43a3c9 100644 --- a/tests/Api/Models/TransactionCurrency/StoreControllerTest.php +++ b/tests/Api/Models/TransactionCurrency/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\TransactionCurrency; - - use Faker\Factory; use Laravel\Passport\Passport; use Log; @@ -95,8 +95,6 @@ class StoreControllerTest extends TestCase $field = Field::createBasic('decimal_places', 'currency-dp'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('decimal_places', $fieldSet); - - return $configuration->generateAll(); } @@ -122,4 +120,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/TransactionCurrency/UpdateControllerTest.php b/tests/Api/Models/TransactionCurrency/UpdateControllerTest.php index 8a36f8bb56..b3f38838c7 100644 --- a/tests/Api/Models/TransactionCurrency/UpdateControllerTest.php +++ b/tests/Api/Models/TransactionCurrency/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\TransactionCurrency; - - use Faker\Factory; use Laravel\Passport\Passport; use Log; @@ -49,8 +49,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -68,8 +66,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.currencies.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -109,12 +105,8 @@ class UpdateControllerTest extends TestCase $fieldSet->parameters = ['RMB']; $fieldSet->addField(Field::createBasic('symbol', 'random-new-currency-code')); $configuration->addOptionalFieldSet('code', $fieldSet); - - return $configuration->generateAll(); } - - /** * @return array */ @@ -168,6 +160,4 @@ class UpdateControllerTest extends TestCase return $set; } - - -} \ No newline at end of file +} diff --git a/tests/Api/Models/TransactionLink/StoreControllerTest.php b/tests/Api/Models/TransactionLink/StoreControllerTest.php index df69c20a8f..cbd9caea40 100644 --- a/tests/Api/Models/TransactionLink/StoreControllerTest.php +++ b/tests/Api/Models/TransactionLink/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\TransactionLink; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -88,8 +88,6 @@ class StoreControllerTest extends TestCase return $configuration->generateAll(); } - - /** * @param array $submission * @@ -109,8 +107,6 @@ class StoreControllerTest extends TestCase // run account store with a minimal data set: $address = route('api.v1.transaction_links.store'); $this->assertPOST($address, $submission); - - } -} \ No newline at end of file +} diff --git a/tests/Api/Models/TransactionLink/UpdateControllerTest.php b/tests/Api/Models/TransactionLink/UpdateControllerTest.php index 4fe4a03d4a..ad69a0664e 100644 --- a/tests/Api/Models/TransactionLink/UpdateControllerTest.php +++ b/tests/Api/Models/TransactionLink/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\TransactionLink; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.transaction_links.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -107,11 +103,7 @@ class UpdateControllerTest extends TestCase $fieldSet->parameters = [1]; $fieldSet->addField(Field::createBasic('notes', 'uuid')); $configuration->addOptionalFieldSet('notes', $fieldSet); - - return $configuration->generateAll(); } - - -} \ No newline at end of file +} diff --git a/tests/Api/Models/TransactionLinkType/StoreControllerTest.php b/tests/Api/Models/TransactionLinkType/StoreControllerTest.php index 5625d3a23d..723563aaa4 100644 --- a/tests/Api/Models/TransactionLinkType/StoreControllerTest.php +++ b/tests/Api/Models/TransactionLinkType/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\TransactionLinkType; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -72,8 +72,6 @@ class StoreControllerTest extends TestCase $defaultSet->addField(Field::createBasic('inward', 'uuid')); $defaultSet->addField(Field::createBasic('outward', 'uuid')); $configuration->addMandatoryFieldSet($defaultSet); - - return $configuration->generateAll(); } @@ -99,4 +97,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php b/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php index db05c7e4f6..ef70ce3568 100644 --- a/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php +++ b/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Models\TransactionLinkType; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.link_types.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -93,4 +89,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } -} \ No newline at end of file +} diff --git a/tests/Api/Webhook/StoreControllerTest.php b/tests/Api/Webhook/StoreControllerTest.php index cfbdf53b22..15af7df56f 100644 --- a/tests/Api/Webhook/StoreControllerTest.php +++ b/tests/Api/Webhook/StoreControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Webhook; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -79,8 +79,6 @@ class StoreControllerTest extends TestCase $field = Field::createBasic('active', 'boolean'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('active', $fieldSet); - - return $configuration->generateAll(); } @@ -105,4 +103,4 @@ class StoreControllerTest extends TestCase $this->assertPOST($address, $submission); } -} \ No newline at end of file +} diff --git a/tests/Api/Webhook/UpdateControllerTest.php b/tests/Api/Webhook/UpdateControllerTest.php index 94a423fb70..8d6ba0325c 100644 --- a/tests/Api/Webhook/UpdateControllerTest.php +++ b/tests/Api/Webhook/UpdateControllerTest.php @@ -19,9 +19,9 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace Tests\Api\Webhook; - - use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -47,8 +47,6 @@ class UpdateControllerTest extends TestCase Passport::actingAs($this->user()); Log::info(sprintf('Now in %s.', get_class($this))); } - - /** * @dataProvider updateDataProvider */ @@ -66,8 +64,6 @@ class UpdateControllerTest extends TestCase $route = route('api.v1.webhooks.update', $submission['parameters']); $this->assertPUT($route, $submission); } - - /** * @return array */ @@ -113,6 +109,4 @@ class UpdateControllerTest extends TestCase return $configuration->generateAll(); } - - -} \ No newline at end of file +} diff --git a/tests/Objects/Field.php b/tests/Objects/Field.php index fd50eb2598..87cf250e73 100644 --- a/tests/Objects/Field.php +++ b/tests/Objects/Field.php @@ -1,6 +1,26 @@ . + */ +declare(strict_types=1); namespace Tests\Objects; use Closure; @@ -44,4 +64,4 @@ class Field return $field; } -} \ No newline at end of file +} diff --git a/tests/Objects/FieldSet.php b/tests/Objects/FieldSet.php index 79fc82aef8..45961cb2e2 100644 --- a/tests/Objects/FieldSet.php +++ b/tests/Objects/FieldSet.php @@ -1,6 +1,26 @@ . + */ +declare(strict_types=1); namespace Tests\Objects; /** @@ -35,4 +55,4 @@ class FieldSet $this->fields[$key] = $field; } -} \ No newline at end of file +} diff --git a/tests/Objects/TestConfiguration.php b/tests/Objects/TestConfiguration.php index 740486edbb..3b8feb4188 100644 --- a/tests/Objects/TestConfiguration.php +++ b/tests/Objects/TestConfiguration.php @@ -1,6 +1,26 @@ . + */ +declare(strict_types=1); namespace Tests\Objects; use Faker\Factory; @@ -670,4 +690,4 @@ class TestConfiguration $this->optionalFieldSet = $optionalFieldSet; } -} \ No newline at end of file +} diff --git a/tests/Traits/CollectsValues.php b/tests/Traits/CollectsValues.php index 5403888156..b8a9a14442 100644 --- a/tests/Traits/CollectsValues.php +++ b/tests/Traits/CollectsValues.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace Tests\Traits; - - use FireflyIII\User; /** diff --git a/tests/Traits/TestHelpers.php b/tests/Traits/TestHelpers.php index a9bf64952e..7f9c43755b 100644 --- a/tests/Traits/TestHelpers.php +++ b/tests/Traits/TestHelpers.php @@ -20,8 +20,6 @@ */ declare(strict_types=1); - - namespace Tests\Traits; use Illuminate\Support\Facades\Log; @@ -31,8 +29,6 @@ use Illuminate\Support\Facades\Log; */ trait TestHelpers { - - /** * @param string $route * @param array $content @@ -100,8 +96,6 @@ trait TestHelpers } } - - /** * @param string $route * @param array $content