From a6b28b4110bac26681b87fd0bd2db8fc30832e58 Mon Sep 17 00:00:00 2001 From: Sean Tymon Date: Sat, 2 Mar 2024 14:13:11 +0000 Subject: [PATCH 1/3] feat: Add Laravel 11 compatibility --- .github/workflows/phpunit.yml | 12 ++++++++---- README.md | 2 +- composer.json | 14 +++++++------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 8c243a4c..65be152c 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -14,18 +14,22 @@ jobs: strategy: fail-fast: false matrix: - php: [8.0, 8.1, 8.2] - laravel: [9.*, 10.*] + php: [8.0, 8.1, 8.2, 8.3] + laravel: [9.*, 10.*, 11.*] os: [ubuntu-latest] coverage: [none] include: - - php: 8.2 - laravel: 10.* + - php: 8.3 + laravel: 11.* os: ubuntu-latest coverage: xdebug exclude: - php: 8.0 laravel: 10.* + - php: 8.0 + laravel: 11.* + - php: 8.1 + laravel: 11.* name: '[P${{ matrix.php }}] [L${{ matrix.laravel }}] [${{ matrix.coverage }}]' diff --git a/README.md b/README.md index ab287b18..59de5eba 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ | jwt-auth version | Laravel version(s) | |---|---| | 1.x | 6 / 7 / 8 | -| 2.x | 9 / 10 | +| 2.x | 9 / 10 / 11 | [](https://www.patreon.com/bePatron?u=11815122) diff --git a/composer.json b/composer.json index 65a4e79c..e8881637 100644 --- a/composer.json +++ b/composer.json @@ -24,17 +24,17 @@ ], "require": { "php": "^8.0", - "illuminate/auth": "^9.0|^10.0", - "illuminate/contracts": "^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/contracts": "^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.0", "nesbot/carbon": "^2.0" }, "require-dev": { - "illuminate/console": "^9.0|^10.0", - "illuminate/database": "^9.0|^10.0", - "illuminate/routing": "^9.0|^10.0", + "illuminate/console": "^9.0|^10.0,^11.0", + "illuminate/database": "^9.0|^10.0,^11.0", + "illuminate/routing": "^9.0|^10.0,^11.0", "mockery/mockery": ">=0.9.9", "phpunit/phpunit": "^9.4" }, From 6a630a15929b528b6e29086b96427591a2a12529 Mon Sep 17 00:00:00 2001 From: Sean Tymon Date: Sat, 2 Mar 2024 14:16:41 +0000 Subject: [PATCH 2/3] whoops --- .github/workflows/phpunit.yml | 2 +- composer.json | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 65be152c..2a133765 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -59,7 +59,7 @@ jobs: - name: Install dependencies run: | composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-progress --no-update - composer update --no-progress --prefer-dist --no-interaction --no-suggest + composer update --no-progress --prefer-dist --no-interaction - name: Execute tests run: composer test:ci diff --git a/composer.json b/composer.json index e8881637..e886b1db 100644 --- a/composer.json +++ b/composer.json @@ -24,17 +24,17 @@ ], "require": { "php": "^8.0", - "illuminate/auth": "^9.0|^10.0,^11.0", - "illuminate/contracts": "^9.0|^10.0,^11.0", - "illuminate/http": "^9.0|^10.0,^11.0", - "illuminate/support": "^9.0|^10.0,^11.0", + "illuminate/auth": "^9.0|^10.0|^11.0", + "illuminate/contracts": "^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.0", "nesbot/carbon": "^2.0" }, "require-dev": { - "illuminate/console": "^9.0|^10.0,^11.0", - "illuminate/database": "^9.0|^10.0,^11.0", - "illuminate/routing": "^9.0|^10.0,^11.0", + "illuminate/console": "^9.0|^10.0|^11.0", + "illuminate/database": "^9.0|^10.0|^11.0", + "illuminate/routing": "^9.0|^10.0|^11.0", "mockery/mockery": ">=0.9.9", "phpunit/phpunit": "^9.4" }, From 61c285e95750913c7393a1d9000a8d7f5587e5f7 Mon Sep 17 00:00:00 2001 From: Sean Tymon Date: Sat, 2 Mar 2024 14:21:55 +0000 Subject: [PATCH 3/3] add missing method --- tests/Stubs/LaravelUserStub.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/Stubs/LaravelUserStub.php b/tests/Stubs/LaravelUserStub.php index 97ca3e9f..af2434e4 100644 --- a/tests/Stubs/LaravelUserStub.php +++ b/tests/Stubs/LaravelUserStub.php @@ -45,4 +45,9 @@ public function getRememberTokenName() { // } + + public function getAuthPasswordName() + { + return 'password'; + } }