Merge pull request #735 from bshaffer/adds-json-error-handling

ensures json errors are not thrown

src/Google/Http/REST.php

@@ -19,6 +19,7 @@
 use GuzzleHttp\Message\ResponseInterface;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\ParseException;
 
 /**
  * This class implements the RESTful transport of apiServiceRequest()'s
@@ -93,10 +94,21 @@ public static function decodeHttpResponse(
   ) {
     $body = (string) $response->getBody();
     $code = $response->getStatusCode();
+    $result = null;
 
     // return raw response when "alt" is "media"
     $isJson = !($request && 'media' == $request->getQuery()->get('alt'));
-    $result = $isJson ? $response->json() : $body;
+
+    // set the result to the body if it's not set to anything else
+    if ($isJson) {
+      try {
+        $result = $response->json();
+      } catch (ParseException $e) {
+        $result = $body;
+      }
+    } else {
+      $result = $body;
+    }
 
     // retry strategy
     if ((intVal($code)) >= 300) {

tests/Google/Http/RESTTest.php

@@ -119,4 +119,14 @@ public function tesProperErrorFormatting()
     $response = new Response(401, array(), $stream);
     $this->rest->decodeHttpResponse($response);
   }
+
+  /**
+   * @expectedException Google_Service_Exception
+   */
+  public function testNotJson404Error()
+  {
+    $stream = Stream::factory('Not Found');
+    $response = new Response(404, array(), $stream);
+    $this->rest->decodeHttpResponse($response);
+  }
 }