Merge pull request #38 from mintopia/develop

Laravel 11, Bugfixes and Improvements

Author: mintopia

app/Console/Commands/UpdateEventSeatingLock.php

@@ -28,7 +28,7 @@ class UpdateEventSeatingLock extends Command
      */
     public function handle()
     {
-        Event::where('seating_opens_at', '<', Carbon::now())->chunk(100, function($chunk) {
+        Event::where('seating_opens_at', '<=', Carbon::now())->chunk(100, function($chunk) {
             foreach ($chunk as $event) {
                 $this->output->writeln("{$event} Unlocking seating");
                 Log::info("{$event}: Unlocking seating");
@@ -37,11 +37,11 @@ public function handle()
                 $event->save();
             }
         });
-        Event::where('seating_closes_at', '<', Carbon::now())->chunk(100, function($chunk) {
+        Event::where('seating_closes_at', '<=', Carbon::now())->chunk(100, function($chunk) {
             foreach ($chunk as $event) {
                 $this->output->writeln("{$event} Locking seating");
                 Log::info("{$event}: Locking seating");
-                $event->seating_locked = false;
+                $event->seating_locked = true;
                 $event->seating_closes_at = null;
                 $event->save();
             }

app/Http/Controllers/Admin/SeatingPlanController.php

@@ -35,10 +35,14 @@ protected function updateObject(SeatingPlan $plan, Request $request)
     {
         $plan->name = $request->input('name');
         $plan->image_url = $request->input('image_url');
-        $imageSizeArr = getimagesize($request->input('image_url'));
-        if($imageSizeArr) {
-            $plan->image_height = $imageSizeArr[1];
-            $plan->image_width = $imageSizeArr[0];
+        $plan->image_height = null;
+        $plan->image_width = null;
+        if ($plan->image_url) {
+            $imageSizeArr = getimagesize($request->input('image_url'));
+            if ($imageSizeArr) {
+                $plan->image_height = $imageSizeArr[1];
+                $plan->image_width = $imageSizeArr[0];
+            }
         }
         $plan->scale = $request->input('scale') ? $request->input('scale') : 100;
         $plan->save();

app/Models/SeatingPlan.php

@@ -173,7 +173,7 @@ public function import(string $csv, bool $wipe = false): void
                 $seat->description = $row[6] ?? null;
                 $seat->class = $row[7] ?? null;
                 $seat->seat_group_id = (int)$row[8] ?? null;
-                $seat->disabled = (bool)$row[8];
+                $seat->disabled = (bool)$row[9];
 
                 $seat->saveQuietly();
             }

composer.json

@@ -4,15 +4,15 @@
     "description": "LAN Party Signup and Seating Manager",
     "license": "MIT",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "aws/aws-sdk-php": "^3.293",
         "guzzlehttp/guzzle": "^7.2",
-        "laravel/framework": "^10.10",
+        "laravel/framework": "^11.22",
         "laravel/prompts": "*",
         "laravel/pulse": "^1.0@beta",
-        "laravel/sanctum": "^3.3",
+        "laravel/sanctum": "^4.0",
         "laravel/socialite": "^5.11",
-        "laravel/telescope": "^4.17",
+        "laravel/telescope": "^5.0",
         "laravel/tinker": "^2.8",
         "ramsey/uuid": "^4.7",
         "socialiteproviders/discord": "^4.2",
@@ -25,12 +25,12 @@
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.9",
-        "barryvdh/laravel-ide-helper": "^2.13",
+        "barryvdh/laravel-ide-helper": "^3.1",
         "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^7.0",
+        "nunomaduro/collision": "^8.0",
         "phpunit/phpunit": "^10.1",
         "spatie/laravel-ignition": "^2.0"
     },