Merge 6b3af19 into 0acf301

php-http · Jul 18, 2019 · d12f400 · d12f400
2 parents 0acf301 + 6b3af19
commit d12f400
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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"
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,3 +2,7 @@
 
 
 ## Unreleased
+
+### Added
+
+- Support for HTTPlug 2.0.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": "^5.5 || ^7.0",
-        "php-http/httplug": "^1.0",
+        "php-http/httplug": "^1.0 || ^2.0",
         "php-http/discovery": "^1.0",
         "zendframework/zend-http": "^2.3"
     },