fix conflicts

Author: taylorotwell

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Feature request
+    url: https://github.com/laravel/passport/pulls
+    about: 'For ideas or feature requests, send in a pull request'
   - name: Support Questions & Other
     url: https://laravel.com/docs/contributions#support-questions
     about: 'This repository is only for reporting bugs. If you have a question or need help using the library, click:'

.github/ISSUE_TEMPLATE/config.yml

@@ -16,8 +16,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
-        laravel: [11]
+        php: [8.2, 8.3, 8.4]
+        laravel: [11, 12]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -36,8 +36,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-           composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
-           composer update --prefer-dist --no-interaction --no-progress
+           composer update --prefer-dist --no-interaction --no-progress --with="illuminate/contracts=^${{ matrix.laravel }}"
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit ${{ matrix.laravel >= 10 && '--display-deprecations' || '' }}

.github/workflows/tests.yml

@@ -4,6 +4,10 @@ on:
   release:
     types: [released]
 
+permissions: {}
+
 jobs:
   update:
+    permissions:
+      contents: write
     uses: laravel/.github/.github/workflows/update-changelog.yml@main

.github/workflows/update-changelog.yml

@@ -1,4 +1,6 @@
 php:
   preset: laravel
+  enabled:
+    - nullable_type_declarations
 js: true
 css: true

.styleci.yml

@@ -1,6 +1,23 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/passport/compare/v12.3.0...12.x)
+## [Unreleased](https://github.com/laravel/passport/compare/v12.4.2...12.x)
+
+## [v12.4.2](https://github.com/laravel/passport/compare/v12.4.1...v12.4.2) - 2025-02-12
+
+* [12.x] Update property annotation for $userId to match constructor type by [@ukkok](https://github.com/ukkok) in https://github.com/laravel/passport/pull/1805
+
+## [v12.4.1](https://github.com/laravel/passport/compare/v12.4.0...v12.4.1) - 2025-01-28
+
+* Supports Laravel 12 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/passport/pull/1803
+
+## [v12.4.0](https://github.com/laravel/passport/compare/v12.3.1...v12.4.0) - 2025-01-13
+
+* [12.x] Supports PHP 8.4 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/passport/pull/1799
+
+## [v12.3.1](https://github.com/laravel/passport/compare/v12.3.0...v12.3.1) - 2024-11-11
+
+* Update logo to support dark/light theme by [@milewski](https://github.com/milewski) in https://github.com/laravel/passport/pull/1787
+* Fix repeated word "the" in upgrade guide by [@caendesilva](https://github.com/caendesilva) in https://github.com/laravel/passport/pull/1798
 
 ## [v12.3.0](https://github.com/laravel/passport/compare/v12.2.1...v12.3.0) - 2024-08-05
 

CHANGELOG.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="/art/logo.svg" alt="Logo Laravel Passport"></p>
+<p align="center"><img width="368" height="60" src="/art/logo.svg" alt="Logo Laravel Passport"></p>
 
 <p align="center">
 <a href="https://github.com/laravel/passport/actions"><img src="https://github.com/laravel/passport/workflows/tests/badge.svg" alt="Build Status"></a>

README.md

@@ -253,7 +253,7 @@ The minimum Laravel version is now v6.0 and the minimum PHP version is now 7.2.
 
 PR: https://github.com/laravel/passport/pull/1065
 
-Passport now supports public clients and PCKE. To leverage this feature, you should update the the `secret` column of the `oauth_clients` table to be `nullable`:
+Passport now supports public clients and PCKE. To leverage this feature, you should update the `secret` column of the `oauth_clients` table to be `nullable`:
 
     Schema::table('oauth_clients', function (Blueprint $table) {
         $table->string('secret', 100)->nullable()->change();

UPGRADE.md

@@ -18,15 +18,15 @@
         "ext-json": "*",
         "ext-openssl": "*",
         "firebase/php-jwt": "^6.4",
-        "illuminate/auth": "^11.14",
-        "illuminate/console": "^11.14",
-        "illuminate/container": "^11.14",
-        "illuminate/contracts": "^11.14",
-        "illuminate/cookie": "^11.14",
-        "illuminate/database": "^11.14",
-        "illuminate/encryption": "^11.14",
-        "illuminate/http": "^11.14",
-        "illuminate/support": "^11.14",
+        "illuminate/auth": "^11.14|^12.0",
+        "illuminate/console": "^11.14|^12.0",
+        "illuminate/container": "^11.14|^12.0",
+        "illuminate/contracts": "^11.14|^12.0",
+        "illuminate/cookie": "^11.14|^12.0",
+        "illuminate/database": "^11.14|^12.0",
+        "illuminate/encryption": "^11.14|^12.0",
+        "illuminate/http": "^11.14|^12.0",
+        "illuminate/support": "^11.14|^12.0",
         "lcobucci/jwt": "^5.0",
         "league/oauth2-server": "^9.0",
         "nyholm/psr7": "^1.5",
@@ -36,9 +36,9 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^9.0",
+        "orchestra/testbench": "^9.0|^10.0",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^10.5|^11.0"
+        "phpunit/phpunit": "^10.5|^11.5"
     },
     "autoload": {
         "psr-4": {