From 25222734935f1497bd9b10e672e5a60ce10bdcca Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 26 May 2016 15:26:21 +0200
Subject: [PATCH] Update SDK for Guzzle 6

---
 Consul/Client.php         | 44 ++++++++++++++++++++++++++-------------
 Consul/ConsulResponse.php | 30 ++++++++++++++++++++++++++
 README.md                 | 10 +++++++++
 composer.json             |  4 ++--
 4 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 Consul/ConsulResponse.php

diff --git a/Consul/Client.php b/Consul/Client.php
index 29495c5..6560546 100644
--- a/Consul/Client.php
+++ b/Consul/Client.php
@@ -4,7 +4,7 @@
 
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\Exception\TransferException;
-use GuzzleHttp\Message\RequestInterface;
+use GuzzleHttp\Psr7\Response;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use SensioLabs\Consul\Exception\ClientException;
@@ -19,55 +19,55 @@ public function __construct(array $options = array(), LoggerInterface $logger =
     {
         $options = array_replace(array(
             'base_url' => 'http://127.0.0.1:8500',
+            'http_errors' => false,
         ), $options);
 
         $this->client = $client ?: new GuzzleClient($options);
-        $this->client->setDefaultOption('exceptions', false);
         $this->logger = $logger ?: new NullLogger();
     }
 
     public function get($url = null, array $options = array())
     {
-        return $this->send($this->client->createRequest('GET', $url, $options));
+        return $this->doRequest('GET', $url, $options);
     }
 
     public function head($url, array $options = array())
     {
-        return $this->send($this->client->createRequest('HEAD', $url, $options));
+        return $this->doRequest('HEAD', $url, $options);
     }
 
     public function delete($url, array $options = array())
     {
-        return $this->send($this->client->createRequest('DELETE', $url, $options));
+        return $this->doRequest('DELETE', $url, $options);
     }
 
     public function put($url, array $options = array())
     {
-        return $this->send($this->client->createRequest('PUT', $url, $options));
+        return $this->doRequest('PUT', $url, $options);
     }
 
     public function patch($url, array $options = array())
     {
-        return $this->send($this->client->createRequest('PATCH', $url, $options));
+        return $this->doRequest('PATCH', $url, $options);
     }
 
     public function post($url, array $options = array())
     {
-        return $this->send($this->client->createRequest('POST', $url, $options));
+        return $this->doRequest('POST', $url, $options);
     }
 
     public function options($url, array $options = array())
     {
-        return $this->send($this->client->createRequest('OPTIONS', $url, $options));
+        return $this->doRequest('OPTIONS', $url, $options);
     }
 
-    public function send(RequestInterface $request)
+    private function doRequest($method, $url, $options)
     {
-        $this->logger->info(sprintf('%s "%s"', $request->getMethod(), $request->getUrl()));
-        $this->logger->debug(sprintf("Request:\n%s", (string) $request));
+        $this->logger->info(sprintf('%s "%s"', $method, $url));
+        $this->logger->debug(sprintf("Requesting %s %s", $method, $url), array('options' => $options));
 
         try {
-            $response = $this->client->send($request);
+            $response = $this->client->request($method, $url, $options);
         } catch (TransferException $e) {
             $message = sprintf('Something went wrong when calling consul (%s).', $e->getMessage());
 
@@ -76,7 +76,7 @@ public function send(RequestInterface $request)
             throw new ServerException($message);
         }
 
-        $this->logger->debug(sprintf("Response:\n%s", $response));
+        $this->logger->debug(sprintf("Response:\n%s", $this->formatResponse($response)));
 
         if (400 <= $response->getStatusCode()) {
             $message = sprintf('Something went wrong when calling consul (%s - %s).', $response->getStatusCode(), $response->getReasonPhrase());
@@ -91,6 +91,20 @@ public function send(RequestInterface $request)
             throw new ClientException($message);
         }
 
-        return $response;
+
+        return new ConsulResponse($response->getHeaders(), $response->getBody()->getContents());
+    }
+
+    private function formatResponse(Response $response)
+    {
+        $headers = array();
+
+        foreach ($response->getHeaders() as $key => $values) {
+            foreach ($values as $value) {
+                $headers[] = sprintf('%s: %s', $key, $value);
+            }
+        }
+
+        return sprintf("%s\n\n%s", implode("\n", $headers), $response->getBody());
     }
 }
diff --git a/Consul/ConsulResponse.php b/Consul/ConsulResponse.php
new file mode 100644
index 0000000..dd13bd4
--- /dev/null
+++ b/Consul/ConsulResponse.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace SensioLabs\Consul;
+
+class ConsulResponse
+{
+    private $headers;
+    private $body;
+
+    public function __construct($headers, $body)
+    {
+        $this->headers = $headers;
+        $this->body = $body;
+    }
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    public function json()
+    {
+        return json_decode($this->body, true);
+    }
+}
diff --git a/README.md b/README.md
index 17c0717..9b6a5e2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,16 @@
 Consul SDK
 ==========
 
+Compatibility
+-------------
+
+This table shows this SDK compatibility regarding Guzzle version:
+
+| SDK Version | Guzzle Version
+| ----------- | --------------
+| 1.x         | >=4, <6
+| 2.x         | 6
+
 Installation
 ------------
 
diff --git a/composer.json b/composer.json
index bb3a3bb..237a36b 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "guzzlehttp/guzzle": ">=4,<6",
+        "guzzlehttp/guzzle": "^6.0",
         "psr/log": "~1.0"
     },
     "autoload": {
@@ -19,7 +19,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }