Skip to content

Commit

Permalink
Merge pull request #21 from php-http/nyholm-tests
Browse files Browse the repository at this point in the history
Update to use the latest integration tests
  • Loading branch information
joelwurtz authored Jul 7, 2017
2 parents 561086b + 60b4ef4 commit b83b4d1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ php:
- 5.5
- 5.6
- 7.0
- hhvm
- 7.1

env:
global:
Expand All @@ -27,6 +27,8 @@ matrix:
include:
- php: 5.5
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
- php: hhvm
dist: trusty

before_install:
- if [[ $COVERAGE != true && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
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 @@
"php-http/discovery": "^1.0"
},
"require-dev": {
"php-http/client-integration-tests": "^0.5.1",
"php-http/client-integration-tests": "^0.6",
"php-http/message": "^1.0"
},
"provide": {
Expand Down

0 comments on commit b83b4d1

Please sign in to comment.