Merge pull request #14 from php-http/dev-discovery10

Using discovery 1.0
php-http · Jul 18, 2016 · a14e3f3 · a14e3f3
2 parents 9cb1d91 + 4966278
commit a14e3f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 5.4
     - 5.5
     - 5.6
     - 7.0
@@ -26,7 +25,7 @@ matrix:
         - php: hhvm
     fast_finish: true
     include:
-        - php: 5.4
+        - php: 5.5
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:

diff --git a/composer.json b/composer.json
@@ -11,12 +11,12 @@
         }
     ],
     "require": {
-        "php": ">=5.4",
+        "php": "^5.5 || ^7.0",
         "php-http/httplug": "^1.0",
         "react/http-client": "^0.4.8",
         "react/dns": "^0.4.1",
         "react/stream": "^0.4.3",
-        "php-http/discovery": "^0.9"
+        "php-http/discovery": "^1.0"
     },
     "require-dev": {
         "php-http/adapter-integration-tests": "^0.4"