Skip to content

Commit

Permalink
Merge pull request #125 from laravel-shift/l8-compatibility
Browse files Browse the repository at this point in the history
Laravel 8.x Compatibility
  • Loading branch information
okaufmann committed Sep 11, 2020
2 parents e03d6c2 + cfbf901 commit e1744a3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ jobs:
matrix:
os: [ubuntu-latest]
php: [7.4, 7.3, 7.2]
laravel: [7.*, 6.*]
laravel: [8.*, 7.*, 6.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 8.*
testbench: 6.*
- laravel: 7.*
testbench: 5.*
- laravel: 6.*
Expand Down
15 changes: 9 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"name": "mpociot/teamwork",
"license": "MIT",
"description": "User to Team associations for the Laravel 5 Framework",
"keywords": ["Teams","Invite"],
"keywords": [
"Teams",
"Invite"
],
"homepage": "http:https://github.com/mpociot/teamwork",
"authors": [
{
Expand All @@ -15,15 +18,15 @@
"source": "https://github.com/mpociot/teamwork"
},
"minimum-stability": "dev",
"prefer-stable" : true,
"prefer-stable": true,
"require": {
"php": "^7.2.5",
"laravel/framework": "^6.0|^7.0"
"laravel/framework": "^6.0|^7.0|^8.0"
},
"require-dev": {
"mockery/mockery": "^1.3.1",
"illuminate/database": "^6.0|^7.0",
"orchestra/testbench": "^4.0|^5.0",
"mockery/mockery": "^1.3.1|^1.3.1",
"illuminate/database": "^6.0|^7.0|^8.0",
"orchestra/testbench": "^4.0|^5.0|^6.0",
"doctrine/dbal": "^2.10"
},
"config": {
Expand Down

0 comments on commit e1744a3

Please sign in to comment.