Refactoring some tests, updating tests to mostly meet PSR-12

Author: mintopia

.github/copilot-instructions.md

@@ -2,13 +2,11 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Event;
 use App\Models\LinkedAccount;
 use App\Models\SocialProvider;
 use App\Models\TicketType;
 use App\Models\User;
 use App\Services\DiscordApi;
-use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 

app/Console/Commands/SyncDiscordRoles.php

@@ -2,9 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\LinkedAccount;
 use App\Models\TicketProvider;
-use App\Models\TicketType;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 

app/Console/Commands/SyncTickets.php

@@ -23,6 +23,7 @@ class UpdateEventSeatingLock extends Command
      *
      */
     protected $description = 'Update Event Seating Locks';
+
     public function handle()
     {
         Event::where('seating_opens_at', '<=', Carbon::now())->chunk(100, function ($chunk) {

app/Console/Commands/UpdateEventSeatingLock.php

@@ -2,6 +2,7 @@
 
 namespace App\Console;
 
+use App\Console\Commands\UpdateEventSeatingLock;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -11,7 +12,7 @@ class Kernel extends ConsoleKernel
      * Define the application's commands.
      */
     protected $commands = [
-        \App\Console\Commands\UpdateEventSeatingLock::class,
+        UpdateEventSeatingLock::class,
     ];
 
     /**

app/Console/Kernel.php

@@ -5,7 +5,6 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\DeleteRequest;
 use App\Http\Requests\Admin\SeatGroupAssignmentUpdateRequest;
-use App\Http\Requests\Admin\SeatGroupUpdateRequest;
 use App\Models\Event;
 use App\Models\SeatGroup;
 use App\Models\SeatGroupAssignment;

app/Http/Controllers/Admin/SeatGroupAssignmentController.php

@@ -6,7 +6,6 @@
 use App\Http\Requests\Admin\DeleteRequest;
 use App\Http\Requests\Admin\SeatGroupUpdateRequest;
 use App\Models\Event;
-use App\Models\Seat;
 use App\Models\SeatGroup;
 use Illuminate\Http\Request;
 

app/Http/Controllers/Admin/SeatGroupController.php

@@ -9,6 +9,7 @@
 use App\Models\SocialProvider;
 use App\Models\Theme;
 use App\Models\TicketProvider;
+use Exception;
 
 class SettingController extends Controller
 {
@@ -51,6 +52,16 @@ public function addDiscord()
         return $provider->addBotToServer();
     }
 
+    /**
+     * Return an instance of the configured Discord provider.
+     * Extracted so tests can override or call provider retrieval directly.
+     */
+    protected function getDiscordProvider(?string $redirectUrl = null)
+    {
+        $redirect = $redirectUrl ?? route('admin.settings.discord_return');
+        return SocialProvider::whereCode('discord')->first()->getProvider($redirect);
+    }
+
     public function addDiscordReturn()
     {
         $serverName = Setting::whereCode('discord.server.name')->first();
@@ -60,7 +71,7 @@ public function addDiscordReturn()
             $serverName->value = $response->accessTokenResponseBody['guild']['name'];
             $serverId->value = $response->accessTokenResponseBody['guild']['id'];
             return response()->redirectToRoute('admin.settings.index')->with('successMessage', "Link to {{ $serverName->value }} has been successful");
-        } catch (\Exception $ex) {
+        } catch (Exception $ex) {
             $serverName->value = null;
             $serverId->value = null;
             return response()->redirectToRoute('admin.settings.index')->with('errorMessage', "Unable to link to Discord server");
@@ -70,16 +81,6 @@ public function addDiscordReturn()
         }
     }
 
-    /**
-     * Return an instance of the configured Discord provider.
-     * Extracted so tests can override or call provider retrieval directly.
-     */
-    protected function getDiscordProvider(?string $redirectUrl = null)
-    {
-        $redirect = $redirectUrl ?? route('admin.settings.discord_return');
-        return SocialProvider::whereCode('discord')->first()->getProvider($redirect);
-    }
-
     /**
      * Call the provider bot() flow and return the response object.
      * Extracted so tests can stub or call this method directly.

app/Http/Controllers/Admin/SettingController.php

@@ -32,6 +32,29 @@ public function store(ThemeUpdateRequest $request)
         return response()->redirectToRoute('admin.settings.index')->with('successMessage', 'The theme has been created');
     }
 
+    protected function updateObject(Theme $theme, Request $request)
+    {
+        $theme->active = (bool)$request->input('active');
+        $theme->dark_mode = (bool)$request->input('dark_mode');
+        if (!$theme->readonly) {
+            $map = [
+                'name',
+                'css',
+                'primary',
+                'nav_background',
+                'seat_available',
+                'seat_disabled',
+                'seat_taken',
+                'seat_clan',
+                'seat_selected',
+            ];
+            foreach ($map as $prop) {
+                $theme->{$prop} = $request->input($prop);
+            }
+        }
+        $theme->save();
+    }
+
     public function edit(Theme $theme)
     {
         return view('admin.themes.edit', [
@@ -45,16 +68,6 @@ public function update(ThemeUpdateRequest $request, Theme $theme)
         return response()->redirectToRoute('admin.settings.index')->with('successMessage', 'The theme has been updated');
     }
 
-    public function delete(Theme $theme)
-    {
-        if ($theme->readonly) {
-            abort(400);
-        }
-        return view('admin.themes.delete', [
-            'theme' => $theme,
-        ]);
-    }
-
     public function destroy(Theme $theme)
     {
         if ($theme->readonly) {
@@ -64,26 +77,13 @@ public function destroy(Theme $theme)
         return response()->redirectToRoute('admin.settings.index')->with('successMessage', 'The theme has been deleted');
     }
 
-    protected function updateObject(Theme $theme, Request $request)
+    public function delete(Theme $theme)
     {
-        $theme->active = (bool)$request->input('active');
-        $theme->dark_mode = (bool)$request->input('dark_mode');
-        if (!$theme->readonly) {
-            $map = [
-                'name',
-                'css',
-                'primary',
-                'nav_background',
-                'seat_available',
-                'seat_disabled',
-                'seat_taken',
-                'seat_clan',
-                'seat_selected',
-            ];
-            foreach ($map as $prop) {
-                $theme->{$prop} = $request->input($prop);
-            }
+        if ($theme->readonly) {
+            abort(400);
         }
-        $theme->save();
+        return view('admin.themes.delete', [
+            'theme' => $theme,
+        ]);
     }
 }

app/Http/Controllers/Admin/ThemeController.php

@@ -219,11 +219,6 @@ public function delete(Ticket $ticket)
         ]);
     }
 
-    public function import()
-    {
-        return view('admin.tickets.import');
-    }
-
     public function importShow(TicketImportRequest $request)
     {
         $csv = $request->file('csv')->get();
@@ -234,6 +229,11 @@ public function importShow(TicketImportRequest $request)
         ]);
     }
 
+    public function import()
+    {
+        return view('admin.tickets.import');
+    }
+
     public function importProcess(Request $request)
     {
         $imports = $request->session()->get('imports');