Skip to content

Commit a76cda7

Browse files
Merge pull request #30 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents 14dad04 + 22a8240 commit a76cda7

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

.github/workflows/tests.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
1-
name: "Run Tests"
1+
name: Run Tests
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
68
test:
7-
89
runs-on: ubuntu-latest
10+
911
strategy:
1012
fail-fast: true
1113
matrix:
12-
php: [8.1]
13-
laravel: [10.*]
14+
php: [8.1, '8.2']
15+
laravel: ['10.*', '11.*']
1416
dependency-version: [prefer-stable]
1517
include:
1618
- laravel: 10.*
1719
testbench: 8.*
20+
- laravel: 11.*
21+
testbench: 9.*
22+
exclude:
23+
- laravel: 11.*
24+
php: 8.1
1825

1926
name: PHP ${{ matrix.php }} - LARAVEL ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
2027

2128
steps:
22-
2329
- name: Checkout Code
2430
uses: actions/checkout@v3
2531

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
],
1818
"require": {
1919
"php": "^8.1",
20-
"illuminate/support": "^10.0"
20+
"illuminate/support": "^10.0|^11.0"
2121
},
2222
"require-dev": {
2323
"doctrine/dbal": "^3.3",
24-
"nunomaduro/collision": "^6.0",
25-
"orchestra/testbench": "^8.0.0",
26-
"pestphp/pest": "^1.21.1",
27-
"pestphp/pest-plugin-laravel": "^1.4",
28-
"phpunit/phpunit": "^9.3",
29-
"vimeo/psalm": "^4.4"
24+
"nunomaduro/collision": "^6.0|^8.0",
25+
"orchestra/testbench": "^8.0.0|^9.0",
26+
"pestphp/pest": "^1.21.1|^2.34",
27+
"pestphp/pest-plugin-laravel": "^1.4|^2.3",
28+
"phpunit/phpunit": "^9.3|^10.5",
29+
"vimeo/psalm": "^4.4|^5.22"
3030
},
3131
"autoload": {
3232
"psr-4": {

0 commit comments

Comments
 (0)