Merge pull request #8 from printu/fix/getStatusCode

fixed an Fatal Error when a timeout occured
printu · Jan 13, 2016 · d56b811 · d56b811
2 parents 9a5bca1 + 5308ff8
commit d56b811
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -10,6 +10,7 @@
 use GuzzleHttp\Command\Guzzle\GuzzleClient;
 use GuzzleHttp\Event\CompleteEvent;
 use GuzzleHttp\Exception\ParseException;
+use GuzzleHttp\Message\Response;
 use GuzzleHttp\Subscriber\Retry\RetrySubscriber;
 
 /**
@@ -151,6 +152,14 @@ private function handleErrors()
 
             // Stop other events from firing when you override 401 responses
             $e->stopPropagation();
+
+            if (!$e->getResponse()) {
+                $response = new Response(502, [], null);
+                $response->setReasonPhrase($e->getException()->getMessage());
+                $e = CustomerioException::factory($e->getRequest(), $response, $e);
+                throw $e;
+            }
+
             if ($e->getResponse()->getStatusCode() >= 400 && $e->getResponse()->getStatusCode() < 600) {
                 $e = CustomerioException::factory($e->getRequest(), $e->getResponse(), $e);
                 throw $e;

diff --git a/src/Exception/CustomerioException.php b/src/Exception/CustomerioException.php
@@ -91,6 +91,10 @@ public static function factory(RequestInterface $request, ResponseInterface $res
      */
     private static function isValidError($responseBody)
     {
+        if (!$responseBody || !is_array($responseBody)) {
+            return false;
+        }
+
         if (array_key_exists('meta', $responseBody) &&
             array_key_exists('error', $responseBody['meta'])
         ) {

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -6,7 +6,10 @@
 use Customerio\Exception\ServerErrorResponseException;
 use GuzzleHttp\Client;
 use GuzzleHttp\Command\Guzzle\Description;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Message\Request;
 use GuzzleHttp\Subscriber\History;
+use GuzzleHttp\Subscriber\Mock;
 
 /**
  * Class ClientTest
@@ -120,4 +123,34 @@ public function testUnsuccessfulResponse()
             $this->assertSame($e->getResponse()->getStatusCode(), 404);
         }
     }
+
+    /**
+     * @expectedException \Customerio\Exception\CustomerioException
+     */
+    public function testTimeoutResponse()
+    {
+        $history = new History();
+
+        $config['api_key'] = 'key';
+        $config['site_id'] = 'site_id';
+
+        $client = new \Customerio\Client($config);
+        $httpClient = $client->getHttpClient();
+
+        $mock = new Mock();
+        $mock->addException(
+            new ConnectException(
+                'addCustomer',
+                new Request('post', '/')
+            )
+        );
+
+        $httpClient->getEmitter()->attach($mock);
+        $httpClient->getEmitter()->attach($history);
+
+        $client->addCustomer([
+            'id' => 45,
+            'email' => '[email protected]'
+        ]);
+    }
 }