[12.x] Adds Laravel 11 support (#1702)

* Adds Laravel 11 support

* Uses `publishesMigrations`

* Adjusts install command

Author: nunomaduro

.github/workflows/tests.yml

@@ -17,10 +17,14 @@ jobs:
       fail-fast: true
       matrix:
         php: ['8.0', 8.1, 8.2, 8.3]
-        laravel: [9, 10]
+        laravel: [9, 10, 11]
         exclude:
           - php: '8.0'
             laravel: 10
+          - php: '8.0'
+            laravel: 11
+          - php: 8.1
+            laravel: 11
           - php: 8.3
             laravel: 9
 
@@ -45,4 +49,4 @@ jobs:
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit

UPGRADE.md

@@ -2,6 +2,16 @@
 
 ## General Notes
 
+## Upgrading To 12.0 From 11.x
+
+### Migration Changes
+
+Passport 12.0 no longer automatically loads migrations from its own migrations directory. Instead, you should run the following command to publish Passport's migrations to your application:
+
+```bash
+php artisan vendor:publish --tag=passport-migrations
+```
+
 ## Upgrading To 11.0 From 10.x
 
 ### Minimum PHP Version

composer.json

@@ -17,26 +17,26 @@
         "php": "^8.0",
         "ext-json": "*",
         "firebase/php-jwt": "^6.4",
-        "illuminate/auth": "^9.0|^10.0",
-        "illuminate/console": "^9.0|^10.0",
-        "illuminate/container": "^9.0|^10.0",
-        "illuminate/contracts": "^9.0|^10.0",
-        "illuminate/cookie": "^9.0|^10.0",
-        "illuminate/database": "^9.0|^10.0",
-        "illuminate/encryption": "^9.0|^10.0",
-        "illuminate/http": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0",
+        "illuminate/auth": "^9.0|^10.0|^11.0",
+        "illuminate/console": "^9.0|^10.0|^11.0",
+        "illuminate/container": "^9.0|^10.0|^11.0",
+        "illuminate/contracts": "^9.0|^10.0|^11.0",
+        "illuminate/cookie": "^9.0|^10.0|^11.0",
+        "illuminate/database": "^9.0|^10.0|^11.0",
+        "illuminate/encryption": "^9.0|^10.0|^11.0",
+        "illuminate/http": "^9.0|^10.0|^11.0",
+        "illuminate/support": "^9.0|^10.0|^11.0",
         "lcobucci/jwt": "^4.3|^5.0",
         "league/oauth2-server": "^8.5.3",
         "nyholm/psr7": "^1.5",
         "phpseclib/phpseclib": "^2.0|^3.0",
-        "symfony/psr-http-message-bridge": "^2.1"
+        "symfony/psr-http-message-bridge": "^2.1|^6.0|^7.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^7.31|^8.11",
+        "orchestra/testbench": "^7.35|^8.14|^9.0",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3|^10.4"
     },
     "autoload": {
         "psr-4": {

src/Console/InstallCommand.php

@@ -35,10 +35,14 @@ public function handle()
 
         $this->call('passport:keys', ['--force' => $this->option('force'), '--length' => $this->option('length')]);
 
+        $this->call('vendor:publish', ['--tag' => 'passport-migrations']);
+
         if ($this->option('uuids')) {
             $this->configureUuids();
         }
 
+        $this->call('migrate');
+
         $this->call('passport:client', ['--personal' => true, '--name' => config('app.name').' Personal Access Client']);
         $this->call('passport:client', ['--password' => true, '--name' => config('app.name').' Password Grant Client', '--provider' => $provider]);
     }
@@ -51,22 +55,15 @@ public function handle()
     protected function configureUuids()
     {
         $this->call('vendor:publish', ['--tag' => 'passport-config']);
-        $this->call('vendor:publish', ['--tag' => 'passport-migrations']);
 
         config(['passport.client_uuids' => true]);
         Passport::setClientUuids(true);
 
         $this->replaceInFile(config_path('passport.php'), '\'client_uuids\' => false', '\'client_uuids\' => true');
-        $this->replaceInFile(database_path('migrations/2016_06_01_000001_create_oauth_auth_codes_table.php'), '$table->unsignedBigInteger(\'client_id\');', '$table->uuid(\'client_id\');');
-        $this->replaceInFile(database_path('migrations/2016_06_01_000002_create_oauth_access_tokens_table.php'), '$table->unsignedBigInteger(\'client_id\');', '$table->uuid(\'client_id\');');
-        $this->replaceInFile(database_path('migrations/2016_06_01_000004_create_oauth_clients_table.php'), '$table->bigIncrements(\'id\');', '$table->uuid(\'id\')->primary();');
-        $this->replaceInFile(database_path('migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php'), '$table->unsignedBigInteger(\'client_id\');', '$table->uuid(\'client_id\');');
-
-        if ($this->confirm('In order to finish configuring client UUIDs, we need to rebuild the Passport database tables. Would you like to rollback and re-run your last migration?')) {
-            $this->call('migrate:rollback');
-            $this->call('migrate');
-            $this->line('');
-        }
+        $this->replaceInFile(database_path('migrations/****_**_**_******_create_oauth_auth_codes_table.php'), '$table->unsignedBigInteger(\'client_id\');', '$table->uuid(\'client_id\');');
+        $this->replaceInFile(database_path('migrations/****_**_**_******_create_oauth_access_tokens_table.php'), '$table->unsignedBigInteger(\'client_id\');', '$table->uuid(\'client_id\');');
+        $this->replaceInFile(database_path('migrations/****_**_**_******_create_oauth_clients_table.php'), '$table->bigIncrements(\'id\');', '$table->uuid(\'id\')->primary();');
+        $this->replaceInFile(database_path('migrations/****_**_**_******_create_oauth_personal_access_clients_table.php'), '$table->unsignedBigInteger(\'client_id\');', '$table->uuid(\'client_id\');');
     }
 
     /**
@@ -79,9 +76,11 @@ protected function configureUuids()
      */
     protected function replaceInFile($path, $search, $replace)
     {
-        file_put_contents(
-            $path,
-            str_replace($search, $replace, file_get_contents($path))
-        );
+        foreach (glob($path) as $file) {
+            file_put_contents(
+                $file,
+                str_replace($search, $replace, file_get_contents($file))
+            );
+        }
     }
 }

src/Passport.php

@@ -128,13 +128,6 @@ class Passport
      */
     public static $refreshTokenModel = 'Laravel\Passport\RefreshToken';
 
-    /**
-     * Indicates if Passport migrations will be run.
-     *
-     * @var bool
-     */
-    public static $runsMigrations = true;
-
     /**
      * Indicates if Passport should unserializes cookies.
      *
@@ -689,18 +682,6 @@ public static function ignoreRoutes()
         return new static;
     }
 
-    /**
-     * Configure Passport to not register its migrations.
-     *
-     * @return static
-     */
-    public static function ignoreMigrations()
-    {
-        static::$runsMigrations = false;
-
-        return new static;
-    }
-
     /**
      * Instruct Passport to enable cookie serialization.
      *

src/PassportServiceProvider.php

@@ -39,7 +39,6 @@ public function boot()
     {
         $this->registerRoutes();
         $this->registerResources();
-        $this->registerMigrations();
         $this->registerPublishing();
         $this->registerCommands();
 
@@ -74,18 +73,6 @@ protected function registerResources()
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'passport');
     }
 
-    /**
-     * Register the Passport migration files.
-     *
-     * @return void
-     */
-    protected function registerMigrations()
-    {
-        if ($this->app->runningInConsole() && Passport::$runsMigrations && ! config('passport.client_uuids')) {
-            $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
-        }
-    }
-
     /**
      * Register the package's publishable resources.
      *
@@ -94,7 +81,11 @@ protected function registerMigrations()
     protected function registerPublishing()
     {
         if ($this->app->runningInConsole()) {
-            $this->publishes([
+            $publishesMigrationsMethod = method_exists($this, 'publishesMigrations')
+                ? 'publishesMigrations'
+                : 'publishes';
+
+            $this->{$publishesMigrationsMethod}([
                 __DIR__.'/../database/migrations' => database_path('migrations'),
             ], 'passport-migrations');
 

src/PassportUserProvider.php

@@ -74,6 +74,14 @@ public function validateCredentials(Authenticatable $user, array $credentials)
         return $this->provider->validateCredentials($user, $credentials);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function rehashPasswordIfRequired(Authenticatable $user, array $credentials, bool $force = false)
+    {
+        $this->provider->rehashPasswordIfRequired($user, $credentials, $force);
+    }
+
     /**
      * Get the name of the user provider.
      *

testbench.yaml

@@ -1,5 +1,5 @@
 providers:
   - Laravel\Passport\PassportServiceProvider
 
-migrations: true
-
+migrations:
+  - database/migrations