From aee17221ebe1854fc9feefe909d84ab5f21e5810 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Nov 2017 10:50:23 +0100 Subject: [PATCH] Code clean up. --- app/Console/Commands/CreateExport.php | 1 - app/Console/Commands/DecryptAttachment.php | 1 - app/Console/Commands/UpgradeDatabase.php | 21 +++++++++++-------- .../Commands/UpgradeFireflyInstructions.php | 6 ------ app/Console/Commands/VerifiesAccessToken.php | 1 - app/Console/Commands/VerifyDatabase.php | 19 ++++++++++------- app/Events/AdminRequestedTestMessage.php | 1 - app/Events/RequestedNewPassword.php | 1 - app/Events/StoredTransactionJournal.php | 3 --- app/Events/UpdatedTransactionJournal.php | 2 -- app/Exceptions/FireflyException.php | 4 +--- app/Exceptions/Handler.php | 2 -- app/Exceptions/NotImplementedException.php | 4 +--- app/Exceptions/ValidationException.php | 3 +-- app/Export/Collector/AttachmentCollector.php | 3 --- app/Export/Collector/BasicCollector.php | 3 --- app/Export/Collector/CollectorInterface.php | 1 - app/Export/Collector/UploadCollector.php | 1 - app/Export/Entry/Entry.php | 5 ++--- app/Export/ExpandedProcessor.php | 2 -- app/Export/Exporter/BasicExporter.php | 3 --- app/Export/Exporter/ExporterInterface.php | 1 - .../Chart/Basic/GeneratorInterface.php | 1 - .../Report/Audit/MonthReportGenerator.php | 4 ---- .../Report/Audit/MultiYearReportGenerator.php | 1 - .../Report/Audit/YearReportGenerator.php | 1 - .../Report/Budget/MonthReportGenerator.php | 1 - .../Budget/MultiYearReportGenerator.php | 1 - .../Report/Budget/YearReportGenerator.php | 1 - .../Report/Category/MonthReportGenerator.php | 11 ++++++++-- .../Category/MultiYearReportGenerator.php | 1 - .../Report/Category/YearReportGenerator.php | 1 - .../Report/ReportGeneratorInterface.php | 2 -- .../Report/Standard/MonthReportGenerator.php | 1 - .../Standard/MultiYearReportGenerator.php | 1 - .../Report/Standard/YearReportGenerator.php | 1 - app/Generator/Report/Support.php | 2 -- .../Report/Tag/MonthReportGenerator.php | 13 +++++++++--- .../Report/Tag/MultiYearReportGenerator.php | 1 - .../Report/Tag/YearReportGenerator.php | 1 - app/Handlers/Events/AdminEventHandler.php | 1 - .../Events/StoredJournalEventHandler.php | 1 - .../Events/UpdatedJournalEventHandler.php | 2 -- app/Handlers/Events/UserEventHandler.php | 1 - .../Attachments/AttachmentHelperInterface.php | 1 - app/Helpers/FiscalHelperInterface.php | 1 - 46 files changed, 47 insertions(+), 93 deletions(-) diff --git a/app/Console/Commands/CreateExport.php b/app/Console/Commands/CreateExport.php index d2c95eaa96..c991d086cd 100644 --- a/app/Console/Commands/CreateExport.php +++ b/app/Console/Commands/CreateExport.php @@ -34,7 +34,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Console\Command; use Storage; - /** * Class CreateExport * diff --git a/app/Console/Commands/DecryptAttachment.php b/app/Console/Commands/DecryptAttachment.php index 5e9180f978..226c66c9fd 100644 --- a/app/Console/Commands/DecryptAttachment.php +++ b/app/Console/Commands/DecryptAttachment.php @@ -58,7 +58,6 @@ class DecryptAttachment extends Command public function __construct() { parent::__construct(); - } /** diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index 32db86834d..5a97b618f6 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands; - use DB; use FireflyIII\Models\Account; use FireflyIII\Models\AccountMeta; @@ -93,8 +92,6 @@ class UpgradeDatabase extends Command $this->info('Firefly III database is up to date.'); return; - - } /** @@ -314,7 +311,6 @@ class UpgradeDatabase extends Command $note->save(); Log::debug(sprintf('Migrated meta note #%d to Note #%d', $meta->id, $note->id)); $meta->delete(); - } } @@ -334,7 +330,10 @@ class UpgradeDatabase extends Command if (!(intval($currency->id) === intval($journal->transaction_currency_id))) { $this->line( sprintf( - 'Transfer #%d ("%s") has been updated to use %s instead of %s.', $journal->id, $journal->description, $currency->code, + 'Transfer #%d ("%s") has been updated to use %s instead of %s.', + $journal->id, + $journal->description, + $currency->code, $journal->transactionCurrency->code ) ); @@ -423,8 +422,11 @@ class UpgradeDatabase extends Command if ($transaction->transaction_currency_id !== $currency->id && is_null($transaction->foreign_amount)) { Log::debug( sprintf( - 'Transaction #%d has a currency setting (#%d) that should be #%d. Amount remains %s, currency is changed.', $transaction->id, - $transaction->transaction_currency_id, $currency->id, $transaction->amount + 'Transaction #%d has a currency setting (#%d) that should be #%d. Amount remains %s, currency is changed.', + $transaction->id, + $transaction->transaction_currency_id, + $currency->id, + $transaction->amount ) ); $transaction->transaction_currency_id = $currency->id; @@ -483,7 +485,6 @@ class UpgradeDatabase extends Command // when both are zero, try to grab it from journal: if (is_null($opposing->foreign_amount) && is_null($transaction->foreign_amount)) { - $foreignAmount = $journal->getMeta('foreign_amount'); if (is_null($foreignAmount)) { Log::debug(sprintf('Journal #%d has missing foreign currency data, forced to do 1:1 conversion :(.', $transaction->transaction_journal_id)); @@ -497,7 +498,9 @@ class UpgradeDatabase extends Command $foreignPositive = app('steam')->positive(strval($foreignAmount)); Log::debug( sprintf( - 'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").', $transaction->transaction_journal_id, $foreignAmount + 'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").', + $transaction->transaction_journal_id, + $foreignAmount ) ); $transaction->foreign_amount = bcmul($foreignPositive, '-1'); diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index 8e331f8adb..18464559ef 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -59,7 +59,6 @@ class UpgradeFireflyInstructions extends Command */ public function handle() { - if ($this->argument('task') === 'update') { $this->updateInstructions(); } @@ -109,12 +108,10 @@ class UpgradeFireflyInstructions extends Command if (substr($version, 0, $len) === $compare) { $text = $config[$compare]; } - } $this->showLine(); $this->boxed(''); if (is_null($text)) { - $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version)); $this->boxedInfo('There are no extra installation instructions.'); $this->boxed('Firefly III should be ready for use.'); @@ -141,7 +138,6 @@ class UpgradeFireflyInstructions extends Command } $line .= '+'; $this->line($line); - } /** @@ -159,12 +155,10 @@ class UpgradeFireflyInstructions extends Command if (substr($version, 0, $len) === $compare) { $text = $config[$compare]; } - } $this->showLine(); $this->boxed(''); if (is_null($text)) { - $this->boxed(sprintf('Thank you for updating to Firefly III, v%s', $version)); $this->boxedInfo('There are no extra upgrade instructions.'); $this->boxed('Firefly III should be ready for use.'); diff --git a/app/Console/Commands/VerifiesAccessToken.php b/app/Console/Commands/VerifiesAccessToken.php index c2d62bd594..9d1b13b863 100644 --- a/app/Console/Commands/VerifiesAccessToken.php +++ b/app/Console/Commands/VerifiesAccessToken.php @@ -77,5 +77,4 @@ trait VerifiesAccessToken return true; } - } diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index d731bb19c8..693f2f53cc 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -96,7 +96,6 @@ class VerifyDatabase extends Command $this->repairPiggyBanks(); $this->createLinkTypes(); $this->createAccessTokens(); - } /** @@ -208,7 +207,10 @@ class VerifyDatabase extends Command foreach ($set as $entry) { $line = sprintf( 'User #%d (%s) has budget #%d ("%s") which has no budget limits.', - $entry->user_id, $entry->email, $entry->id, $entry->name + $entry->user_id, + $entry->email, + $entry->id, + $entry->name ); $this->line($line); } @@ -327,7 +329,6 @@ class VerifyDatabase extends Command 'Error: Journal #' . $entry->id . ' has zero transactions. Open table "transaction_journals" and delete the entry with id #' . $entry->id ); } - } /** @@ -349,7 +350,6 @@ class VerifyDatabase extends Command /** @var stdClass $entry */ foreach ($set as $entry) { - $objName = $entry->name; try { $objName = Crypt::decrypt($objName); @@ -359,7 +359,11 @@ class VerifyDatabase extends Command $line = sprintf( 'User #%d (%s) has %s #%d ("%s") which has no transactions.', - $entry->user_id, $entry->email, $name, $entry->id, $objName + $entry->user_id, + $entry->email, + $name, + $entry->id, + $objName ); $this->line($line); } @@ -419,11 +423,10 @@ class VerifyDatabase extends Command $this->error( sprintf( 'Error: Transaction journal #%d is a %s, but has a budget. Edit it without changing anything, so the budget will be removed.', - $entry->id, $entry->transactionType->type + $entry->id, + $entry->transactionType->type ) ); } - - } } diff --git a/app/Events/AdminRequestedTestMessage.php b/app/Events/AdminRequestedTestMessage.php index e556a5ce84..0a54637908 100644 --- a/app/Events/AdminRequestedTestMessage.php +++ b/app/Events/AdminRequestedTestMessage.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Events; - use FireflyIII\User; use Illuminate\Queue\SerializesModels; use Log; diff --git a/app/Events/RequestedNewPassword.php b/app/Events/RequestedNewPassword.php index f442332fda..154eb22647 100644 --- a/app/Events/RequestedNewPassword.php +++ b/app/Events/RequestedNewPassword.php @@ -52,5 +52,4 @@ class RequestedNewPassword extends Event $this->token = $token; $this->ipAddress = $ipAddress; } - } diff --git a/app/Events/StoredTransactionJournal.php b/app/Events/StoredTransactionJournal.php index 51e07fc40b..07a18f8cdf 100644 --- a/app/Events/StoredTransactionJournal.php +++ b/app/Events/StoredTransactionJournal.php @@ -33,7 +33,6 @@ use Illuminate\Queue\SerializesModels; */ class StoredTransactionJournal extends Event { - use SerializesModels; /** @var TransactionJournal */ @@ -52,7 +51,5 @@ class StoredTransactionJournal extends Event // $this->journal = $journal; $this->piggyBankId = $piggyBankId; - } - } diff --git a/app/Events/UpdatedTransactionJournal.php b/app/Events/UpdatedTransactionJournal.php index 603fb90ae2..f83ca87595 100644 --- a/app/Events/UpdatedTransactionJournal.php +++ b/app/Events/UpdatedTransactionJournal.php @@ -33,7 +33,6 @@ use Illuminate\Queue\SerializesModels; */ class UpdatedTransactionJournal extends Event { - use SerializesModels; /** @var TransactionJournal */ @@ -49,5 +48,4 @@ class UpdatedTransactionJournal extends Event // $this->journal = $journal; } - } diff --git a/app/Exceptions/FireflyException.php b/app/Exceptions/FireflyException.php index 669dfed765..5bcde065a7 100644 --- a/app/Exceptions/FireflyException.php +++ b/app/Exceptions/FireflyException.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Exceptions; - /** * Class FireflyException * @@ -31,5 +30,4 @@ namespace FireflyIII\Exceptions; */ class FireflyException extends \Exception { - -} +} diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 47b7d3bfe7..1dc47c3053 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -39,7 +39,6 @@ use FireflyIII\Jobs\MailError; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Request; - class Handler extends ExceptionHandler { /** @@ -73,7 +72,6 @@ class Handler extends ExceptionHandler public function render($request, Exception $exception) { if ($exception instanceof FireflyException || $exception instanceof ErrorException) { - $isDebug = env('APP_DEBUG', false); return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500); diff --git a/app/Exceptions/NotImplementedException.php b/app/Exceptions/NotImplementedException.php index 3052ecd9a4..d6decc2bc7 100644 --- a/app/Exceptions/NotImplementedException.php +++ b/app/Exceptions/NotImplementedException.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Exceptions; - /** * Class NotImplementedException * @@ -31,5 +30,4 @@ namespace FireflyIII\Exceptions; */ class NotImplementedException extends \Exception { - -} +} diff --git a/app/Exceptions/ValidationException.php b/app/Exceptions/ValidationException.php index 37b99b8cd0..f46b5b1588 100644 --- a/app/Exceptions/ValidationException.php +++ b/app/Exceptions/ValidationException.php @@ -30,5 +30,4 @@ namespace FireflyIII\Exceptions; */ class ValidationException extends \Exception { - -} +} diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index b584e272e1..0fe6ec7f9b 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -104,11 +104,9 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface $exportFile = $this->exportFileName($attachment); $this->exportDisk->put($exportFile, $decrypted); $this->getEntries()->push($exportFile); - } catch (DecryptException $e) { Log::error('Catchable error: could not decrypt attachment #' . $attachment->id . ' because: ' . $e->getMessage()); } - } return true; @@ -123,7 +121,6 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface */ private function exportFileName($attachment): string { - return sprintf('%s-Attachment nr. %s - %s', $this->job->key, strval($attachment->id), $attachment->filename); } diff --git a/app/Export/Collector/BasicCollector.php b/app/Export/Collector/BasicCollector.php index fee997d1f9..80bb64ba37 100644 --- a/app/Export/Collector/BasicCollector.php +++ b/app/Export/Collector/BasicCollector.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Export\Collector; - use FireflyIII\Models\ExportJob; use FireflyIII\User; use Illuminate\Support\Collection; @@ -82,6 +81,4 @@ class BasicCollector { $this->user = $user; } - - } diff --git a/app/Export/Collector/CollectorInterface.php b/app/Export/Collector/CollectorInterface.php index 7df33bec46..d36a76c202 100644 --- a/app/Export/Collector/CollectorInterface.php +++ b/app/Export/Collector/CollectorInterface.php @@ -57,5 +57,4 @@ interface CollectorInterface * @return mixed */ public function setJob(ExportJob $job); - } diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php index e4f68e780b..732b04e750 100644 --- a/app/Export/Collector/UploadCollector.php +++ b/app/Export/Collector/UploadCollector.php @@ -116,5 +116,4 @@ class UploadCollector extends BasicCollector implements CollectorInterface return true; } - } diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index bbbcf4a4a6..43246627f0 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -122,7 +122,8 @@ final class Entry ? null : strval( round( - $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places + $transaction->transaction_foreign_amount, + $transaction->foreignCurrency->decimal_places ) ); @@ -166,6 +167,4 @@ final class Entry return $entry; } - - } diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php index 9497b5b90f..bafd575006 100644 --- a/app/Export/ExpandedProcessor.php +++ b/app/Export/ExpandedProcessor.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Export; - use Crypt; use DB; use FireflyIII\Exceptions\FireflyException; @@ -136,7 +135,6 @@ class ExpandedProcessor implements ProcessorInterface $transaction->opposing_account_number = $ibans[$opposingId]['accountNumber'] ?? ''; $transaction->opposing_account_bic = $ibans[$opposingId]['BIC'] ?? ''; $transaction->opposing_currency_code = $currencies[$opposingCurrencyId] ?? ''; - } ); diff --git a/app/Export/Exporter/BasicExporter.php b/app/Export/Exporter/BasicExporter.php index 131f9190c6..c04869286c 100644 --- a/app/Export/Exporter/BasicExporter.php +++ b/app/Export/Exporter/BasicExporter.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Export\Exporter; - use FireflyIII\Models\ExportJob; use Illuminate\Support\Collection; @@ -70,6 +69,4 @@ class BasicExporter { $this->job = $job; } - - } diff --git a/app/Export/Exporter/ExporterInterface.php b/app/Export/Exporter/ExporterInterface.php index 4bd459e056..0ef9fb12c6 100644 --- a/app/Export/Exporter/ExporterInterface.php +++ b/app/Export/Exporter/ExporterInterface.php @@ -60,5 +60,4 @@ interface ExporterInterface * @param ExportJob $job */ public function setJob(ExportJob $job); - } diff --git a/app/Generator/Chart/Basic/GeneratorInterface.php b/app/Generator/Chart/Basic/GeneratorInterface.php index 99aa255035..37b089d903 100644 --- a/app/Generator/Chart/Basic/GeneratorInterface.php +++ b/app/Generator/Chart/Basic/GeneratorInterface.php @@ -88,5 +88,4 @@ interface GeneratorInterface * @return array */ public function singleSet(string $setLabel, array $data): array; - } diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index d3c20331d0..809e047b6f 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Audit; - use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface; @@ -52,8 +51,6 @@ class MonthReportGenerator implements ReportGeneratorInterface */ public function generate(): string { - - $auditData = []; $dayBefore = clone $this->start; $dayBefore->subDay(); @@ -81,7 +78,6 @@ class MonthReportGenerator implements ReportGeneratorInterface return view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow')) ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts) ->render(); - } /** diff --git a/app/Generator/Report/Audit/MultiYearReportGenerator.php b/app/Generator/Report/Audit/MultiYearReportGenerator.php index 54e61d51b7..42e06b1349 100644 --- a/app/Generator/Report/Audit/MultiYearReportGenerator.php +++ b/app/Generator/Report/Audit/MultiYearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Audit; - /** * Class MultiYearReportGenerator * diff --git a/app/Generator/Report/Audit/YearReportGenerator.php b/app/Generator/Report/Audit/YearReportGenerator.php index 865970e427..d5a7d8eb82 100644 --- a/app/Generator/Report/Audit/YearReportGenerator.php +++ b/app/Generator/Report/Audit/YearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Audit; - /** * Class YearReportGenerator * diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index bc93bc28e6..59edfe32ab 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Budget; - use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Generator\Report\Support; diff --git a/app/Generator/Report/Budget/MultiYearReportGenerator.php b/app/Generator/Report/Budget/MultiYearReportGenerator.php index 2185ee7ce6..2f49d7bd7f 100644 --- a/app/Generator/Report/Budget/MultiYearReportGenerator.php +++ b/app/Generator/Report/Budget/MultiYearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Budget; - /** * Class MultiYearReportGenerator * diff --git a/app/Generator/Report/Budget/YearReportGenerator.php b/app/Generator/Report/Budget/YearReportGenerator.php index 717c8b8371..3ac751cbc6 100644 --- a/app/Generator/Report/Budget/YearReportGenerator.php +++ b/app/Generator/Report/Budget/YearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Budget; - /** * Class YearReportGenerator * diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 68012445f7..58f110627c 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Category; - use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Generator\Report\Support; @@ -88,7 +87,15 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return view( 'reports.category.month', compact( - 'accountIds', 'categoryIds', 'topIncome', 'reportType', 'accountSummary', 'categorySummary', 'averageExpenses', 'averageIncome', 'topExpenses' + 'accountIds', + 'categoryIds', + 'topIncome', + 'reportType', + 'accountSummary', + 'categorySummary', + 'averageExpenses', + 'averageIncome', + 'topExpenses' ) ) ->with('start', $this->start)->with('end', $this->end) diff --git a/app/Generator/Report/Category/MultiYearReportGenerator.php b/app/Generator/Report/Category/MultiYearReportGenerator.php index a986490ba1..c3112ce681 100644 --- a/app/Generator/Report/Category/MultiYearReportGenerator.php +++ b/app/Generator/Report/Category/MultiYearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Category; - /** * Class MultiYearReportGenerator * diff --git a/app/Generator/Report/Category/YearReportGenerator.php b/app/Generator/Report/Category/YearReportGenerator.php index 6b83a5dd76..5186ec9f50 100644 --- a/app/Generator/Report/Category/YearReportGenerator.php +++ b/app/Generator/Report/Category/YearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Category; - /** * Class YearReportGenerator * diff --git a/app/Generator/Report/ReportGeneratorInterface.php b/app/Generator/Report/ReportGeneratorInterface.php index 7f6770e896..5fecbf0e91 100644 --- a/app/Generator/Report/ReportGeneratorInterface.php +++ b/app/Generator/Report/ReportGeneratorInterface.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report; - use Carbon\Carbon; use Illuminate\Support\Collection; @@ -80,5 +79,4 @@ interface ReportGeneratorInterface * @return ReportGeneratorInterface */ public function setTags(Collection $tags): ReportGeneratorInterface; - } diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index a9e5efd61e..c042e3ac13 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Standard; - use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Helpers\Report\ReportHelperInterface; diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index 42c20c943b..d625767dfd 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Standard; - use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use Illuminate\Support\Collection; diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index c61e97168a..8209e6bfc8 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Standard; - use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use Illuminate\Support\Collection; diff --git a/app/Generator/Report/Support.php b/app/Generator/Report/Support.php index f2aec9c1c5..c4749d1cc6 100644 --- a/app/Generator/Report/Support.php +++ b/app/Generator/Report/Support.php @@ -26,7 +26,6 @@ namespace FireflyIII\Generator\Report; use FireflyIII\Models\Transaction; use Illuminate\Support\Collection; - /** * Class Support * @@ -153,5 +152,4 @@ class Support return $result; } - } diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php index aa13b1897d..9abd0af38d 100644 --- a/app/Generator/Report/Tag/MonthReportGenerator.php +++ b/app/Generator/Report/Tag/MonthReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Tag; - use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Generator\Report\Support; @@ -88,8 +87,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface // render! return view( - 'reports.tag.month', compact( - 'accountIds', 'tagTags', 'reportType', 'accountSummary', 'tagSummary', 'averageExpenses', 'averageIncome', 'topIncome', + 'reports.tag.month', + compact( + 'accountIds', + 'tagTags', + 'reportType', + 'accountSummary', + 'tagSummary', + 'averageExpenses', + 'averageIncome', + 'topIncome', 'topExpenses' ) )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render(); diff --git a/app/Generator/Report/Tag/MultiYearReportGenerator.php b/app/Generator/Report/Tag/MultiYearReportGenerator.php index fc57ea6545..4be4f8a7dc 100644 --- a/app/Generator/Report/Tag/MultiYearReportGenerator.php +++ b/app/Generator/Report/Tag/MultiYearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Tag; - /** * Class MultiYearReportGenerator * diff --git a/app/Generator/Report/Tag/YearReportGenerator.php b/app/Generator/Report/Tag/YearReportGenerator.php index 46a9835694..5e362745dc 100644 --- a/app/Generator/Report/Tag/YearReportGenerator.php +++ b/app/Generator/Report/Tag/YearReportGenerator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Generator\Report\Tag; - /** * Class YearReportGenerator * diff --git a/app/Handlers/Events/AdminEventHandler.php b/app/Handlers/Events/AdminEventHandler.php index 5d4d35fca1..c08a81b9ed 100644 --- a/app/Handlers/Events/AdminEventHandler.php +++ b/app/Handlers/Events/AdminEventHandler.php @@ -44,7 +44,6 @@ class AdminEventHandler */ public function sendTestMessage(AdminRequestedTestMessage $event): bool { - $email = $event->user->email; $ipAddress = $event->ipAddress; diff --git a/app/Handlers/Events/StoredJournalEventHandler.php b/app/Handlers/Events/StoredJournalEventHandler.php index c8ec8c84c2..51cb16b375 100644 --- a/app/Handlers/Events/StoredJournalEventHandler.php +++ b/app/Handlers/Events/StoredJournalEventHandler.php @@ -137,7 +137,6 @@ class StoredJournalEventHandler $rules = $this->ruleGroupRepository->getActiveStoreRules($group); /** @var Rule $rule */ foreach ($rules as $rule) { - $processor = Processor::make($rule); $processor->handleTransactionJournal($journal); diff --git a/app/Handlers/Events/UpdatedJournalEventHandler.php b/app/Handlers/Events/UpdatedJournalEventHandler.php index 775ad01e7a..beca510fd2 100644 --- a/app/Handlers/Events/UpdatedJournalEventHandler.php +++ b/app/Handlers/Events/UpdatedJournalEventHandler.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Handlers\Events; - use FireflyIII\Events\UpdatedTransactionJournal; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleGroup; @@ -77,7 +76,6 @@ class UpdatedJournalEventHandler if ($rule->stop_processing) { break; } - } } diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index f110737aef..8f3379f2c5 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -152,7 +152,6 @@ class UserEventHandler */ public function sendRegistrationMail(RegisteredUser $event) { - $sendMail = env('SEND_REGISTRATION_MAIL', true); if (!$sendMail) { return true; // @codeCoverageIgnore diff --git a/app/Helpers/Attachments/AttachmentHelperInterface.php b/app/Helpers/Attachments/AttachmentHelperInterface.php index d439845694..4d398739dd 100644 --- a/app/Helpers/Attachments/AttachmentHelperInterface.php +++ b/app/Helpers/Attachments/AttachmentHelperInterface.php @@ -66,5 +66,4 @@ interface AttachmentHelperInterface * @return bool */ public function saveAttachmentsForModel(Model $model, ?array $files): bool; - } diff --git a/app/Helpers/FiscalHelperInterface.php b/app/Helpers/FiscalHelperInterface.php index 9539b2b54e..152ba48262 100644 --- a/app/Helpers/FiscalHelperInterface.php +++ b/app/Helpers/FiscalHelperInterface.php @@ -52,5 +52,4 @@ interface FiscalHelperInterface * @return Carbon date object */ public function startOfFiscalYear(Carbon $date): Carbon; - }