From 51a7fa86fc4f1f02ae725adafc0415e8274b3a68 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 23 Nov 2019 21:47:20 +0300 Subject: [PATCH] refactored report and update abstracts --- .../Listener.php => Listeners/Report.php} | 4 ++-- .../Listeners/Update.php} | 22 +++++++++++++------ app/Abstracts/{Reports => }/Report.php | 2 +- app/Listeners/Common/ExpenseSummaryReport.php | 2 +- .../Common/IncomeExpenseSummaryReport.php | 2 +- app/Listeners/Common/IncomeSummaryReport.php | 2 +- app/Listeners/Common/ProfitLossReport.php | 2 +- app/Listeners/Common/TaxSummaryReport.php | 2 +- app/Listeners/Update/V10/Version106.php | 2 +- app/Listeners/Update/V10/Version107.php | 2 +- app/Listeners/Update/V10/Version108.php | 2 +- app/Listeners/Update/V10/Version109.php | 2 +- app/Listeners/Update/V11/Version110.php | 2 +- app/Listeners/Update/V11/Version112.php | 2 +- app/Listeners/Update/V11/Version113.php | 2 +- app/Listeners/Update/V11/Version119.php | 2 +- app/Listeners/Update/V12/Version120.php | 2 +- app/Listeners/Update/V12/Version1210.php | 2 +- app/Listeners/Update/V12/Version1211.php | 2 +- app/Listeners/Update/V12/Version126.php | 2 +- app/Listeners/Update/V12/Version127.php | 2 +- app/Listeners/Update/V12/Version129.php | 2 +- app/Listeners/Update/V13/Version130.php | 2 +- app/Listeners/Update/V13/Version1311.php | 2 +- app/Listeners/Update/V13/Version1313.php | 2 +- app/Listeners/Update/V13/Version1316.php | 2 +- app/Listeners/Update/V13/Version132.php | 2 +- app/Listeners/Update/V13/Version135.php | 2 +- app/Listeners/Update/V13/Version138.php | 2 +- app/Listeners/Update/V13/Version139.php | 2 +- app/Listeners/Update/V20/Version200.php | 5 ++--- app/Listeners/Update/V20/Version201.php | 5 ++--- app/Reports/ExpenseSummary.php | 2 +- app/Reports/IncomeExpenseSummary.php | 2 +- app/Reports/IncomeSummary.php | 2 +- app/Reports/ProfitLoss.php | 2 +- app/Reports/TaxSummary.php | 2 +- 37 files changed, 54 insertions(+), 48 deletions(-) rename app/Abstracts/{Reports/Listener.php => Listeners/Report.php} (98%) rename app/{Listeners/Update/Listener.php => Abstracts/Listeners/Update.php} (50%) rename app/Abstracts/{Reports => }/Report.php (99%) diff --git a/app/Abstracts/Reports/Listener.php b/app/Abstracts/Listeners/Report.php similarity index 98% rename from app/Abstracts/Reports/Listener.php rename to app/Abstracts/Listeners/Report.php index 7db7fe65d..85ba4ad0a 100644 --- a/app/Abstracts/Reports/Listener.php +++ b/app/Abstracts/Listeners/Report.php @@ -1,6 +1,6 @@ alias != static::ALIAS) { - return false; + return true; } // Do not apply to the same or newer versions if (version_compare($event->old, static::VERSION, '>=')) { - return false; + return true; } - return true; + return false; + } + + /** + * @deprecated since 2.0 + */ + public function check($event) + { + return !$this->skipThisUpdate($event); } } diff --git a/app/Abstracts/Reports/Report.php b/app/Abstracts/Report.php similarity index 99% rename from app/Abstracts/Reports/Report.php rename to app/Abstracts/Report.php index c72e0ad4d..ebb362e55 100644 --- a/app/Abstracts/Reports/Report.php +++ b/app/Abstracts/Report.php @@ -1,6 +1,6 @@ check($event)) { + if ($this->skipThisUpdate($event)) { return; } diff --git a/app/Listeners/Update/V20/Version201.php b/app/Listeners/Update/V20/Version201.php index fc26a226e..58cd191f0 100644 --- a/app/Listeners/Update/V20/Version201.php +++ b/app/Listeners/Update/V20/Version201.php @@ -2,8 +2,8 @@ namespace App\Listeners\Update\V13; +use App\Abstracts\Listeners\Update as Listener; use App\Events\Install\UpdateFinished as Event; -use App\Listeners\Update\Listener; use Artisan; class Version201 extends Listener @@ -20,8 +20,7 @@ class Version201 extends Listener */ public function handle(Event $event) { - // Check if should listen - if (!$this->check($event)) { + if ($this->skipThisUpdate($event)) { return; } diff --git a/app/Reports/ExpenseSummary.php b/app/Reports/ExpenseSummary.php index 2514bca55..a99cd5023 100644 --- a/app/Reports/ExpenseSummary.php +++ b/app/Reports/ExpenseSummary.php @@ -2,7 +2,7 @@ namespace App\Reports; -use App\Abstracts\Reports\Report; +use App\Abstracts\Report; use App\Models\Banking\Transaction; use App\Models\Expense\Bill; use App\Utilities\Recurring; diff --git a/app/Reports/IncomeExpenseSummary.php b/app/Reports/IncomeExpenseSummary.php index e07aa90af..b581a72eb 100644 --- a/app/Reports/IncomeExpenseSummary.php +++ b/app/Reports/IncomeExpenseSummary.php @@ -2,7 +2,7 @@ namespace App\Reports; -use App\Abstracts\Reports\Report; +use App\Abstracts\Report; use App\Models\Banking\Transaction; use App\Models\Expense\Bill; use App\Models\Income\Invoice; diff --git a/app/Reports/IncomeSummary.php b/app/Reports/IncomeSummary.php index b6196c372..fd0c5cc00 100644 --- a/app/Reports/IncomeSummary.php +++ b/app/Reports/IncomeSummary.php @@ -2,7 +2,7 @@ namespace App\Reports; -use App\Abstracts\Reports\Report; +use App\Abstracts\Report; use App\Models\Banking\Transaction; use App\Models\Income\Invoice; use App\Utilities\Recurring; diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index e2a938b7f..9640ce8f0 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -2,7 +2,7 @@ namespace App\Reports; -use App\Abstracts\Reports\Report; +use App\Abstracts\Report; use App\Models\Banking\Transaction; use App\Models\Expense\Bill; use App\Models\Income\Invoice; diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index c5051f785..c2f00c0e0 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -2,7 +2,7 @@ namespace App\Reports; -use App\Abstracts\Reports\Report; +use App\Abstracts\Report; use App\Models\Banking\Transaction; use App\Models\Expense\Bill; use App\Models\Income\Invoice;