Skip to content

Commit 7b6351f

Browse files
authored
Merge pull request #29 from flexgrip/patch-1
Laravel 12 Compatibility ... continued
2 parents e81a212 + 2862798 commit 7b6351f

File tree

2 files changed

+33
-7
lines changed

2 files changed

+33
-7
lines changed

.github/workflows/run-tests-l8.yml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,35 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php: [8.1, 8.0]
13-
laravel: [9.*]
12+
php: [8.3, 8.2, 8.1, 8.0]
13+
laravel: [12.*, 11.*, 10.*, 9.*]
1414
dependency-version: [prefer-lowest, prefer-stable]
15+
exclude:
16+
- php: 8.0
17+
laravel: 12.*
18+
- php: 8.0
19+
laravel: 11.*
20+
- php: 8.0
21+
laravel: 10.*
22+
- php: 8.1
23+
laravel: 12.*
24+
- php: 8.1
25+
laravel: 11.*
26+
- php: 8.2
27+
laravel: 9.*
28+
- php: 8.3
29+
laravel: 9.*
30+
- php: 8.3
31+
laravel: 10.*
32+
- php: 8.3
33+
laravel: 11.*
1534
include:
35+
- laravel: 12.*
36+
testbench: 10.*
37+
- laravel: 11.*
38+
testbench: 9.*
39+
- laravel: 10.*
40+
testbench: 8.*
1641
- laravel: 9.*
1742
testbench: 7.*
1843

@@ -37,7 +62,7 @@ jobs:
3762

3863
- name: Install dependencies
3964
run: |
40-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" "mockery/mockery:^1.3.2" --no-interaction --no-update
65+
composer require --dev "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "mockery/mockery:^1.3.2" --no-interaction --no-update
4166
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
4267
# - name: Execute tests
4368
# run: vendor/bin/phpunit

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
"php": "^7.4|^8.0",
1919
"league/flysystem-aws-s3-v3": "^3.0",
2020
"spatie/laravel-package-tools": "^1.1",
21-
"illuminate/contracts": "^8.0|^9.0|^10.0|^11.0"
21+
"illuminate/contracts": "^8.0|^9.0|^10.0|^11.0|^12.0"
2222
},
2323
"require-dev": {
24-
"orchestra/testbench": "^6.0 | ^7.0 | ^8.0 | ^9.0",
24+
"laravel/framework": "12.*",
25+
"mockery/mockery": "^1.3.2",
26+
"orchestra/testbench": "10.*",
2527
"phpstan/extension-installer": "^1.1",
2628
"phpstan/phpstan-deprecation-rules": "^1.0",
2729
"phpstan/phpstan-phpunit": "^1.0",
28-
"phpunit/phpunit": "^9.3",
2930
"spatie/laravel-ray": "^1.9",
30-
"vimeo/psalm": "^4.4"
31+
"vimeo/psalm": "^4.4 || ^5.0 || ^6.0 || ^7.0"
3132
},
3233
"autoload": {
3334
"psr-4": {

0 commit comments

Comments
 (0)