Skip to content

Commit 915fa29

Browse files
Merge pull request #32 from TheDragonCode/2.x
Added Laravel 10 support
2 parents d70c1f2 + 51ac69b commit 915fa29

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

.github/workflows/laravel.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,38 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
laravel: [ "6.0", "7.0", "8.0", "9.0" ]
13-
php: [ "7.3", "7.4", "8.0", "8.1" ]
12+
php: [ "7.3", "7.4", "8.0", "8.1", "8.2" ]
13+
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
1414
exclude:
1515
- laravel: "6.0"
1616
php: "8.1"
1717

18+
- laravel: "6.0"
19+
php: "8.2"
20+
1821
- laravel: "7.0"
1922
php: "8.1"
2023

24+
- laravel: "7.0"
25+
php: "8.2"
26+
2127
- laravel: "9.0"
2228
php: "7.3"
2329

2430
- laravel: "9.0"
2531
php: "7.4"
2632

33+
- laravel: "10.0"
34+
php: "7.3"
35+
36+
- laravel: "10.0"
37+
php: "7.4"
38+
39+
- laravel: "10.0"
40+
php: "8.0"
41+
2742

28-
name: ${{ matrix.laravel }}, PHP ${{ matrix.php }}
43+
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
2944

3045
steps:
3146
- name: Checkout code

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
],
4444
"require": {
4545
"php": "^7.3 || ^8.0",
46-
"illuminate/contracts": "^6.0 || ^7.0 || ^8.0 || ^9.0",
47-
"illuminate/http": "^6.0 || ^7.0 || ^8.0 || ^9.0",
48-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
46+
"illuminate/contracts": ">=6.0 <11.0",
47+
"illuminate/http": ">=6.0 <11.0",
48+
"illuminate/support": ">=6.0 <11.0",
4949
"lmc/http-constants": "^1.2",
5050
"symfony/http-foundation": "^4.3 || ^5.0 || ^6.0"
5151
},
5252
"require-dev": {
53-
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
54-
"phpunit/phpunit": "^9.0"
53+
"orchestra/testbench": ">=4.0 <9.0",
54+
"phpunit/phpunit": "^9.6"
5555
},
5656
"conflict": {
5757
"andrey-helldar/laravel-json-response": "*"

0 commit comments

Comments
 (0)