Skip to content
This repository has been archived by the owner on Jan 6, 2024. It is now read-only.

Commit

Permalink
Merge 5b070a4 into 0acf301
Browse files Browse the repository at this point in the history
  • Loading branch information
BigMichi1 committed Jul 18, 2019
2 parents 0acf301 + 5b070a4 commit 748e649
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
10 changes: 3 additions & 7 deletions .travis.yml
Expand Up @@ -7,11 +7,9 @@ cache:
- $HOME/.composer/cache/files

php:
- 5.5
- 5.6
- 7.0
- 7.1

- 7.2
- 7.3
env:
global:
- TEST_COMMAND="composer test"
Expand All @@ -25,10 +23,8 @@ matrix:
- php: hhvm
fast_finish: true
include:
- php: 5.5
- php: 7.1
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
- php: hhvm
dist: trusty

before_install:
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,3 +2,7 @@


## Unreleased

### Added

- Support for HTTPlug 2.0.
10 changes: 6 additions & 4 deletions composer.json
Expand Up @@ -11,13 +11,15 @@
}
],
"require": {
"php": "^5.5 || ^7.0",
"php-http/httplug": "^1.0",
"php": "^7.1",
"php-http/httplug": "^2.0",
"php-http/discovery": "^1.0",
"zendframework/zend-http": "^2.3"
},
"require-dev": {
"php-http/client-integration-tests": "^0.6"
"ext-curl": "*",
"phpunit/phpunit": "^7.4",
"php-http/client-integration-tests": "^2.0"
},
"autoload": {
"psr-4": {
Expand All @@ -34,7 +36,7 @@
},
"scripts": {
"test": "vendor/bin/phpunit",
"test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
},
"extra": {
"branch-alias": {
Expand Down

0 comments on commit 748e649

Please sign in to comment.