Removing custom Uri implementation

Author: dcarbone

src/AbstractClient.php

@@ -19,6 +19,7 @@
 use Http\Client\HttpClient;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Class AbstractClient
@@ -122,10 +123,10 @@ protected function doRequest(Request $r) {
     /**
      * @param int $duration
      * @param ResponseInterface $response
-     * @param Uri $uri
+     * @param UriInterface $uri
      * @return QueryMeta
      */
-    protected function buildQueryMeta($duration, ResponseInterface $response, Uri $uri) {
+    protected function buildQueryMeta($duration, ResponseInterface $response, UriInterface $uri) {
         $qm = new QueryMeta();
 
         $qm->RequestTime = $duration;
@@ -170,17 +171,16 @@ protected function buildWriteMeta($duration) {
      */
     protected function decodeBody(StreamInterface $body) {
         $data = @json_decode((string)$body, true);
-        $err = json_last_error();
 
-        if (JSON_ERROR_NONE === $err) {
+        if (JSON_ERROR_NONE === json_last_error()) {
             return [$data, null];
         }
 
         return [null,
             new Error(sprintf(
                 '%s - Unable to parse response as JSON.  Message: %s',
                 get_class($this),
-                PHP_VERSION_ID >= 50500 ? json_last_error_msg() : (string)$err
+                json_last_error_msg()
             ))];
     }
 }

src/Request.php

@@ -18,6 +18,7 @@
 
 use GuzzleHttp\Psr7\Request as Psr7Request;
 use GuzzleHttp\Psr7\Stream as Psr7Stream;
+use GuzzleHttp\Psr7\Uri;
 
 /**
  * Class Request
@@ -35,7 +36,7 @@ class Request {
     /** @var string */
     private $path;
 
-    /** @var \DCarbone\PHPConsulAPI\Uri */
+    /** @var \Psr\Http\Message\UriInterface */
     private $uri;
 
     /** @var string */
@@ -152,6 +153,8 @@ public function setQueryOptions(QueryOptions $options = null) {
         if ('' !== $options->RelayFactor) {
             $this->params->set('relay-factor', (string)$options->RelayFactor);
         }
+
+        $this->uri = null;
     }
 
     /**
@@ -175,14 +178,20 @@ public function setWriteOptions(WriteOptions $options = null) {
         if (0 !== $options->RelayFactor) {
             $this->params->set('relay-factor', (string)$options->RelayFactor);
         }
+
+        $this->uri = null;
     }
 
     /**
-     * @return \DCarbone\PHPConsulAPI\Uri
+     * @return \Psr\Http\Message\UriInterface
      */
     public function getUri() {
         if (!isset($this->uri)) {
-            $this->uri = new Uri($this->path, $this->config, $this->params);
+            $uri = sprintf('%s://%s/%s', $this->config->getScheme(), $this->config->Address, $this->path);
+            if (0 < count($this->params)) {
+                $uri = sprintf('%s?%s', $uri, (string)$this->params);
+            }
+            $this->uri = new Uri($uri);
         }
 
         return $this->uri;