fixed ApiException's methods return types (#4845)

baartosz · wing328 · commit 26257daec350 · 2017-03-02T16:45:42.000+08:00
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
@@ -55,12 +55,12 @@ class ApiException extends Exception
     /**
      * Constructor
      *
-     * @param string $message         Error message
-     * @param int    $code            HTTP status code
-     * @param string $responseHeaders HTTP response header
-     * @param mixed  $responseBody    HTTP body of the server response either as Json or string
+     * @param string   $message         Error message
+     * @param int      $code            HTTP status code
+     * @param string[] $responseHeaders HTTP response header
+     * @param mixed    $responseBody    HTTP decoded body of the server response either as \stdClass or string
      */
-    public function __construct($message = "", $code = 0, $responseHeaders = null, $responseBody = null)
+    public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)
     {
         parent::__construct($message, $code);
         $this->responseHeaders = $responseHeaders;
@@ -70,7 +70,7 @@ class ApiException extends Exception
     /**
      * Gets the HTTP response header
      *
-     * @return string HTTP response header
+     * @return string[] HTTP response headers
      */
     public function getResponseHeaders()
     {
@@ -80,7 +80,7 @@ class ApiException extends Exception
     /**
      * Gets the HTTP body of the server response either as Json or string
      *
-     * @return mixed HTTP body of the server response either as Json or string
+     * @return mixed HTTP body of the server response either as \stdClass or string
      */
     public function getResponseBody()
     {
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ApiException.php
@@ -65,12 +65,12 @@ class ApiException extends Exception
     /**
      * Constructor
      *
-     * @param string $message         Error message
-     * @param int    $code            HTTP status code
-     * @param string $responseHeaders HTTP response header
-     * @param mixed  $responseBody    HTTP body of the server response either as Json or string
+     * @param string   $message         Error message
+     * @param int      $code            HTTP status code
+     * @param string[] $responseHeaders HTTP response header
+     * @param mixed    $responseBody    HTTP decoded body of the server response either as \stdClass or string
      */
-    public function __construct($message = "", $code = 0, $responseHeaders = null, $responseBody = null)
+    public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)
     {
         parent::__construct($message, $code);
         $this->responseHeaders = $responseHeaders;
@@ -80,7 +80,7 @@ public function __construct($message = "", $code = 0, $responseHeaders = null, $
     /**
      * Gets the HTTP response header
      *
-     * @return string HTTP response header
+     * @return string[] HTTP response headers
      */
     public function getResponseHeaders()
     {
@@ -90,7 +90,7 @@ public function getResponseHeaders()
     /**
      * Gets the HTTP body of the server response either as Json or string
      *
-     * @return mixed HTTP body of the server response either as Json or string
+     * @return mixed HTTP body of the server response either as \stdClass or string
      */
     public function getResponseBody()
     {
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
@@ -65,12 +65,12 @@ class ApiException extends Exception
     /**
      * Constructor
      *
-     * @param string $message         Error message
-     * @param int    $code            HTTP status code
-     * @param string $responseHeaders HTTP response header
-     * @param mixed  $responseBody    HTTP body of the server response either as Json or string
+     * @param string   $message         Error message
+     * @param int      $code            HTTP status code
+     * @param string[] $responseHeaders HTTP response header
+     * @param mixed    $responseBody    HTTP decoded body of the server response either as \stdClass or string
      */
-    public function __construct($message = "", $code = 0, $responseHeaders = null, $responseBody = null)
+    public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)
     {
         parent::__construct($message, $code);
         $this->responseHeaders = $responseHeaders;
@@ -80,7 +80,7 @@ public function __construct($message = "", $code = 0, $responseHeaders = null, $
     /**
      * Gets the HTTP response header
      *
-     * @return string HTTP response header
+     * @return string[] HTTP response headers
      */
     public function getResponseHeaders()
     {
@@ -90,7 +90,7 @@ public function getResponseHeaders()
     /**
      * Gets the HTTP body of the server response either as Json or string
      *
-     * @return mixed HTTP body of the server response either as Json or string
+     * @return mixed HTTP body of the server response either as \stdClass or string
      */
     public function getResponseBody()
     {
diff --git a/samples/client/petstore/php/test.php b/samples/client/petstore/php/test.php
@@ -55,7 +55,7 @@
 
 } catch (Swagger\Client\ApiException $e) {
     echo 'Caught exception: ', $e->getMessage(), "\n";
-    echo 'HTTP response headers: ', $e->getResponseHeaders(), "\n";
-    echo 'HTTP response body: ', $e->getResponseBody(), "\n";
+    echo 'HTTP response headers: ', print_r($e->getResponseHeaders(), true), "\n";
+    echo 'HTTP response body: ', print_r($e->getResponseBody(), true), "\n";
     echo 'HTTP status code: ', $e->getCode(), "\n";
 }

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ class ApiException extends Exception`
`55`	`55`	`/**`
`56`	`56`	`* Constructor`
`57`	`57`	`*`
`58`		`- * @param string $message Error message`
`59`		`- * @param int $code HTTP status code`
`60`		`- * @param string $responseHeaders HTTP response header`
`61`		`- * @param mixed $responseBody HTTP body of the server response either as Json or string`
	`58`	`+ * @param string $message Error message`
	`59`	`+ * @param int $code HTTP status code`
	`60`	`+ * @param string[] $responseHeaders HTTP response header`
	`61`	`+ * @param mixed $responseBody HTTP decoded body of the server response either as \stdClass or string`
`62`	`62`	`*/`
`63`		`- public function __construct($message = "", $code = 0, $responseHeaders = null, $responseBody = null)`
	`63`	`+ public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)`
`64`	`64`	`{`
`65`	`65`	`parent::__construct($message, $code);`
`66`	`66`	`$this->responseHeaders = $responseHeaders;`
`@@ -70,7 +70,7 @@ class ApiException extends Exception`
`70`	`70`	`/**`
`71`	`71`	`* Gets the HTTP response header`
`72`	`72`	`*`
`73`		`- * @return string HTTP response header`
	`73`	`+ * @return string[] HTTP response headers`
`74`	`74`	`*/`
`75`	`75`	`public function getResponseHeaders()`
`76`	`76`	`{`
`@@ -80,7 +80,7 @@ class ApiException extends Exception`
`80`	`80`	`/**`
`81`	`81`	`* Gets the HTTP body of the server response either as Json or string`
`82`	`82`	`*`
`83`		`- * @return mixed HTTP body of the server response either as Json or string`
	`83`	`+ * @return mixed HTTP body of the server response either as \stdClass or string`
`84`	`84`	`*/`
`85`	`85`	`public function getResponseBody()`
`86`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,12 @@ class ApiException extends Exception`
`65`	`65`	`/**`
`66`	`66`	`* Constructor`
`67`	`67`	`*`
`68`		`- * @param string $message Error message`
`69`		`- * @param int $code HTTP status code`
`70`		`- * @param string $responseHeaders HTTP response header`
`71`		`- * @param mixed $responseBody HTTP body of the server response either as Json or string`
	`68`	`+ * @param string $message Error message`
	`69`	`+ * @param int $code HTTP status code`
	`70`	`+ * @param string[] $responseHeaders HTTP response header`
	`71`	`+ * @param mixed $responseBody HTTP decoded body of the server response either as \stdClass or string`
`72`	`72`	`*/`
`73`		`- public function __construct($message = "", $code = 0, $responseHeaders = null, $responseBody = null)`
	`73`	`+ public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)`
`74`	`74`	`{`
`75`	`75`	`parent::__construct($message, $code);`
`76`	`76`	`$this->responseHeaders = $responseHeaders;`
`@@ -80,7 +80,7 @@ public function __construct($message = "", $code = 0, $responseHeaders = null, $`
`80`	`80`	`/**`
`81`	`81`	`* Gets the HTTP response header`
`82`	`82`	`*`
`83`		`- * @return string HTTP response header`
	`83`	`+ * @return string[] HTTP response headers`
`84`	`84`	`*/`
`85`	`85`	`public function getResponseHeaders()`
`86`	`86`	`{`
`@@ -90,7 +90,7 @@ public function getResponseHeaders()`
`90`	`90`	`/**`
`91`	`91`	`* Gets the HTTP body of the server response either as Json or string`
`92`	`92`	`*`
`93`		`- * @return mixed HTTP body of the server response either as Json or string`
	`93`	`+ * @return mixed HTTP body of the server response either as \stdClass or string`
`94`	`94`	`*/`
`95`	`95`	`public function getResponseBody()`
`96`	`96`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`
`56`	`56`	`} catch (Swagger\Client\ApiException $e) {`
`57`	`57`	`echo 'Caught exception: ', $e->getMessage(), "\n";`
`58`		`- echo 'HTTP response headers: ', $e->getResponseHeaders(), "\n";`
`59`		`- echo 'HTTP response body: ', $e->getResponseBody(), "\n";`
	`58`	`+ echo 'HTTP response headers: ', print_r($e->getResponseHeaders(), true), "\n";`
	`59`	`+ echo 'HTTP response body: ', print_r($e->getResponseBody(), true), "\n";`
`60`	`60`	`echo 'HTTP status code: ', $e->getCode(), "\n";`
`61`	`61`	`}`