Skip to content

Commit 6f46b33

Browse files
committed
Merge remote-tracking branch 'origin/laravel-11'
2 parents 79b4614 + c2ea5f4 commit 6f46b33

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/tests.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@ jobs:
1010
strategy:
1111
fail-fast: true
1212
matrix:
13-
laravel: [ 9.*, 10.* ]
14-
php: [ 8.0, 8.1 ]
13+
laravel: [ 9.*, 10.*, 11.* ]
14+
php: [ 8.0, 8.1, 8.2, 8.3 ]
1515
exclude:
16+
- laravel: 9.*
17+
php: 8.2
18+
- laravel: 9.*
19+
php: 8.3
1620
- laravel: 10.*
1721
php: 8.0
22+
- laravel: 11.*
23+
php: 8.0
24+
- laravel: 11.*
25+
php: 8.1
1826
name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }}
1927
steps:
2028
- name: Checkout code

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"ext-json": "*",
1515
"guzzlehttp/guzzle": "^6.2 || ^7.0",
1616
"guzzlehttp/psr7": "^1.0 || ^2.0",
17-
"laravel/framework": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
17+
"laravel/framework": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
1818
},
1919
"require-dev": {
2020
"mockery/mockery": "^1.3.1",
21-
"orchestra/testbench": "^3.5 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
22-
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.0"
21+
"orchestra/testbench": "^3.5 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
22+
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.0 || ^10.0"
2323
},
2424
"autoload": {
2525
"psr-4": {

0 commit comments

Comments
 (0)