Added support for Laravel 11

composer.json

@@ -16,8 +16,8 @@
         }
     ],
     "require": {
-        "illuminate/support": "^9.0|^10.0",
-        "illuminate/filesystem": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0|^11.0",
+        "illuminate/filesystem": "^9.0|^10.0|^11.0",
         "laravel/socialite": "^5.10"
     },
     "require-dev": {

configure.php

@@ -58,12 +58,11 @@ function safeUnlink(string $filename)
     exit(1);
 }
 
-$file = app_path() . "/Http/Kernel.php";
+$file = app_path().'/Http/Kernel.php';
 replace_in_file($file, [
-    '\App\Http\Middleware\CheckSession::class,' => ""
+    '\App\Http\Middleware\CheckSession::class,' => '',
 ]);
 
-
 confirm('Execute `composer install` and run tests?') && run('composer install && composer test');
 
 confirm('Let this script delete itself?', true) && unlink(__FILE__);

migrations/2023_11_14_000000_update_users_table.php

@@ -12,17 +12,17 @@
     public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
-            if(!Schema::hasColumn('users', 'netid')) {
+            if (! Schema::hasColumn('users', 'netid')) {
                 $table->string('netid')->after('id');
             }
 
-            if(!Schema::hasColumn('users', 'first_name')) {
+            if (! Schema::hasColumn('users', 'first_name')) {
                 $table->string('first_name')->after('name');
             }
-            if(!Schema::hasColumn('users', 'last_name')) {
+            if (! Schema::hasColumn('users', 'last_name')) {
                 $table->string('last_name')->after('first_name');
             }
-            if(!Schema::hasColumn('users', 'uin')) {
+            if (! Schema::hasColumn('users', 'uin')) {
                 $table->string('uin', 9)->after('netid')->unique();
             }
 

migrations/2023_11_14_000001_update_netid_and_name.php

@@ -29,17 +29,11 @@ public function down(): void
         });
     }
 
-    /**
-     * @return bool
-     */
     protected function updateNetid(): bool
     {
         return DB::connection()->statement('UPDATE `users` SET `netid` = `name`');
     }
 
-    /**
-     * @return bool
-     */
     protected function updateName(): bool
     {
         return DB::connection()->statement('UPDATE `users` SET `name` = CONCAT(`first_name`, " ", `last_name`)');

src/Http/Middleware/AddOidcHeader.php

@@ -10,7 +10,6 @@ class AddOidcHeader
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
@@ -22,6 +21,7 @@ public function handle(Request $request, Closure $next)
             $response->headers->set('X-Username', $user->email);
             $_SERVER['X-Username'] = $user->email;
         }
+
         return $response;
     }
 }

src/Oidc/ShibbolethOidcProvider.php

@@ -185,8 +185,6 @@ public function user()
 
     /**
      * Map Api response data to a User Object.
-     * @param array $user
-     * @return User
      */
     protected function mapUserToObject(array $user): User
     {
@@ -198,7 +196,7 @@ protected function mapUserToObject(array $user): User
             'name' => $user['given_name'].' '.$user['family_name'],
             'email' => $user['email'],
             'password' => Hash::make($user['uisedu_uin'].now()),
-            'groups' =>  array_key_exists('uisedu_is_member_of', $user) ? $user['uisedu_is_member_of']: []
+            'groups' => array_key_exists('uisedu_is_member_of', $user) ? $user['uisedu_is_member_of'] : [],
         ]);
     }