Skip to content

Commit c292462

Browse files
committed
Merge branch 'master' into develop
2 parents 90de689 + e0149fd commit c292462

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

.github/workflows/run-tests.yml

+18-2
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,35 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest, windows-latest]
12-
php: [7.2, 7.3, 7.4, 8.0]
13-
laravel: [7.*, 8.*]
12+
php: [7.2, 7.3, 7.4, 8.0, 8.1]
13+
laravel: [7.*, 8.*, 9.*]
1414
stability: [prefer-lowest, prefer-stable]
1515
exclude:
1616
- laravel: 7.*
1717
stability: prefer-lowest
1818
- laravel: 8.*
19+
stability: prefer-lowest
20+
- laravel: 9.*
21+
stability: prefer-lowest
22+
- laravel: 6.*
23+
php: 8.1
24+
- laravel: 7.*
25+
php: 8.1
26+
- laravel: 8.*
27+
php: 7.2
28+
- laravel: 9.*
1929
php: 7.2
30+
- laravel: 9.*
31+
php: 7.3
32+
- laravel: 9.*
33+
php: 7.4
2034
include:
2135
- laravel: 7.*
2236
testbench: 5.*
2337
- laravel: 8.*
2438
testbench: 6.*
39+
- laravel: 9.*
40+
testbench: 7.*
2541

2642
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2743

.php-cs-fixer.cache

-1
This file was deleted.

composer.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
"require": {
2121
"php": ">=7.1.0",
2222
"facade/ignition-contracts": "^1.0",
23-
"illuminate/support": "^7.0|^8.0"
23+
"illuminate/support": "^7.0|^8.0|^9.0"
2424
},
2525
"require-dev": {
26-
"friendsofphp/php-cs-fixer": "^2.16",
27-
"orchestra/testbench": "^5.0|^6.0",
26+
"orchestra/testbench": "^5.0|^6.0|^7.0",
2827
"phpunit/phpunit": "^8.3|^9.0",
2928
"vimeo/psalm": "^4.0"
3029
},

0 commit comments

Comments
 (0)