Skip to content

Commit

Permalink
Merge branch 'SonarSoftware-develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dmongeau committed Feb 9, 2018
2 parents 7a2745a + bab00e8 commit cd94571
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
- ILLUMINATE_VERSION=5.4.* PHPUNIT_VERSION=~5.7
- ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
- ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0 COVERAGE=true
- ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0

matrix:
# For each PHP version we exclude the coverage env, except for PHP 7.1
Expand All @@ -32,14 +33,20 @@ matrix:
env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
- php: 5.5
env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0 COVERAGE=true
- php: 5.5
env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
# Don't test Laravel 5.5 on PHP 5.6
- php: 5.6
env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
- php: 5.6
env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0 COVERAGE=true
- php: 5.6
env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
# Test everything on PHP 7.0
- php: 7.0
env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0 COVERAGE=true
- php: 7.0
env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
# Test only Laravel 5.4 and 5.5 on PHP 7.1
- php: 7.1
env: ILLUMINATE_VERSION=5.1.* PHPUNIT_VERSION=~4.0
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"type": "project",
"require": {
"php": ">=5.5.9",
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"webonyx/graphql-php": "~0.10.2"
},
"require-dev": {
Expand Down

0 comments on commit cd94571

Please sign in to comment.