Merge pull request #1394 from akkie/api-exception-json

Deserialize the response body in case of an ApiException

Author: wing328

modules/swagger-codegen/src/main/resources/php/ApiClient.mustache

@@ -239,6 +239,11 @@ class ApiClient
                 $data = $http_body;
             }
         } else {
+            $data = json_decode($http_body);
+            if (json_last_error() > 0) { // if response is a string
+                $data = $http_body;
+            }
+
             throw new ApiException(
                 "[".$response_info['http_code']."] Error connecting to the API ($url)",
                 $response_info['http_code'], $http_header, $http_body

modules/swagger-codegen/src/main/resources/php/ApiException.mustache

@@ -46,38 +46,38 @@ use \Exception;
 class ApiException extends Exception
 {
 
-    /** 
-     * The HTTP body of the server response.
-     * @var string
+    /**
+     * The HTTP body of the server response either as Json or string.
+     * @var mixed
      */
     protected $responseBody;
-  
+
     /**
      * The HTTP header of the server response.
      * @var string[]
      */
     protected $responseHeaders;
-  
+
     /**
      * The deserialized response object
      * @var $responseObject;
      */
     protected $responseObject;
- 
+
     /**
      * Constructor
      * @param string $message         Error message
-     * @param string $code            HTTP status code
+     * @param int    $code            HTTP status code
      * @param string $responseHeaders HTTP response header
-     * @param string $responseBody    Deseralized response object
+     * @param mixed  $responseBody    HTTP body of the server response either as Json or string
      */
     public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null)
     {
         parent::__construct($message, $code);
         $this->responseHeaders = $responseHeaders;
         $this->responseBody = $responseBody;
     }
-  
+
     /**
      * Gets the HTTP response header
      *
@@ -87,17 +87,17 @@ class ApiException extends Exception
     {
         return $this->responseHeaders;
     }
-  
+
     /**
-     * Gets the HTTP response body
+     * Gets the HTTP body of the server response either as Json or string
      *
-     * @return string HTTP response body
+     * @return mixed HTTP body of the server response either as Json or string
      */
     public function getResponseBody()
     {
         return $this->responseBody;
     }
-  
+
     /**
      * Sets the deseralized response object (during deserialization)
      * @param mixed $obj Deserialized response object