Skip to content

Commit 28848ac

Browse files
committed
Backport some changes from PHP HTTP
1 parent 8be4fe3 commit 28848ac

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ matrix:
2828
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
2929

3030
before_install:
31-
- if [[ $COVERAGE != true && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
31+
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
3232

3333
install:
3434
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
],
1313
"require": {
14-
"php": ">=5.5"
14+
"php": "^5.5 || ^7.0"
1515
},
1616
"autoload": {
1717
"psr-4": {

0 commit comments

Comments
 (0)