From 76c83f205ac6db770cb38b59bd286ffe939468bb Mon Sep 17 00:00:00 2001 From: Manojkiran Appathurai Date: Tue, 5 May 2020 05:15:29 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Campaign.php | 15 ++++++++------- app/Http/Controllers/CampaignController.php | 10 +++++----- app/Http/Controllers/ListsController.php | 6 +++--- app/Http/Requests/CampaignStoreRequest.php | 2 +- app/Http/Requests/ImportSaveRequest.php | 2 +- app/Http/Requests/SendTestMailRequest.php | 2 +- app/Http/Requests/SettingsUpdateRequest.php | 2 +- app/Http/Requests/SmtpSettings.php | 4 ++-- app/Providers/AppServiceProvider.php | 4 ++-- app/View/Components/CheckErrorExistsComponent.php | 3 +-- app/View/Components/ErrorAlertComponent.php | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/Campaign.php b/app/Campaign.php index 0c12d3e..28c6b8e 100644 --- a/app/Campaign.php +++ b/app/Campaign.php @@ -14,21 +14,22 @@ class Campaign extends Model const FINISHED = 'finished'; /** - * Checks if Current Campaign status is as Specified + * Checks if Current Campaign status is as Specified. * * @param string $status * @return bool **/ - public function isInStatus(string $status):bool + public function isInStatus(string $status): bool { - if($this->status === $status){ + if ($this->status === $status) { return true; } + return false; } /** - * Checks if Current Campaign status is Draft + * Checks if Current Campaign status is Draft. * * @return bool **/ @@ -38,7 +39,7 @@ public function isDraft() } /** - * Checks if Current Campaign status is Not Draft + * Checks if Current Campaign status is Not Draft. * * @return bool **/ @@ -48,7 +49,7 @@ public function isNotDraft() } /** - * Checks if Current Campaign status is Finished + * Checks if Current Campaign status is Finished. * * @return bool **/ @@ -58,7 +59,7 @@ public function isFinished() } /** - * Checks if Current Campaign status is Not FINISHED + * Checks if Current Campaign status is Not FINISHED. * * @return bool **/ diff --git a/app/Http/Controllers/CampaignController.php b/app/Http/Controllers/CampaignController.php index 53d01d3..c1aa305 100644 --- a/app/Http/Controllers/CampaignController.php +++ b/app/Http/Controllers/CampaignController.php @@ -128,12 +128,12 @@ public function update(CampaignStoreRequest $request, Campaign $campaign) return back(); } - $updationArray = array_merge($request->only(['subject', 'sending_name', 'sending_email','content']), + $updationArray = array_merge($request->only(['subject', 'sending_name', 'sending_email', 'content']), [ - 'track_clicks' => $request->track_clicks ? 1 : 0, - 'track_opens' => $request->track_opens ? 1 : 0, - ]); - + 'track_clicks' => $request->track_clicks ? 1 : 0, + 'track_opens' => $request->track_opens ? 1 : 0, + ]); + $campaign->update($updationArray); return redirect()->route('campaigns.show', $campaign->id); diff --git a/app/Http/Controllers/ListsController.php b/app/Http/Controllers/ListsController.php index 018030a..8c6f53a 100644 --- a/app/Http/Controllers/ListsController.php +++ b/app/Http/Controllers/ListsController.php @@ -49,7 +49,7 @@ public function create() */ public function store(ListStoreRequest $request) { - if(! $request->exists('double_opt_in')){ + if (! $request->exists('double_opt_in')) { $request->request->add(['double_opt_in' => 0]); } @@ -66,7 +66,7 @@ public function store(ListStoreRequest $request) */ public function show(Request $request, Lists $lists) { - $contacts = Contact::where('list_id','=',$lists->id) + $contacts = Contact::where('list_id', '=', $lists->id) ->where('subscribed', ! $request->subscribed) ->orderBy('id', 'desc') ->paginate(10); @@ -94,7 +94,7 @@ public function edit(Lists $lists) */ public function update(ListUpdateRequest $request, Lists $lists) { - if(! $request->exists('double_opt_in')){ + if (! $request->exists('double_opt_in')) { $request->request->add(['double_opt_in' => 0]); } diff --git a/app/Http/Requests/CampaignStoreRequest.php b/app/Http/Requests/CampaignStoreRequest.php index e00d666..7056add 100644 --- a/app/Http/Requests/CampaignStoreRequest.php +++ b/app/Http/Requests/CampaignStoreRequest.php @@ -26,7 +26,7 @@ public function rules() return [ 'subject' => ['required'], 'sending_name' => ['required'], - 'sending_email' => ['required','email'], + 'sending_email' => ['required', 'email'], 'content' => ['required'], ]; } diff --git a/app/Http/Requests/ImportSaveRequest.php b/app/Http/Requests/ImportSaveRequest.php index b62370d..d29c2b9 100644 --- a/app/Http/Requests/ImportSaveRequest.php +++ b/app/Http/Requests/ImportSaveRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'file' => ['required','mimes:csv,txt'], + 'file' => ['required', 'mimes:csv,txt'], ]; } } diff --git a/app/Http/Requests/SendTestMailRequest.php b/app/Http/Requests/SendTestMailRequest.php index 9c9fe55..fb9c6d1 100644 --- a/app/Http/Requests/SendTestMailRequest.php +++ b/app/Http/Requests/SendTestMailRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'email' => ['email','required'], + 'email' => ['email', 'required'], ]; } } diff --git a/app/Http/Requests/SettingsUpdateRequest.php b/app/Http/Requests/SettingsUpdateRequest.php index f2dae87..354d3e1 100644 --- a/app/Http/Requests/SettingsUpdateRequest.php +++ b/app/Http/Requests/SettingsUpdateRequest.php @@ -25,7 +25,7 @@ public function rules() { return [ 'name' => ['required'], - 'email' => ['required','email'], + 'email' => ['required', 'email'], ]; } } diff --git a/app/Http/Requests/SmtpSettings.php b/app/Http/Requests/SmtpSettings.php index d5e436b..e8c0086 100644 --- a/app/Http/Requests/SmtpSettings.php +++ b/app/Http/Requests/SmtpSettings.php @@ -25,11 +25,11 @@ public function rules() { return [ 'host' => ['required'], - 'port' => ['required','integer'], + 'port' => ['required', 'integer'], 'username' => ['required'], 'password' => ['required'], 'name' => ['required'], - 'address' => ['required','email'], + 'address' => ['required', 'email'], ]; } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 995f6e9..b33c825 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,10 +3,10 @@ namespace App\Providers; use App\View\Components\CheckErrorExistsComponent; +use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; use Laravel\Dusk\DuskServiceProvider; -use Illuminate\Support\Facades\Blade; class AppServiceProvider extends ServiceProvider { @@ -19,7 +19,7 @@ public function register() { if ($this->app->environment('local', 'testing')) { $this->app->register(DuskServiceProvider::class); - } + } } /** diff --git a/app/View/Components/CheckErrorExistsComponent.php b/app/View/Components/CheckErrorExistsComponent.php index 9660e8b..6ccbee9 100644 --- a/app/View/Components/CheckErrorExistsComponent.php +++ b/app/View/Components/CheckErrorExistsComponent.php @@ -6,8 +6,7 @@ class CheckErrorExistsComponent extends Component { - /** @var string $controlName */ - + /** @var string */ public $controlName; /** diff --git a/app/View/Components/ErrorAlertComponent.php b/app/View/Components/ErrorAlertComponent.php index f684195..5196334 100644 --- a/app/View/Components/ErrorAlertComponent.php +++ b/app/View/Components/ErrorAlertComponent.php @@ -6,7 +6,7 @@ class ErrorAlertComponent extends Component { - /** @var string $errorMessage */ + /** @var string */ public $errorMessage; /**