Merge branch '11.x'

# Conflicts:
#	CHANGELOG.md
#	src/PassportServiceProvider.php

Author: driesvints

.github/ISSUE_TEMPLATE/1_Bug_report.yml

@@ -1,9 +1,9 @@
 name: Bug Report
-description: "Report a general library issue."
+description: "Report something that's broken."
 body:
   - type: markdown
     attributes:
-      value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)."
+      value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem."
   - type: input
     attributes:
       label: Passport Version
@@ -14,7 +14,7 @@ body:
   - type: input
     attributes:
       label: Laravel Version
-      description: Provide the Laravel version that you are using.
+      description: Provide the Laravel version that you are using. [Please ensure it is still supported.](https://laravel.com/docs/releases#support-policy)
       placeholder: 10.4.1
     validations:
       required: true

.github/workflows/static-analysis.yml

@@ -12,30 +12,4 @@ permissions:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: true
-
-    name: Static Analysis
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
-
-      - name: Execute type checking
-        run: vendor/bin/phpstan
+    uses: laravel/.github/.github/workflows/static-analysis.yml@main

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/passport/compare/v11.10.0...master)
+## [Unreleased](https://github.com/laravel/passport/compare/v11.10.4...master)
+
+## [v11.10.4](https://github.com/laravel/passport/compare/v11.10.2...v11.10.4) - 2024-01-30
+
+* Consistently retrieve client uuids value from Passport by [@rojtjo](https://github.com/rojtjo) in https://github.com/laravel/passport/pull/1711
+* [11.x] Allow developers to disable the password grant type by [@axlon](https://github.com/axlon) in https://github.com/laravel/passport/pull/1712
+
+## [v11.10.2](https://github.com/laravel/passport/compare/v11.10.1...v11.10.2) - 2024-01-17
+
+* Add getScopesAttribute and getScopesAttribute methods by [@uintaam](https://github.com/uintaam) in https://github.com/laravel/passport/pull/1709
+
+## [v11.10.1](https://github.com/laravel/passport/compare/v11.10.0...v11.10.1) - 2024-01-10
+
+* [11.x] Allow unsetting a user's access token by [@axlon](https://github.com/axlon) in https://github.com/laravel/passport/pull/1698
+* [11.x] Add getGrantTypesAttribute method to fix Eloquent strict mode error by [@gdebrauwer](https://github.com/gdebrauwer) in https://github.com/laravel/passport/pull/1705
 
 ## [v11.10.0](https://github.com/laravel/passport/compare/v11.9.2...v11.10.0) - 2023-11-02
 

src/Client.php

@@ -65,7 +65,7 @@ public static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            if (config('passport.client_uuids')) {
+            if (Passport::clientUuids()) {
                 $model->{$model->getKeyName()} = $model->{$model->getKeyName()} ?: (string) Str::orderedUuid();
             }
         });
@@ -105,6 +105,37 @@ public function tokens()
         return $this->hasMany(Passport::tokenModel(), 'client_id');
     }
 
+    /**
+     * Get the grant types the client can use.
+     *
+     * @return array|null
+     */
+    public function getGrantTypesAttribute()
+    {
+        return $this->attributes['grant_types'] ?? null;
+    }
+
+    /**
+     * Get the scopes for the client.
+     *
+     * @return array|null
+     */
+    public function getScopesAttribute()
+    {
+        return $this->attributes['scopes'] ?? null;
+    }
+
+    /**
+     * Set the scopes for the client.
+     *
+     * @param  array|null  $scopes
+     * @return void
+     */
+    public function setScopesAttribute(?array $scopes)
+    {
+        $this->attributes['scopes'] = $scopes;
+    }
+
     /**
      * The temporary non-hashed client secret.
      *

src/Passport.php

@@ -21,6 +21,13 @@ class Passport
      */
     public static $implicitGrantEnabled = false;
 
+    /**
+     * Indicates if the password grant type is enabled.
+     *
+     * @var bool|null
+     */
+    public static $passwordGrantEnabled = true;
+
     /**
      * The default scope.
      *

src/PassportServiceProvider.php

@@ -160,9 +160,11 @@ protected function registerAuthorizationServer()
                     $this->makeRefreshTokenGrant(), Passport::tokensExpireIn()
                 );
 
-                $server->enableGrantType(
-                    $this->makePasswordGrant(), Passport::tokensExpireIn()
-                );
+                if (Passport::$passwordGrantEnabled) {
+                    $server->enableGrantType(
+                        $this->makePasswordGrant(), Passport::tokensExpireIn()
+                    );
+                }
 
                 $server->enableGrantType(
                     new PersonalAccessGrant, Passport::personalAccessTokensExpireIn()