Merge pull request #11 from php-http/Nyholm-patch-1

Using latest version of discovery
php-http · Jun 29, 2016 · 97740ca · 97740ca
2 parents 50e89dc + a0bbf74
commit 97740ca
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
@@ -24,7 +23,7 @@ branches:
 matrix:
     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,10 +11,10 @@
         }
     ],
     "require": {
-        "php": ">=5.4",
+        "php": "^5.5|^7.0",
         "php-http/httplug": "^1.0",
         "php-http/client-common": "^1.0",
-        "php-http/discovery": "^0.8",
+        "php-http/discovery": "^0.9",
         "php-http/message-factory": "^1.0"
     },
     "require-dev": {