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

Using discovery 1.0

Author: Nyholm

composer.json

@@ -11,10 +11,10 @@
         }
     ],
     "require": {
-        "php": "^5.5|^7.0",
+        "php": "^5.5 || ^7.0",
         "php-http/httplug": "^1.0",
         "php-http/client-common": "^1.0",
-        "php-http/discovery": "^0.9",
+        "php-http/discovery": "^1.0",
         "php-http/message-factory": "^1.0"
     },
     "require-dev": {