Skip to content

Commit

Permalink
Merge pull request #43 from laravel-shift/l8-compatibility
Browse files Browse the repository at this point in the history
Laravel 8.x Compatibility
  • Loading branch information
freekmurze committed Sep 8, 2020
2 parents 1a28b45 + 6865c68 commit 391c935
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/run-tests.yml
Expand Up @@ -10,9 +10,11 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest]
php: [7.4]
laravel: [6.*, 7.*]
laravel: [8.*, 6.*, 7.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 8.*
testbench: 6.*
- laravel: 7.*
testbench: 5.*
- laravel: 6.*
Expand Down
7 changes: 3 additions & 4 deletions composer.json
Expand Up @@ -17,13 +17,13 @@
],
"require": {
"php": "^7.2",
"illuminate/support": "^6.0|^7.0",
"illuminate/support": "^6.0|^7.0|^8.0",
"league/iso3166": "^2.1.5"
},
"require-dev": {
"myclabs/php-enum": "^1.6",
"orchestra/testbench": "^4.0|^5.0",
"phpunit/phpunit": "^8.0|^9.0",
"orchestra/testbench": "^4.0|^5.0|^6.0",
"phpunit/phpunit": "^8.0|^9.0|^9.3",
"spatie/enum": "^2.2"
},
"autoload": {
Expand All @@ -39,7 +39,6 @@
"scripts": {
"test": "vendor/bin/phpunit",
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"

},
"config": {
"sort-packages": true
Expand Down

0 comments on commit 391c935

Please sign in to comment.