Skip to content

Commit 570d12e

Browse files
authored
Merge pull request #116 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents a916caa + 6bca835 commit 570d12e

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

.github/workflows/run-tests.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,33 @@ name: run-tests
22

33
on:
44
push:
5-
branches: [main, develop]
5+
branches:
6+
- main
7+
- develop
68
pull_request:
7-
branches: [main, develop]
9+
branches:
10+
- main
11+
- develop
812

913
jobs:
1014
test:
1115
runs-on: ${{ matrix.os }}
16+
1217
strategy:
1318
fail-fast: true
1419
matrix:
1520
os: [ubuntu-latest, windows-latest]
16-
php: [8.1]
17-
laravel: [10.*]
21+
php: [8.1, '8.2', '8.3', '8.4']
22+
laravel: ['10.*', '12.*']
1823
stability: [prefer-lowest, prefer-stable]
1924
include:
2025
- laravel: 10.*
2126
testbench: 8.0
27+
- laravel: 12.*
28+
testbench: '10.0'
29+
exclude:
30+
- laravel: 12.*
31+
php: 8.1
2232

2333
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2434

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
],
1818
"require": {
1919
"php": "^8.1",
20-
"illuminate/contracts": "^10.0|^11.0",
20+
"illuminate/contracts": "^10.0|^11.0|^12.0",
2121
"spatie/laravel-package-tools": "^1.4.3"
2222
},
2323
"require-dev": {
2424
"nunomaduro/collision": "^6.0",
25-
"orchestra/testbench": "^7.0",
26-
"pestphp/pest": "^1.21",
27-
"pestphp/pest-plugin-laravel": "^1.2",
25+
"orchestra/testbench": "^7.0|^10.0",
26+
"pestphp/pest": "^1.21|^3.7",
27+
"pestphp/pest-plugin-laravel": "^1.2|^3.1",
2828
"spatie/laravel-ray": "^1.29",
29-
"vimeo/psalm": "^4.20"
29+
"vimeo/psalm": "^4.20|^6.6"
3030
},
3131
"autoload": {
3232
"psr-4": {

src/Listeners/FailedLoginListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function handle($event): void
2525
}
2626

2727
if ($event->user) {
28-
if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
28+
if (! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
2929
return;
3030
}
3131

src/Listeners/LoginListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function handle($event): void
2626
}
2727

2828
if ($event->user) {
29-
if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
29+
if (! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
3030
return;
3131
}
3232

src/Listeners/LogoutListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function handle($event): void
2525
}
2626

2727
if ($event->user) {
28-
if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
28+
if (! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
2929
return;
3030
}
3131

src/Listeners/OtherDeviceLogoutListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function handle($event): void
2525
}
2626

2727
if ($event->user) {
28-
if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
28+
if (! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))) {
2929
return;
3030
}
3131

0 commit comments

Comments
 (0)