Skip to content

Commit

Permalink
Merge pull request #6 from arthurkirkosa/laravel-8
Browse files Browse the repository at this point in the history
Allow Laravel 8
  • Loading branch information
binaryk authored Oct 16, 2020
2 parents 544a077 + 4bbc4fe commit 2c9c222
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 41 deletions.
33 changes: 0 additions & 33 deletions .github/workflows/psalm.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest]
php: [7.4]
laravel: [7.*]
laravel: [^7.0, ^8.0]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 7.*
testbench: 5.*
- laravel: ^7.0
testbench: ^5.2
- laravel: ^8.0
testbench: ^6.0

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

Expand Down
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",
"orchestra/testbench": "^5.0",
"phpunit/phpunit": "^9.0",
"psalm/plugin-laravel": "^1.2",
"vimeo/psalm": "^3.11"
"laravel/legacy-factories": "^1.0",
"orchestra/testbench": "^5.2|^6.0",
"phpunit/phpunit": "^9.0"
},
"autoload": {
"psr-4": {
Expand All @@ -46,7 +45,6 @@
}
},
"scripts": {
"psalm": "vendor/bin/psalm",
"test": "vendor/bin/phpunit",
"test-coverage": "vendor/bin/phpunit --coverage-html coverage",
"format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
Expand Down

0 comments on commit 2c9c222

Please sign in to comment.