Skip to content

Commit

Permalink
Merge 8bf4f70 into c2ae3f5
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalbaljet committed Oct 31, 2020
2 parents c2ae3f5 + 8bf4f70 commit 5c56c70
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -7,6 +7,7 @@ env:
php:
- 7.2
- 7.4
- 8.0snapshot

cache:
directories:
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Expand Up @@ -13,7 +13,7 @@
],
"homepage": "http://glide.thephpleague.com",
"license": "MIT",
"authors" : [
"authors": [
{
"name": "Jonathan Reinink",
"email": "jonathan@reinink.ca",
Expand All @@ -23,13 +23,13 @@
"require": {
"intervention/image": "^2.4",
"league/flysystem": "^1.0",
"php": "^7.2",
"php": "^7.2|^8.0",
"psr/http-message": "^1.0"
},
"require-dev": {
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^8.5",
"phpunit/php-token-stream": "^3.1"
"mockery/mockery": "^1.3.3",
"phpunit/phpunit": "^8.5|^9.0",
"phpunit/php-token-stream": "^3.1|^4.0"
},
"autoload": {
"psr-4": {
Expand All @@ -41,4 +41,4 @@
"dev-master": "1.1-dev"
}
}
}
}

0 comments on commit 5c56c70

Please sign in to comment.