Merge pull request #11 from ssddanbrown/analysis-RP19wp

Apply fixes from StyleCI
ssddanbrown · May 5, 2023 · 05a98f7 · 05a98f7
2 parents 827f73e + baf0862
commit 05a98f7
Show file tree

Hide file tree

Showing 73 changed files with 383 additions and 396 deletions.
diff --git a/app/Console/Commands/AddUserCommand.php b/app/Console/Commands/AddUserCommand.php
@@ -50,9 +50,9 @@ public function handle(): int
         }
 
         $user = User::query()->where('email', '=', $email)->first();
-        if (! is_null($user)) {
+        if (!is_null($user)) {
             $update = $this->confirm('User with that email already exists, Do you want to update them?');
-            if (! $update) {
+            if (!$update) {
                 $this->error('Taking no action');
 
                 return 1;
@@ -62,8 +62,8 @@ public function handle(): int
         }
 
         $user->fill([
-            'name' => $name,
-            'email' => $email,
+            'name'     => $name,
+            'email'    => $email,
             'password' => Hash::make($password),
         ]);
         $user->save();

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -25,7 +25,7 @@ protected function schedule(Schedule $schedule): void
      */
     protected function commands(): void
     {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');
 
         require base_path('routes/console.php');
     }

diff --git a/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/app/Http/Controllers/Auth/ConfirmablePasswordController.php
@@ -24,8 +24,8 @@ public function show(Request $request): View
      */
     public function store(Request $request): RedirectResponse
     {
-        if (! Auth::validate([
-            'email' => $request->user()->email,
+        if (!Auth::validate([
+            'email'    => $request->user()->email,
             'password' => $request->password,
         ])) {
             return back()->withErrors([

diff --git a/app/Http/Controllers/Auth/NewPasswordController.php b/app/Http/Controllers/Auth/NewPasswordController.php
@@ -31,8 +31,8 @@ public function create(Request $request): View
     public function store(Request $request): RedirectResponse
     {
         $request->validate([
-            'token' => 'required',
-            'email' => 'required|email',
+            'token'    => 'required',
+            'email'    => 'required|email',
             'password' => 'required|string|confirmed|min:8',
         ]);
 
@@ -43,7 +43,7 @@ public function store(Request $request): RedirectResponse
             $request->only('email', 'password', 'password_confirmation', 'token'),
             function ($user) use ($request) {
                 $user->forceFill([
-                    'password' => Hash::make($request->password),
+                    'password'       => Hash::make($request->password),
                     'remember_token' => Str::random(60),
                 ])->save();
 

diff --git a/app/Http/Controllers/CampaignController.php b/app/Http/Controllers/CampaignController.php
@@ -17,7 +17,7 @@ public function index(Request $request): View
         $query = Campaign::query()->withCount(['sends', 'rssFeeds'])->orderBy('name');
         $search = $request->get('search');
         if ($search) {
-            $query->where('name', 'like', '%'.$search.'%');
+            $query->where('name', 'like', '%' . $search . '%');
         }
 
         $campaigns = $query->paginate(100)->withQueryString();
@@ -37,7 +37,7 @@ public function show(Request $request, Campaign $campaign): View
             ->withCount(['feeds']);
         $search = $request->get('search');
         if ($search) {
-            $sendQuery->where('name', 'like', '%'.$search.'%');
+            $sendQuery->where('name', 'like', '%' . $search . '%');
         }
 
         $sends = $sendQuery->paginate(100)->withQueryString();

diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php
@@ -18,7 +18,7 @@ public function index(Request $request): View
         $query = Contact::query()->orderBy('email')->withCount(['lists']);
         $search = $request->get('search');
         if ($search) {
-            $query->where('email', 'like', '%'.$search.'%');
+            $query->where('email', 'like', '%' . $search . '%');
         }
 
         $contacts = $query->paginate(100)->withQueryString();
@@ -44,12 +44,12 @@ public function create(): View
     public function store(Request $request): RedirectResponse
     {
         $this->validate($request, [
-            'email' => 'required|email|unique:contacts,email',
+            'email'        => 'required|email|unique:contacts,email',
             'unsubscribed' => 'boolean',
         ]);
 
         $contact = new Contact([
-            'email' => $request->get('email'),
+            'email'        => $request->get('email'),
             'unsubscribed' => $request->get('unsubscribed') === '1',
         ]);
         $contact->save();
@@ -72,7 +72,7 @@ public function edit(Contact $contact): View
             })->toArray();
 
         return view('contacts.edit', [
-            'contact' => $contact,
+            'contact'     => $contact,
             'listOptions' => $allListOptions,
         ]);
     }
@@ -83,12 +83,12 @@ public function edit(Contact $contact): View
     public function update(Request $request, Contact $contact): RedirectResponse
     {
         $this->validate($request, [
-            'email' => "required|email|unique:contacts,email,{$contact->id}",
+            'email'        => "required|email|unique:contacts,email,{$contact->id}",
             'unsubscribed' => 'boolean',
         ]);
 
         $contact->update([
-            'email' => $request->get('email'),
+            'email'        => $request->get('email'),
             'unsubscribed' => $request->get('unsubscribed') === '1',
         ]);
 

diff --git a/app/Http/Controllers/ContactListController.php b/app/Http/Controllers/ContactListController.php
@@ -15,7 +15,7 @@ class ContactListController extends Controller
     public function add(Request $request, Contact $contact): RedirectResponse
     {
         $this->validate($request, [
-            'lists' => 'array',
+            'lists'   => 'array',
             'lists.*' => 'integer',
         ]);
 
@@ -33,7 +33,7 @@ public function add(Request $request, Contact $contact): RedirectResponse
     public function remove(Request $request, Contact $contact): RedirectResponse
     {
         $this->validate($request, [
-            'lists' => 'array',
+            'lists'   => 'array',
             'lists.*' => 'integer',
         ]);
 

diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
@@ -15,11 +15,11 @@ class DashboardController extends Controller
     public function index(): View
     {
         return view('dashboard.index', [
-            'recentSends' => $this->recentSends(),
-            'latestContacts' => $this->latestContacts(),
-            'popularLists' => $this->popularLists(),
+            'recentSends'      => $this->recentSends(),
+            'latestContacts'   => $this->latestContacts(),
+            'popularLists'     => $this->popularLists(),
             'upcomingRssFeeds' => $this->upcomingRssFeeds(),
-            'counts' => $this->getCounts(),
+            'counts'           => $this->getCounts(),
         ]);
     }
 
@@ -30,8 +30,8 @@ protected function getCounts(): array
     {
         return [
             'contacts' => Contact::query()->count(),
-            'sends' => Send::query()->count(),
-            'sent' => SendRecord::query()->count(),
+            'sends'    => Send::query()->count(),
+            'sent'     => SendRecord::query()->count(),
         ];
     }
 

diff --git a/app/Http/Controllers/ListController.php b/app/Http/Controllers/ListController.php
@@ -18,8 +18,8 @@ public function index(Request $request): View
         $query = MailList::query()->orderBy('name')->withCount('contacts');
         $search = $request->get('search');
         if ($search) {
-            $query->where('name', 'like', '%'.$search.'%')
-                ->orWhere('display_name', 'like', '%'.$search.'%');
+            $query->where('name', 'like', '%' . $search . '%')
+                ->orWhere('display_name', 'like', '%' . $search . '%');
         }
 
         $lists = $query->paginate(100)->withQueryString();
@@ -37,13 +37,13 @@ public function show(MailList $list, Request $request): View
         $query = $list->contacts()->orderBy('email');
         $search = $request->get('search');
         if ($search) {
-            $query->where('email', 'like', '%'.$search.'%');
+            $query->where('email', 'like', '%' . $search . '%');
         }
 
         $contacts = $query->paginate(100)->withQueryString();
 
         return view('lists.show', [
-            'list' => $list,
+            'list'     => $list,
             'contacts' => $contacts,
         ]);
     }
@@ -64,9 +64,9 @@ public function create(): View
     public function store(Request $request): RedirectResponse
     {
         $this->validate($request, [
-            'name' => 'required|max:250',
+            'name'         => 'required|max:250',
             'display_name' => 'required|max:250',
-            'slug' => 'max:250|alpha_dash|unique:mail_lists,slug',
+            'slug'         => 'max:250|alpha_dash|unique:mail_lists,slug',
         ]);
 
         $list = new MailList($request->all());
@@ -94,9 +94,9 @@ public function edit(MailList $list): View
     public function update(Request $request, MailList $list): RedirectResponse
     {
         $this->validate($request, [
-            'name' => 'required|max:250',
+            'name'         => 'required|max:250',
             'display_name' => 'required|max:250',
-            'slug' => "max:250|alpha_dash|unique:mail_lists,slug,{$list->id}",
+            'slug'         => "max:250|alpha_dash|unique:mail_lists,slug,{$list->id}",
         ]);
 
         $list->fill($request->all());

diff --git a/app/Http/Controllers/RssFeedController.php b/app/Http/Controllers/RssFeedController.php
@@ -29,11 +29,11 @@ public function create(Campaign $campaign): View
     public function store(Request $request, Campaign $campaign): RedirectResponse
     {
         $validated = $this->validate($request, [
-            'active' => 'required|bool',
-            'url' => ['required', 'url', 'max:250', new ValidRssFeedRule()],
+            'active'           => 'required|bool',
+            'url'              => ['required', 'url', 'max:250', new ValidRssFeedRule()],
             'template_send_id' => 'required|exists:sends,id',
-            'send_frequency' => 'required|integer|min:1|max:366',
-            'target_hour' => 'required|integer|min:0|max:23',
+            'send_frequency'   => 'required|integer|min:1|max:366',
+            'target_hour'      => 'required|integer|min:0|max:23',
         ]);
 
         $feed = new RssFeed($validated);
@@ -60,11 +60,11 @@ public function edit(Campaign $campaign, RssFeed $feed): View
     public function update(Request $request, Campaign $campaign, RssFeed $feed): RedirectResponse
     {
         $validated = $this->validate($request, [
-            'active' => 'required|bool',
-            'url' => ['required', 'url', 'max:250', new ValidRssFeedRule()],
+            'active'           => 'required|bool',
+            'url'              => ['required', 'url', 'max:250', new ValidRssFeedRule()],
             'template_send_id' => 'required|exists:sends,id',
-            'send_frequency' => 'required|integer|min:1|max:366',
-            'target_hour' => 'required|integer|min:0|max:23',
+            'send_frequency'   => 'required|integer|min:1|max:366',
+            'target_hour'      => 'required|integer|min:0|max:23',
         ]);
 
         $feed->fill($validated);

diff --git a/app/Http/Controllers/SendController.php b/app/Http/Controllers/SendController.php
@@ -35,7 +35,7 @@ public function create(Request $request): View
         }
 
         return view('sends.create', [
-            'send' => $default,
+            'send'     => $default,
             'campaign' => $campaign,
         ]);
     }
@@ -46,11 +46,11 @@ public function create(Request $request): View
     public function store(Request $request): RedirectResponse
     {
         $validated = $this->validate($request, [
-            'name' => 'required|max:250',
-            'content' => 'required|max:25000',
-            'subject' => 'required|max:250',
+            'name'         => 'required|max:250',
+            'content'      => 'required|max:25000',
+            'subject'      => 'required|max:250',
             'mail_list_id' => 'required|exists:mail_lists,id',
-            'campaign_id' => 'required|exists:campaigns,id',
+            'campaign_id'  => 'required|exists:campaigns,id',
         ]);
 
         $send = new Send($validated);
@@ -75,11 +75,11 @@ public function edit(Send $send): View
     public function update(Request $request, Send $send): RedirectResponse
     {
         $validated = $this->validate($request, [
-            'name' => 'required|max:250',
-            'content' => 'required|max:25000',
-            'subject' => 'required|max:250',
+            'name'         => 'required|max:250',
+            'content'      => 'required|max:25000',
+            'subject'      => 'required|max:250',
             'mail_list_id' => 'exists:mail_lists,id',
-            'campaign_id' => 'exists:campaigns,id',
+            'campaign_id'  => 'exists:campaigns,id',
         ]);
 
         $send->update($validated);

diff --git a/app/Http/Controllers/UnsubscribeController.php b/app/Http/Controllers/UnsubscribeController.php
@@ -19,7 +19,7 @@ public function show(string $sendRecordKey)
     {
         /** @var ?SendRecord $sendRecord */
         $sendRecord = SendRecord::query()->where('key', '=', $sendRecordKey)->first();
-        if (! $sendRecord || $sendRecord->hasExpired()) {
+        if (!$sendRecord || $sendRecord->hasExpired()) {
             return response()->view('unsubscribe.not-found', [], 404);
         }
 

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -18,8 +18,8 @@ public function index(Request $request): View
         $query = User::query()->orderBy('name');
         $search = $request->get('search');
         if ($search) {
-            $query->where('name', 'like', '%'.$search.'%')
-                ->orWhere('email', 'like', '%'.$search.'%');
+            $query->where('name', 'like', '%' . $search . '%')
+                ->orWhere('email', 'like', '%' . $search . '%');
         }
 
         $users = $query->paginate(100)->withQueryString();
@@ -43,14 +43,14 @@ public function create(): View
     public function store(Request $request): RedirectResponse
     {
         $this->validate($request, [
-            'email' => 'required|email|unique:users,email',
-            'name' => 'required|string|max:250',
+            'email'    => 'required|email|unique:users,email',
+            'name'     => 'required|string|max:250',
             'password' => 'required|string|min:8|max:250',
         ]);
 
         $user = new User([
-            'email' => $request->get('email'),
-            'name' => $request->get('name'),
+            'email'    => $request->get('email'),
+            'name'     => $request->get('name'),
             'password' => Hash::make($request->get('password')),
         ]);
         $user->save();
@@ -74,14 +74,14 @@ public function edit(User $user): View
     public function update(Request $request, User $user): RedirectResponse
     {
         $this->validate($request, [
-            'email' => 'required|email|unique:users,email,'.$user->id,
-            'name' => 'required|string|max:250',
+            'email'    => 'required|email|unique:users,email,' . $user->id,
+            'name'     => 'required|string|max:250',
             'password' => 'nullable|string|min:8|max:250',
         ]);
 
         $user->fill($request->only(['email', 'name']));
 
-        if ($request->has('password') && ! empty($request->get('password'))) {
+        if ($request->has('password') && !empty($request->get('password'))) {
             $user->password = Hash::make($request->get('password'));
         }
 

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -39,7 +39,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class . ':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
@@ -52,15 +52,15 @@ class Kernel extends HttpKernel
      * @var array<string, string>
      */
     protected $middlewareAliases = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'auth'             => \App\Http\Middleware\Authenticate::class,
+        'auth.basic'       => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'auth.session'     => \Illuminate\Session\Middleware\AuthenticateSession::class,
+        'cache.headers'    => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+        'can'              => \Illuminate\Auth\Middleware\Authorize::class,
+        'guest'            => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'signed'           => \Illuminate\Routing\Middleware\ValidateSignature::class,
+        'throttle'         => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified'         => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
 }