Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add Laravel 11 compatibility #2243

Merged
merged 3 commits into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}]'

Expand Down Expand Up @@ -55,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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
| jwt-auth version | Laravel version(s) |
|---|---|
| 1.x | 6 / 7 / 8 |
| 2.x | 9 / 10 |
| 2.x | 9 / 10 / 11 |


[<img src="https://user-images.githubusercontent.com/1801923/57975478-a7a88900-79c1-11e9-924b-d7fa742f743b.png" height="40">](https://www.patreon.com/bePatron?u=11815122)
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
5 changes: 5 additions & 0 deletions tests/Stubs/LaravelUserStub.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,9 @@ public function getRememberTokenName()
{
//
}

public function getAuthPasswordName()
{
return 'password';
}
}
Loading