Merge pull request #681 from DirectoryTree/laravel-12

Add Laravel 12 Support

Author: stevebauman

.github/workflows/run-tests.yml

@@ -8,23 +8,28 @@ on:
 
 jobs:
     run-tests:
-        runs-on: ${{ matrix.os }}
+        runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest]
-                php: [8.2, 8.1]
-                laravel: [10.*, 9.*, 8.*]
-                dependency-version: [prefer-stable]
                 include:
-                    - laravel: 10.*
+                    - php: 8.4
+                      laravel: 12.*
+                      testbench: 10.*
+
+                    - php: 8.4
+                      laravel: 11.*
+                      testbench: 9.*
+
+                    - php: 8.3
+                      laravel: 10.*
                       testbench: 8.*
-                    - laravel: 9.*
+
+                    - php: 8.2
+                      laravel: 9.*
                       testbench: 7.*
-                    - laravel: 8.*
-                      testbench: 6.*
 
-        name: ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+        name: P${{ matrix.php }} - L${{ matrix.laravel }}
 
         steps:
             - name: Checkout code
@@ -46,7 +51,7 @@ jobs:
             - name: Install dependencies
               run: |
                   composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
-                  composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+                  composer update --prefer-stable --prefer-dist --no-interaction
 
             - name: Execute tests
               run: vendor/bin/phpunit --testdox

composer.json

@@ -15,12 +15,12 @@
         "ext-json": "*",
         "ramsey/uuid": "*",
         "directorytree/ldaprecord": "^v3.3",
-        "illuminate/support": "^8.0|^9.0|^10.0|^11.0"
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": "^8.0|^9.0|^10.0|^11.0",
-        "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0",
+        "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0|^10.0",
         "spatie/ray": "^1.28",
         "laravel/sanctum": "*",
         "laravel/pint": "^1.9"

database/migrations/add_ldap_columns_to_users_table.php.stub database/migrations/2025_01_01_000000_add_ldap_columns_to_users_table.php

@@ -1,18 +1,16 @@
 <?php
 
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
 
-class AddLdapColumnsToUsersTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     * 
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $driver = Schema::getConnection()->getDriverName();
 
@@ -34,10 +32,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     * 
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn(['guid', 'domain']);
@@ -46,13 +42,8 @@ public function down()
 
     /**
      * Compile a compatible "unique" SQL Server index constraint.
-     * 
-     * @param string $table
-     * @param string $column 
-     * 
-     * @return string 
      */
-    protected function compileUniqueSqlServerIndexStatement($table, $column)
+    protected function compileUniqueSqlServerIndexStatement(string $table, string $column): string
     {
         return sprintf('create unique index %s on %s (%s) where %s is not null',
             implode('_', [$table, $column, 'unique']),
@@ -61,4 +52,4 @@ protected function compileUniqueSqlServerIndexStatement($table, $column)
             $column
         );
     }
-}
+};

src/LdapAuthServiceProvider.php

@@ -43,11 +43,9 @@ protected function registerMigrations(): void
             return;
         }
 
-        if (! class_exists('AddLdapColumnsToUsersTable')) {
-            $this->publishes([
-                __DIR__.'/../database/migrations/add_ldap_columns_to_users_table.php.stub' => database_path('migrations/'.date('Y_m_d_His', time()).'_add_ldap_columns_to_users_table.php'),
-            ], 'migrations');
-        }
+        $this->publishes([
+            __DIR__.'/../database/migrations' => database_path('migrations'),
+        ], 'migrations');
     }
 
     /**

tests/Feature/DatabaseTestCase.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Auth\EloquentUserProvider;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use LdapRecord\Laravel\Auth\DatabaseUserProvider;
 use LdapRecord\Laravel\Import\UserSynchronizer;
@@ -13,33 +14,26 @@
 use LdapRecord\Models\ActiveDirectory\User;
 use LdapRecord\Models\Model;
 use Mockery as m;
+use Orchestra\Testbench\Attributes\WithMigration;
 
+#[WithMigration]
 class DatabaseTestCase extends TestCase
 {
+    use RefreshDatabase;
+
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->createUsersTable();
+        Schema::table('users', function (Blueprint $table) {
+            $table->softDeletes();
+        });
     }
 
-    protected function createUsersTable()
+    protected function defineDatabaseMigrations()
     {
-        // Setup the users database table.
-        Schema::create('users', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name');
-            $table->string('email')->unique();
-            $table->timestamp('email_verified_at')->nullable();
-            $table->string('password');
-            $table->rememberToken();
-            $table->timestamps();
-            $table->softDeletes();
-
-            // Additional fields for LdapRecord.
-            $table->string('guid')->unique()->nullable();
-            $table->string('domain')->nullable();
-        });
+        $this->loadMigrationsFrom(__DIR__.'/../../database/migrations');
+        $this->loadMigrationsFrom(__DIR__.'/../../vendor/laravel/sanctum/database/migrations');
     }
 
     protected function getMockLdapModel(array $attributes = [])

tests/Feature/SanctumTest.php

@@ -2,7 +2,6 @@
 
 namespace LdapRecord\Laravel\Tests\Feature;
 
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
@@ -14,7 +13,6 @@
 class SanctumTest extends DatabaseTestCase
 {
     use CreatesTestUsers;
-    use DatabaseMigrations;
 
     protected function setUp(): void
     {
@@ -36,10 +34,16 @@ protected function setUp(): void
 
         Route::post('api/sanctum/token', function (Request $request) {
             if (Auth::validate($request->only('mail', 'password'))) {
-                return ['token' => Auth::getLastAttempted()->createToken($request->device_name)->plainTextToken];
+                return [
+                    'token' => Auth::getLastAttempted()
+                        ->createToken($request->device_name)
+                        ->plainTextToken,
+                ];
             }
 
-            throw ValidationException::withMessages(['email' => 'The provided credentials are incorrect.']);
+            throw ValidationException::withMessages([
+                'email' => 'The provided credentials are incorrect.',
+            ]);
         });
     }