Adding an special exception in case the response returned by Guzzle is null, and fixed the method call to createResponse() to not create an fatal error.

wtfzdotnet · wtfzdotnet · commit 6f1f0b73dec2 · 2015-01-31T13:47:55.000+01:00
diff --git a/lib/Tmdb/Exception/NullResponseException.php b/lib/Tmdb/Exception/NullResponseException.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * This file is part of the Tmdb PHP API created by Michael Roterman.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package Tmdb
+ * @author Michael Roterman <michael@wtfz.net>
+ * @copyright (c) 2013, Michael Roterman
+ * @version 0.0.1
+ */
+namespace Tmdb\Exception;
+use Tmdb\HttpClient\Request;
+
+/**
+ * Class RuntimeException
+ * @package Tmdb\Exception
+ */
+class NullResponseException extends RuntimeException
+{
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * @param Request         $request
+     * @param \Exception|null $previous
+     */
+    public function __construct(Request $request, \Exception $previous = null)
+    {
+        $this->request = $request;
+
+        if (null !== $previous && is_a($previous, 'GuzzleHttp\Exception\RequestException')) {
+            $message = sprintf(
+                'The request to path "%s" with query parameters "%s" failed to return a valid response. The previous exception reported "%s" at "%s:%d".',
+                $request->getPath(),
+                json_encode($request->getParameters()->all()),
+                $previous->getMessage(),
+                $previous->getFile(),
+                $previous->getLine()
+            );
+        } else {
+            $message = sprintf(
+                'The request to path "%s" with query parameters "%s" failed to return a valid response.',
+                $request->getPath(),
+                json_encode($request->getParameters()->all())
+            );
+        }
+
+        parent::__construct($message, 0, $previous);
+    }
+
+    /**
+     * @return Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * @param  Request $request
+     * @return $this
+     */
+    public function setRequest(Request $request)
+    {
+        $this->request = $request;
+
+        return $this;
+    }
+}
diff --git a/lib/Tmdb/HttpClient/Adapter/GuzzleAdapter.php b/lib/Tmdb/HttpClient/Adapter/GuzzleAdapter.php
@@ -15,11 +15,13 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\Response;
+use GuzzleHttp\Message\ResponseInterface;
 use GuzzleHttp\Subscriber\Retry\RetrySubscriber;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Tmdb\Common\ParameterBag;
+use Tmdb\Exception\NullResponseException;
 use Tmdb\HttpClient\Request;
+use Tmdb\HttpClient\Response;
 
 class GuzzleAdapter extends AbstractAdapter
 {
@@ -28,6 +30,11 @@ class GuzzleAdapter extends AbstractAdapter
      */
     private $client;
 
+    /**
+     * @var Request
+     */
+    protected $request;
+
     public function __construct(ClientInterface $client = null, array $options = [])
     {
         if (null === $client) {
@@ -63,6 +70,8 @@ public function registerSubscribers(EventDispatcherInterface $eventDispatcher)
      */
     public function getConfiguration(Request $request)
     {
+        $this->request = $request;
+
         return [
             'headers'  => $request->getHeaders()->all(),
             'query'    => $request->getParameters()->all()
@@ -72,12 +81,12 @@ public function getConfiguration(Request $request)
     /**
      * Create the response object
      *
-     * @param  Response                  $adapterResponse
+     * @param  ResponseInterface         $adapterResponse
      * @return \Tmdb\HttpClient\Response
      */
-    private function createResponse(Response $adapterResponse)
+    private function createResponse(ResponseInterface $adapterResponse = null)
     {
-        $response = new \Tmdb\HttpClient\Response();
+        $response = new Response();
 
         $response->setCode($adapterResponse->getStatusCode());
         $response->setHeaders(new ParameterBag($adapterResponse->getHeaders()));
@@ -86,18 +95,40 @@ private function createResponse(Response $adapterResponse)
         return $response;
     }
 
+    /**
+     * Create the request exception
+     *
+     * @param  Request                          $request
+     * @param  RequestException|null            $previousException
+     * @throws \Tmdb\Exception\TmdbApiException
+     */
+    protected function handleRequestException(Request $request, RequestException $previousException = null)
+    {
+        if (null !== $previousException && null == $response = $previousException->getResponse()) {
+            throw new NullResponseException($this->request, $previousException);
+        }
+
+        throw $this->createApiException(
+            $request,
+            $this->createResponse($previousException->getResponse()),
+            $previousException
+        );
+    }
+
     /**
      * {@inheritDoc}
      */
     public function get(Request $request)
     {
+        $response = null;
+
         try {
             $response = $this->client->get(
                 $request->getPath(),
                 $this->getConfiguration($request)
             );
         } catch (RequestException $e) {
-            throw $this->createApiException($request, $this->createResponse($e->getResponse()));
+            $this->handleRequestException($request, $e);
         }
 
         return $this->createResponse($response);
@@ -108,6 +139,8 @@ public function get(Request $request)
      */
     public function post(Request $request)
     {
+        $response = null;
+
         try {
             $response = $this->client->post(
                 $request->getPath(),
@@ -117,7 +150,7 @@ public function post(Request $request)
                 )
             );
         } catch (RequestException $e) {
-            throw $this->createApiException($request, $this->createResponse($e->getResponse()));
+            $this->handleRequestException($request, $e);
         }
 
         return $this->createResponse($response);
@@ -128,6 +161,8 @@ public function post(Request $request)
      */
     public function put(Request $request)
     {
+        $response = null;
+
         try {
             $response = $this->client->put(
                 $request->getPath(),
@@ -137,7 +172,7 @@ public function put(Request $request)
                 )
             );
         } catch (RequestException $e) {
-            throw $this->createApiException($request, $this->createResponse($e->getResponse()));
+            $this->handleRequestException($request, $e);
         }
 
         return $this->createResponse($response);
@@ -148,6 +183,8 @@ public function put(Request $request)
      */
     public function patch(Request $request)
     {
+        $response = null;
+
         try {
             $response = $this->client->patch(
                 $request->getPath(),
@@ -157,7 +194,7 @@ public function patch(Request $request)
                 )
             );
         } catch (RequestException $e) {
-            throw $this->createApiException($request, $this->createResponse($e->getResponse()));
+            $this->handleRequestException($request, $e);
         }
 
         return $this->createResponse($response);
@@ -168,6 +205,8 @@ public function patch(Request $request)
      */
     public function delete(Request $request)
     {
+        $response = null;
+
         try {
             $response = $this->client->delete(
                 $request->getPath(),
@@ -177,7 +216,7 @@ public function delete(Request $request)
                 )
             );
         } catch (RequestException $e) {
-            throw $this->createApiException($request, $this->createResponse($e->getResponse()));
+            $this->handleRequestException($request, $e);
         }
 
         return $this->createResponse($response);
@@ -188,13 +227,15 @@ public function delete(Request $request)
      */
     public function head(Request $request)
     {
+        $response = null;
+
         try {
             $response = $this->client->head(
                 $request->getPath(),
                 $this->getConfiguration($request)
             );
         } catch (RequestException $e) {
-            throw $this->createApiException($request, $this->createResponse($e->getResponse()));
+            $this->handleRequestException($request, $e);
         }
 
         return $this->createResponse($response);
diff --git a/test/Tmdb/Tests/HttpClient/Adapter/GuzzleAdapterTest.php b/test/Tmdb/Tests/HttpClient/Adapter/GuzzleAdapterTest.php
@@ -16,6 +16,7 @@
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Message\Response;
 use GuzzleHttp\Stream\Stream;
+use Tmdb\Exception\NullResponseException;
 use Tmdb\HttpClient\Adapter\GuzzleAdapter;
 use Tmdb\HttpClient\Request;
 use Tmdb\Tests\TestCase;
@@ -274,6 +275,56 @@ public function shouldThrowExceptionForDelete()
         $adapter->delete(new Request());
     }
 
+    /**
+     * @expectedException \Tmdb\Exception\NullResponseException
+     * @test
+     */
+    public function shouldThrowNullResponseException()
+    {
+        $client = $this->getMock('GuzzleHttp\ClientInterface');
+
+        $client->expects($this->once())
+            ->method('get')
+            ->will($this->throwException(
+                new RequestException(
+                    '404',
+                    new \GuzzleHttp\Message\Request('get', '/'),
+                    null
+                )
+            ))
+        ;
+
+        $adapter = new GuzzleAdapter($client);
+        $adapter->get(new Request());
+    }
+
+    /**
+     * @test
+     */
+    public function shouldFormatMessageForAnGuzzleHttpRequestException()
+    {
+        $client = $this->getMock('GuzzleHttp\ClientInterface');
+
+        $client->expects($this->once())
+            ->method('get')
+            ->will($this->throwException(
+                new RequestException(
+                    '404',
+                    new \GuzzleHttp\Message\Request('get', '/'),
+                    null
+                )
+            ))
+        ;
+
+        $adapter = new GuzzleAdapter($client);
+
+        try {
+            $adapter->get(new Request());
+        } catch (NullResponseException $e) {
+            $this->assertEquals(true, false !== strpos($e->getMessage(), 'previous exception'));
+        }
+    }
+
     /**
      * @test
      */
