Merge pull request #5 from detailnet/fix/guzzle-version

Fixed mixup of Guzzle versions
detailnet · May 13, 2017 · 33c3e00 · 33c3e00
2 parents a4a9471 + 037a864
commit 33c3e00
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 61 deletions.
diff --git a/src/Jumbo/Client/Deserializer.php b/src/Jumbo/Client/Deserializer.php
@@ -2,13 +2,11 @@
 
 namespace Jumbo\Client;
 
-use Psr\Http\Message\RequestInterface as PsrRequest;
-use Psr\Http\Message\ResponseInterface as PsrResponse;
-
-use Guzzle\Http\Message\Response as HttpResponse;
 use GuzzleHttp\Command\CommandInterface;
 use GuzzleHttp\Command\Guzzle\DescriptionInterface as ServiceDescription;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Psr7\Request as PsrRequest;
+use GuzzleHttp\Psr7\Response as PsrResponse;
 
 use Jumbo\Client\Response\Response;
 
@@ -43,12 +41,6 @@ public function __invoke(PsrResponse $response, PsrRequest $request, CommandInte
             throw RequestException::create($request, $response);
         }
 
-        $httpResponse = new HttpResponse(
-            $response->getStatusCode(),
-            $response->getHeaders(),
-            $response->getBody()
-        );
-
         $name = $command->getName();
         $operation = $this->description->getOperation($name);
 
@@ -74,6 +66,6 @@ public function __invoke(PsrResponse $response, PsrRequest $request, CommandInte
 
         /** @var Response $responseClass */
 
-        return $responseClass::fromOperation($operation, $httpResponse);
+        return $responseClass::fromOperation($operation, $response);
     }
 }
diff --git a/src/Jumbo/Client/JumboClient.php b/src/Jumbo/Client/JumboClient.php
@@ -11,11 +11,10 @@
 use GuzzleHttp\Command\Guzzle\GuzzleClient as ServiceClient;
 
 use Jumbo\Client\Exception;
-use Jumbo\Client\Subscriber;
 
 abstract class JumboClient extends ServiceClient
 {
-    const CLIENT_VERSION = '0.1.0';
+    const CLIENT_VERSION = '0.1.1';
 
     const OPTION_APP_ID  = 'app_id';
     const OPTION_APP_KEY = 'app_key';
@@ -88,24 +87,6 @@ public static function factory($options = array())
         return $client;
     }
 
-//    /**
-//     * @param HttpClientInterface $client
-//     * @param ServiceDescriptionInterface $description
-//     */
-//    public function __construct(
-//        HttpClientInterface $client,
-//        ServiceDescriptionInterface $description
-//    ) {
-//        $config = array(
-//            'process' => false, // Don't use Guzzle Service's processing (we're rolling our own...)
-//        );
-//
-//        parent::__construct($client, $description, $config);
-//
-//        $emitter = $this->getEmitter();
-//        $emitter->attach(new Subscriber\Command\ProcessResponse($description));
-//    }
-
     /**
      * @return string|null
      */

diff --git a/src/Jumbo/Client/Response/BaseResponse.php b/src/Jumbo/Client/Response/BaseResponse.php
@@ -2,16 +2,15 @@
 
 namespace Jumbo\Client\Response;
 
-use Guzzle\Common\Exception as GuzzleException;
-use Guzzle\Http\Message\Response as HttpResponse;
+use GuzzleHttp\Psr7\Response as PsrResponse;
 
 use Jumbo\Client\Exception;
 
 abstract class BaseResponse implements
     Response
 {
     /**
-     * @var HttpResponse
+     * @var PsrResponse
      */
     protected $response;
 
@@ -21,16 +20,16 @@ abstract class BaseResponse implements
     protected $data;
 
     /**
-     * @param HttpResponse $response
+     * @param PsrResponse $response
      */
-    public function __construct(HttpResponse $response)
+    public function __construct(PsrResponse $response)
     {
         $this->response = $response;
         $this->data = $this->extractData();
     }
 
     /**
-     * @return HttpResponse
+     * @return PsrResponse
      */
     public function getHttpResponse()
     {
@@ -59,15 +58,42 @@ protected function getData()
     private function extractData()
     {
         try {
-            $data = $this->getHttpResponse()->json();
+            $data = $this->decodeJson($this->getHttpResponse()->getBody());
 
             return is_array($data) ? $data : array();
-        } catch (GuzzleException\RuntimeException $e) {
+        } catch (\Exception $e) {
             throw new Exception\RuntimeException(
                 sprintf('Failed extract data from HTTP response: %s', $e->getMessage()),
                 $e->getCode(),
                 $e
             );
         }
     }
+
+    /**
+     * @param string $value
+     * @return array
+     */
+    private function decodeJson($value)
+    {
+        $data = json_decode($value, true);
+
+        if ($data === false) {
+            $error = json_last_error();
+
+            if ($error !== JSON_ERROR_NONE) {
+                $message = json_last_error_msg();
+
+                if ($message === false) {
+                    $message = 'Unknown error';
+                }
+
+                throw new Exception\RuntimeException(
+                    sprintf('Unable to decode JSON: %s', $message)
+                );
+            }
+        }
+
+        return $data;
+    }
 }
diff --git a/src/Jumbo/Client/Response/ListResponse.php b/src/Jumbo/Client/Response/ListResponse.php
@@ -4,8 +4,8 @@
 
 use ArrayIterator;
 
-use Guzzle\Http\Message\Response as HttpResponse;
 use GuzzleHttp\Command\Guzzle\Operation;
+use GuzzleHttp\Psr7\Response as PsrResponse;
 
 use Jumbo\Client\Exception;
 
@@ -24,10 +24,10 @@ class ListResponse extends BaseResponse implements
 
     /**
      * @param Operation $operation
-     * @param HttpResponse $response
+     * @param PsrResponse $response
      * @return ListResponse
      */
-    public static function fromOperation(Operation $operation, HttpResponse $response)
+    public static function fromOperation(Operation $operation, PsrResponse $response)
     {
         $operationConfig = $operation->toArray();
 
@@ -44,10 +44,10 @@ public static function fromOperation(Operation $operation, HttpResponse $respons
     }
 
     /**
-     * @param HttpResponse $response
+     * @param PsrResponse $response
      * @param string $dataRoot
      */
-    public function __construct(HttpResponse $response, $dataRoot)
+    public function __construct(PsrResponse $response, $dataRoot)
     {
         parent::__construct($response);
 

diff --git a/src/Jumbo/Client/Response/ResourceResponse.php b/src/Jumbo/Client/Response/ResourceResponse.php
@@ -2,8 +2,8 @@
 
 namespace Jumbo\Client\Response;
 
-use Guzzle\Http\Message\Response as HttpResponse;
 use GuzzleHttp\Command\Guzzle\Operation;
+use GuzzleHttp\Psr7\Response as PsrResponse;
 
 class ResourceResponse extends BaseResponse
 {
@@ -14,29 +14,23 @@ class ResourceResponse extends BaseResponse
 
     /**
      * @param Operation $operation
-     * @param HttpResponse $response
+     * @param PsrResponse $response
      * @return ResourceResponse
      */
-    public static function fromOperation(Operation $operation, HttpResponse $response)
+    public static function fromOperation(Operation $operation, PsrResponse $response)
     {
         return new static($response);
     }
 
-    /**
-     * @param HttpResponse $response
-     */
-    public function __construct(HttpResponse $response)
-    {
-        parent::__construct($response);
-
-        $this->resource = new Resource($this->getData());
-    }
-
     /**
      * @return \Jumbo\Client\Response\Resource
      */
     public function getResource()
     {
+        if ($this->resource === null) {
+            $this->resource = new Resource($this->getData());
+        }
+
         return $this->resource;
     }
 }
diff --git a/src/Jumbo/Client/Response/Response.php b/src/Jumbo/Client/Response/Response.php
@@ -2,20 +2,20 @@
 
 namespace Jumbo\Client\Response;
 
-use Guzzle\Http\Message\Response as HttpResponse;
 use GuzzleHttp\Command\Guzzle\Operation;
+use GuzzleHttp\Psr7\Response as PsrResponse;
 
 interface Response
 {
     /**
      * @param Operation $operation
-     * @param HttpResponse $response
+     * @param PsrResponse $response
      * @return Response
      */
-    public static function fromOperation(Operation $operation, HttpResponse $response);
+    public static function fromOperation(Operation $operation, PsrResponse $response);
 
     /**
-     * @return HttpResponse
+     * @return PsrResponse
      */
     public function getHttpResponse();