Skip to content

Commit 5942bd3

Browse files
authored
Merge pull request #2547 from arthurkirkosa/laravel-8
Allow laravel 8
2 parents 0cb587b + 06428fc commit 5942bd3

File tree

3 files changed

+9
-42
lines changed

3 files changed

+9
-42
lines changed

.github/workflows/psalm.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/run-tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ jobs:
1010
matrix:
1111
os: [ubuntu-latest]
1212
php: [7.4]
13-
laravel: [7.*]
13+
laravel: [^7.0, ^8.0]
1414
dependency-version: [prefer-stable]
1515
include:
16-
- laravel: 7.*
17-
testbench: 5.*
16+
- laravel: ^7.0
17+
testbench: ^5.2
18+
- laravel: ^8.0
19+
testbench: ^6.0
1820

1921
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
2022

composer.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
],
1919
"require": {
2020
"php": "^7.4",
21-
"illuminate/support": "^7.0",
21+
"illuminate/support": "^7.0|^8.0",
2222
"opis/closure": "^3.5",
2323
"tijsverkoyen/css-to-inline-styles": "^2.2"
2424
},
2525
"require-dev": {
2626
"friendsofphp/php-cs-fixer": "^2.16",
27-
"orchestra/testbench": "^5.0",
27+
"laravel/legacy-factories": "^1.0",
28+
"orchestra/testbench": "^5.2|^6.0",
2829
"phpunit/phpunit": "^9.0",
29-
"spatie/test-time": "^1.2",
30-
"psalm/plugin-laravel": "^1.2",
31-
"vimeo/psalm": "^3.11"
30+
"spatie/test-time": "^1.2"
3231
},
3332
"autoload": {
3433
"psr-4": {
@@ -41,7 +40,6 @@
4140
}
4241
},
4342
"scripts": {
44-
"psalm": "vendor/bin/psalm",
4543
"test": "vendor/bin/phpunit",
4644
"test-coverage": "vendor/bin/phpunit --coverage-html coverage",
4745
"format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"

0 commit comments

Comments
 (0)