diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
index e2ddba4bf345..4034b966cb6b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
@@ -20,7 +20,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String groupId = "swagger";
     protected String artifactId = "swagger-client";
     protected String packagePath = "SwaggerClient-php";
-    protected String artifactVersion = null;
+    protected String artifactVersion = "1.0.0";
     protected String srcBasePath = "lib";
 
     public PhpClientCodegen() {
@@ -79,7 +79,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("boolean", "bool");
         typeMapping.put("date", "\\DateTime");
         typeMapping.put("datetime", "\\DateTime");
-        typeMapping.put("file", "string");
+        typeMapping.put("file", "\\SplFileObject");
         typeMapping.put("map", "map");
         typeMapping.put("array", "array");
         typeMapping.put("list", "array");
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
index 2862a0e0538e..3c6819ab73be 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
@@ -1,4 +1,15 @@
 <?php
+/**
+ * ApiClient
+ * 
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}} 
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,206 +25,248 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
 
 namespace {{invokerPackage}};
 
-class ApiClient {
+/**
+ * ApiClient Class Doc Comment
+ *
+ * @category Class
+ * @package  {{invokerPackage}} 
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class ApiClient
+{
 
-  public static $PATCH = "PATCH";
-  public static $POST = "POST";
-  public static $GET = "GET";
-  public static $PUT = "PUT";
-  public static $DELETE = "DELETE";
-
-  /** @var Configuration */
-  protected $config;
-
-  /** @var ObjectSerializer */
-  protected $serializer;
-
-  /**
-   * @param Configuration $config config for this ApiClient
-   */
-  function __construct(Configuration $config = null) {
-    if ($config == null) {
-      $config = Configuration::getDefaultConfiguration();
+    public static $PATCH = "PATCH";
+    public static $POST = "POST";
+    public static $GET = "GET";
+    public static $PUT = "PUT";
+    public static $DELETE = "DELETE";
+  
+    /** 
+     * Configuration
+     * @var Configuration
+     */
+    protected $config;
+  
+    /**
+     * Object Serializer
+     * @var ObjectSerializer
+     */
+    protected $serializer;
+  
+    /**
+     * Constructor of the class
+     * @param Configuration $config config for this ApiClient
+     */
+    function __construct(Configuration $config = null)
+    {
+        if ($config == null) {
+            $config = Configuration::getDefaultConfiguration();
+        }
+        
+        $this->config = $config;
+        $this->serializer = new ObjectSerializer();
+    }
+  
+    /**
+     * Get the config
+     * @return Configuration
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
+  
+    /**
+     * Get the serializer
+     * @return ObjectSerializer
+     */
+    public function getSerializer()
+    {
+        return $this->serializer;
+    }
+  
+    /**
+     * Get API key (with prefix if set)
+     * @param  string $apiKeyIdentifier name of apikey
+     * @return string API key with the prefix
+     */
+    public function getApiKeyWithPrefix($apiKeyIdentifier)
+    {
+        $prefix = $this->config->getApiKeyPrefix($apiKeyIdentifier);
+        $apiKey = $this->config->getApiKey($apiKeyIdentifier);
+  
+        if (!isset($apiKey)) {
+            return null;
+        }
+  
+        if (isset($prefix)) {
+            $keyWithPrefix = $prefix." ".$apiKey;
+        } else {
+            $keyWithPrefix = $apiKey;
+        }
+  
+        return $keyWithPrefix;
     }
     
-    $this->config = $config;
-    $this->serializer = new ObjectSerializer();
-  }
-
-  /**
-   * get the config
-   * @return Configuration
-   */
-  public function getConfig() {
-    return $this->config;
-  }
-
-  /**
-   * get the serializer
-   * @return ObjectSerializer
-   */
-  public function getSerializer() {
-    return $this->serializer;
-  }
-
-  /**
-   * Get API key (with prefix if set)
-   * @param string $apiKey name of apikey
-   * @return string API key with the prefix
-   */
-  public function getApiKeyWithPrefix($apiKey) {
-    $prefix = $this->config->getApiKeyPrefix($apiKey);
-    $apiKey = $this->config->getApiKey($apiKey);
-
-    if (!isset($apiKey)) {
-      return null;
-    }
-
-    if (isset($prefix)) {
-      $keyWithPrefix = $prefix." ".$apiKey;
-    } else {
-      $keyWithPrefix = $apiKey;
-    }
-
-    return $keyWithPrefix;
-  }
+    /**
+     * Make the HTTP call (Sync)
+     * @param string $resourcePath path to method endpoint
+     * @param string $method       method to call
+     * @param array  $queryParams  parameters to be place in query URL
+     * @param array  $postData     parameters to be placed in POST body
+     * @param array  $headerParams parameters to be place in request header
+     * @param string $responseType expected response type of the endpoint
+     * @throws \{{invokerPackage}}\ApiException on a non 2xx response
+     * @return mixed
+     */
+    public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams, $responseType=null)
+    {
   
-  /**
-   * @param string $resourcePath path to method endpoint
-   * @param string $method method to call
-   * @param array $queryParams parameters to be place in query URL
-   * @param array $postData parameters to be placed in POST body
-   * @param array $headerParams parameters to be place in request header
-   * @throws \{{invokerPackage}}\ApiException on a non 2xx response
-   * @return mixed
-   */
-  public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams) {
-
-    $headers = array();
-
-    # construct the http header
-    $headerParams = array_merge((array)$this->config->getDefaultHeaders(), (array)$headerParams);
-
-    foreach ($headerParams as $key => $val) {
-      $headers[] = "$key: $val";
+        $headers = array();
+  
+        // construct the http header
+        $headerParams = array_merge(
+            (array)$this->config->getDefaultHeaders(), 
+            (array)$headerParams
+        );
+  
+        foreach ($headerParams as $key => $val) {
+            $headers[] = "$key: $val";
+        }
+  
+        // form data
+        if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
+            $postData = http_build_query($postData);
+        } else if ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
+            $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
+        }
+  
+        $url = $this->config->getHost() . $resourcePath;
+  
+        $curl = curl_init();
+        // set timeout, if needed
+        if ($this->config->getCurlTimeout() != 0) {
+            curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout());
+        }
+        // return the result on success, rather than just TRUE
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+  
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+  
+        if (! empty($queryParams)) {
+            $url = ($url . '?' . http_build_query($queryParams));
+        }
+  
+        if ($method == self::$POST) {
+            curl_setopt($curl, CURLOPT_POST, true);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PATCH) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PUT) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$DELETE) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method != self::$GET) {
+            throw new ApiException('Method ' . $method . ' is not recognized.');
+        }
+        curl_setopt($curl, CURLOPT_URL, $url);
+  
+        // Set user agent
+        curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
+  
+        // debugging for curl
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, $this->config->getDebugFile());
+  
+            curl_setopt($curl, CURLOPT_VERBOSE, 1);
+            curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
+        } else {
+            curl_setopt($curl, CURLOPT_VERBOSE, 0);
+        }
+  
+        // obtain the HTTP response headers
+        curl_setopt($curl, CURLOPT_HEADER, 1);
+  
+        // Make the request
+        $response = curl_exec($curl);
+        $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+        $http_header = substr($response, 0, $http_header_size);
+        $http_body = substr($response, $http_header_size);
+        $response_info = curl_getinfo($curl);
+  
+        // debug HTTP response body
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, $this->config->getDebugFile());
+        }
+  
+        // Handle the response
+        if ($response_info['http_code'] == 0) {
+            throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
+        } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
+            // return raw body if response is a file 
+            if ($responseType == '\SplFileObject') {
+                return array($http_body, $http_header);
+            }
+  
+            $data = json_decode($http_body);
+            if (json_last_error() > 0) { // if response is a string
+                $data = $http_body;
+            }
+        } else {
+            throw new ApiException(
+                "[".$response_info['http_code']."] Error connecting to the API ($url)",
+                $response_info['http_code'], $http_header, $http_body
+            );
+        }
+        return array($data, $http_header);
     }
-
-    // form data
-    if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
-      $postData = http_build_query($postData);
+  
+    /**
+     * Return the header 'Accept' based on an array of Accept provided
+     *
+     * @param string[] $accept Array of header
+     *
+     * @return string Accept (e.g. application/json)
+     */
+    public static function selectHeaderAccept($accept)
+    {
+        if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
+            return null;
+        } elseif (preg_grep("/application\/json/i", $accept)) {
+            return 'application/json';
+        } else {
+            return implode(',', $accept);
+        }
     }
-    else if ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
-      $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
+  
+    /**
+     * Return the content type based on an array of content-type provided
+     *
+     * @param string[] $content_type Array fo content-type
+     *
+     * @return string Content-Type (e.g. application/json)
+     */
+    public static function selectHeaderContentType($content_type)
+    {
+        if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
+            return 'application/json';
+        } elseif (preg_grep("/application\/json/i", $content_type)) {
+            return 'application/json';
+        } else {
+            return implode(',', $content_type);
+        }
     }
-
-    $url = $this->config->getHost() . $resourcePath;
-
-    $curl = curl_init();
-    // set timeout, if needed
-    if ($this->config->getCurlTimeout() != 0) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout());
-    }
-    // return the result on success, rather than just TRUE
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-
-    curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-
-    if (! empty($queryParams)) {
-      $url = ($url . '?' . http_build_query($queryParams));
-    }
-
-    if ($method == self::$POST) {
-      curl_setopt($curl, CURLOPT_POST, true);
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PATCH) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PUT) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$DELETE) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method != self::$GET) {
-      throw new ApiException('Method ' . $method . ' is not recognized.');
-    }
-    curl_setopt($curl, CURLOPT_URL, $url);
-
-    // Set user agent
-    curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
-
-    // debugging for curl
-    if ($this->config->getDebug()) {
-      error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, $this->config->getDebugFile());
-
-      curl_setopt($curl, CURLOPT_VERBOSE, 1);
-      curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
-    } else {
-      curl_setopt($curl, CURLOPT_VERBOSE, 0);
-    }
-
-    // obtain the HTTP response headers
-    curl_setopt($curl, CURLOPT_HEADER, 1);
-
-    // Make the request
-    $response = curl_exec($curl);
-    $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
-    $http_header = substr($response, 0, $http_header_size);
-    $http_body = substr($response, $http_header_size);
-    $response_info = curl_getinfo($curl);
-
-    // debug HTTP response body
-    if ($this->config->getDebug()) {
-        error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, $this->config->getDebugFile());
-    }
-
-    // Handle the response
-    if ($response_info['http_code'] == 0) {
-      throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
-    } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
-      $data = json_decode($http_body);
-      if (json_last_error() > 0) { // if response is a string
-        $data = $http_body;
-      }
-    } else {
-      throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)",
-        $response_info['http_code'], $http_header, $http_body);
-    }
-    return $data;
-  }
-
-  /*
-   * return the header 'Accept' based on an array of Accept provided
-   *
-   * @param string[] $accept Array of header
-   * @return string Accept (e.g. application/json)
-   */
-  public static function selectHeaderAccept($accept) {
-    if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
-      return NULL;
-    } elseif (preg_grep("/application\/json/i", $accept)) {
-      return 'application/json';
-    } else {
-      return implode(',', $accept);
-    }
-  }
-
-  /*
-   * return the content type based on an array of content-type provided
-   *
-   * @param string[] content_type_array Array fo content-type
-   * @return string Content-Type (e.g. application/json)
-   */
-  public static function selectHeaderContentType($content_type) {
-    if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
-      return 'application/json';
-    } elseif (preg_grep("/application\/json/i", $content_type)) {
-      return 'application/json';
-    } else {
-      return implode(',', $content_type);
-    }
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
index 6d5415f798d4..79d1b4fe0a15 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
@@ -1,4 +1,14 @@
 <?php
+/**
+ * ApiException
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,57 +24,97 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
 
 namespace {{invokerPackage}};
 
 use \Exception;
 
-class ApiException extends Exception {
+/**
+ * ApiException Class Doc Comment
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class ApiException extends Exception
+{
 
-  /** @var string The HTTP body of the server response. */
-  protected $responseBody;
+    /** 
+     * The HTTP body of the server response.
+     * @var string
+     */
+    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 string $responseHeaders HTTP response header
+     * @param string $responseBody    Deseralized response object
+     */
+    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
+     *
+     * @return string HTTP response header
+     */
+    public function getResponseHeaders()
+    {
+        return $this->responseHeaders;
+    }
+  
+    /**
+     * Gets the HTTP response body
+     *
+     * @return string HTTP response body
+     */
+    public function getResponseBody()
+    {
+        return $this->responseBody;
+    }
+  
+    /**
+     * Sets the deseralized response object (during deserialization)
+     * @param mixed $obj Deserialized response object
+     * @return void
+     */
+    public function setResponseObject($obj)
+    {
+        $this->responseObject = $obj;
+    }
 
-  /** @var string[] The HTTP header of the server response. */
-  protected $responseHeaders;
-
-  /**
-   * The deserialized response object
-   */
-  protected $responseObject;
-
-  public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null) {
-    parent::__construct($message, $code);
-    $this->responseHeaders = $responseHeaders;
-    $this->responseBody = $responseBody;
-  }
-
-  /**
-   * Get the HTTP response header
-   *
-   * @return string HTTP response header
-   */
-  public function getResponseHeaders() {
-    return $this->responseHeaders;
-  }
-
-  /**
-   * Get the HTTP response body
-   *
-   * @return string HTTP response body
-   */
-  public function getResponseBody() {
-    return $this->responseBody;
-  }
-
-  /**
-   * sets the deseralized response object (during deserialization)
-   * @param mixed $obj
-   */
-  public function setResponseObject($obj) {
-    $this->responseObject = $obj;
-  }
-
-  public function getResponseObject() {
-    return $this->responseObject;
-  }
+    /**
+     * Gets the deseralized response object (during deserialization)
+     *
+     * @return mixed the deserialized response object
+     */
+    public function getResponseObject()
+    {
+        return $this->responseObject;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
index 56a61e97c916..1d63440b66fd 100644
--- a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
@@ -1,47 +1,95 @@
 <?php
+/**
+ * ObjectSerializer 
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2015 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
 namespace {{invokerPackage}};
 
-class ObjectSerializer {
+/**
+ * ObjectSerializer Class Doc Comment
+ *
+ * @category Class
+ * @package  {{invokerPackage}} 
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class ObjectSerializer
+{
 
     /**
      * Build a JSON POST object
+     *
      * @param mixed $data the data to serialize
+     *
      * @return string serialized form of $data
      */
-    public function sanitizeForSerialization($data) {
-      if (is_scalar($data) || null === $data) {
-        $sanitized = $data;
-      } else if ($data instanceof \DateTime) {
-        $sanitized = $data->format(\DateTime::ISO8601);
-      } else if (is_array($data)) {
-        foreach ($data as $property => $value) {
-          $data[$property] = $this->sanitizeForSerialization($value);
+    public function sanitizeForSerialization($data)
+    {
+        if (is_scalar($data) || null === $data) {
+            $sanitized = $data;
+        } else if ($data instanceof \DateTime) {
+            $sanitized = $data->format(\DateTime::ISO8601);
+        } else if (is_array($data)) {
+            foreach ($data as $property => $value) {
+                $data[$property] = $this->sanitizeForSerialization($value);
+            }
+            $sanitized = $data;
+        } else if (is_object($data)) {
+            $values = array();
+            foreach (array_keys($data::$swaggerTypes) as $property) {
+                $getter = $data::$getters[$property];
+                if ($data->$getter() !== null) {
+                    $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
+                }
+            }
+            $sanitized = $values;
+        } else {
+            $sanitized = (string)$data;
         }
-        $sanitized = $data;
-      } else if (is_object($data)) {
-        $values = array();
-        foreach (array_keys($data::$swaggerTypes) as $property) {
-          $getter = $data::$getters[$property];
-          if ($data->$getter() !== null) {
-            $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
-          }
-        }
-        $sanitized = $values;
-      } else {
-        $sanitized = (string)$data;
-      }
 
-      return $sanitized;
+        return $sanitized;
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the path, by url-encoding.
+     *
      * @param string $value a string which will be part of the path
+     *
      * @return string the serialized object
      */
-    public function toPathValue($value) {
-      return rawurlencode($this->toString($value));
+    public function toPathValue($value)
+    {
+        return rawurlencode($this->toString($value));
     }
 
     /**
@@ -49,103 +97,133 @@ class ObjectSerializer {
      * the query, by imploding comma-separated if it's an object.
      * If it's a string, pass through unchanged. It will be url-encoded
      * later.
+     *
      * @param object $object an object to be serialized to a string
+     *
      * @return string the serialized object
      */
-    public function toQueryValue($object) {
-      if (is_array($object)) {
-        return implode(',', $object);
-      } else {
-        return $this->toString($object);
-      }
+    public function toQueryValue($object)
+    {
+        if (is_array($object)) {
+            return implode(',', $object);
+        } else {
+            return $this->toString($object);
+        }
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the header. If it's a string, pass through unchanged
      * If it's a datetime object, format it in ISO8601
+     *
      * @param string $value a string which will be part of the header
+     *
      * @return string the header string
      */
-    public function toHeaderValue($value) {
-      return $this->toString($value);
+    public function toHeaderValue($value)
+    {
+        return $this->toString($value);
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the http body (form parameter). If it's a string, pass through unchanged
      * If it's a datetime object, format it in ISO8601
+     *
      * @param string $value the value of the form parameter
+     *
      * @return string the form string
      */
-    public function toFormValue($value) {
-      return $this->toString($value);
+    public function toFormValue($value)
+    {
+        if ($value instanceof SplFileObject) {
+            return $value->getRealPath();
+        } else {
+            return $this->toString($value);
+        }
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the parameter. If it's a string, pass through unchanged
      * If it's a datetime object, format it in ISO8601
+     *
      * @param string $value the value of the parameter
+     *
      * @return string the header string
      */
-    public function toString($value) {
-      if ($value instanceof \DateTime) { // datetime in ISO8601 format
-        return $value->format(\DateTime::ISO8601);
-      } else {
-        return $value;
-      }
+    public function toString($value)
+    {
+        if ($value instanceof \DateTime) { // datetime in ISO8601 format
+            return $value->format(\DateTime::ISO8601);
+        } else {
+            return $value;
+        }
     }
 
     /**
      * Deserialize a JSON string into an object
      *
-     * @param mixed $data object or primitive to be deserialized
-     * @param string $class class name is passed as a string
+     * @param mixed  $data       object or primitive to be deserialized
+     * @param string $class      class name is passed as a string
+     * @param string $httpHeader HTTP headers
+     *
      * @return object an instance of $class
      */
-    public function deserialize($data, $class) {
-      if (null === $data) {
-        $deserialized = null;
-      } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int]
-        $inner = substr($class, 4, -1);
-        $deserialized = array();
-        if(strrpos($inner, ",") !== false) {
-          $subClass_array = explode(',', $inner, 2);
-          $subClass = $subClass_array[1];
-          foreach ($data as $key => $value) {
-            $deserialized[$key] = $this->deserialize($value, $subClass);
-          }
+    public function deserialize($data, $class, $httpHeader=null)
+    {
+        if (null === $data) {
+            $deserialized = null;
+        } elseif (substr($class, 0, 4) === 'map[') { // for associative array e.g. map[string,int]
+            $inner = substr($class, 4, -1);
+            $deserialized = array();
+            if (strrpos($inner, ",") !== false) {
+                $subClass_array = explode(',', $inner, 2);
+                $subClass = $subClass_array[1];
+                foreach ($data as $key => $value) {
+                    $deserialized[$key] = $this->deserialize($value, $subClass);
+                }
+            }
+        } elseif (strcasecmp(substr($class, -2), '[]') == 0) {
+            $subClass = substr($class, 0, -2);
+            $values = array();
+            foreach ($data as $key => $value) {
+                $values[] = $this->deserialize($value, $subClass);
+            }
+            $deserialized = $values;
+        } elseif ($class === 'DateTime') {
+            $deserialized = new \DateTime($data);
+        } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) {
+            settype($data, $class);
+            $deserialized = $data;
+        } elseif ($class === '\SplFileObject') {
+            // determine file name
+            if (preg_match('/Content-Disposition: inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeader, $match)) {
+                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1];
+            } else {
+                $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
+            }
+            $deserialized = new \SplFileObject($filename, "w");
+            $byte_written = $deserialized->fwrite($data);
+            error_log("[INFO] Written $byte_written byte to $filename. Please move the file to a proper folder or delete the temp file after processing.\n", 3, Configuration::getDefaultConfiguration()->getDebugFile());
+      
+        } else {
+            $instance = new $class();
+            foreach ($instance::$swaggerTypes as $property => $type) {
+                $propertySetter = $instance::$setters[$property];
+     
+                if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
+                    continue;
+                }
+     
+                $propertyValue = $data->{$instance::$attributeMap[$property]};
+                if (isset($propertyValue)) {
+                    $instance->$propertySetter($this->deserialize($propertyValue, $type));
+                }
+            }
+            $deserialized = $instance;
         }
-      } elseif (strcasecmp(substr($class, -2),'[]') == 0) {
-        $subClass = substr($class, 0, -2);
-        $values = array();
-        foreach ($data as $key => $value) {
-          $values[] = $this->deserialize($value, $subClass);
-        }
-        $deserialized = $values;
-      } elseif ($class == 'DateTime') {
-        $deserialized = new \DateTime($data);
-      } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) {
-        settype($data, $class);
-        $deserialized = $data;
-      } else {
-        $instance = new $class();
-        foreach ($instance::$swaggerTypes as $property => $type) {
-          $propertySetter = $instance::$setters[$property];
-
-          if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
-            continue;
-          }
-
-          $propertyValue = $data->{$instance::$attributeMap[$property]};
-          if (isset($propertyValue)) {
-            $instance->$propertySetter($this->deserialize($propertyValue, $type));
-          }
-        }
-        $deserialized = $instance;
-      }
-
-      return $deserialized;
+     
+        return $deserialized;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index fb0a6f99e7ca..bb40ae7a98d6 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -1,4 +1,14 @@
 <?php
+/**
+ * {{classname}}
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -16,8 +26,9 @@
  */
 
 /**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
  */
 
 namespace {{apiPackage}};
@@ -27,135 +38,156 @@ use \{{invokerPackage}}\ApiClient;
 use \{{invokerPackage}}\ApiException;
 use \{{invokerPackage}}\ObjectSerializer;
 
-{{#operations}}
-class {{classname}} {
+/**
+ * {{classname}} Class Doc Comment
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+{{#operations}}class {{classname}}
+{
 
-  /** @var \{{invokerPackage}}\ApiClient instance of the ApiClient */
-  private $apiClient;
-
-  /**
-   * @param \{{invokerPackage}}\ApiClient|null $apiClient The api client to use
-   */
-  function __construct($apiClient = null) {
-    if ($apiClient == null) {
-      $apiClient = new ApiClient();
-      $apiClient->getConfig()->setHost('{{basePath}}');
-    }
-
-    $this->apiClient = $apiClient;
-  }
-
-  /**
-   * @return \{{invokerPackage}}\ApiClient get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * @param \{{invokerPackage}}\ApiClient $apiClient set the API client
-   * @return {{classname}}
-   */
-  public function setApiClient(ApiClient $apiClient) {
-    $this->apiClient = $apiClient;
-    return $this;
-  }
-
-  {{#operation}}
-  /**
-   * {{{nickname}}}
-   *
-   * {{{summary}}}
-   *
-{{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
-{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
-   * @throws \{{invokerPackage}}\ApiException on non-2xx response
-   */
-   public function {{nickname}}({{#allParams}}${{paramName}}{{^required}}=null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-      {{#allParams}}{{#required}}
-      // verify the required parameter '{{paramName}}' is set
-      if (${{paramName}} === null) {
-        throw new \InvalidArgumentException('Missing the required parameter ${{paramName}} when calling {{nickname}}');
-      }
-      {{/required}}{{/allParams}}
-
-      // parse inputs
-      $resourcePath = "{{path}}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "{{httpMethod}}";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}));
-
-      {{#queryParams}}// query params
-      if(${{paramName}} !== null) {
-        $queryParams['{{baseName}}'] = $this->apiClient->getSerializer()->toQueryValue(${{paramName}});
-      }{{/queryParams}}
-      {{#headerParams}}// header params
-      if(${{paramName}} !== null) {
-        $headerParams['{{baseName}}'] = $this->apiClient->getSerializer()->toHeaderValue(${{paramName}});
-      }{{/headerParams}}
-      {{#pathParams}}// path params
-      if(${{paramName}} !== null) {
-        $resourcePath = str_replace("{" . "{{baseName}}" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue(${{paramName}}),
-                                    $resourcePath);
-      }{{/pathParams}}
-      {{#formParams}}// form params
-      if (${{paramName}} !== null) {
-        $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->getSerializer()->toFormValue(${{paramName}});
-      }{{/formParams}}
-      {{#bodyParams}}// body params
-      $_tempBody = null;
-      if (isset(${{paramName}})) {
-        $_tempBody = ${{paramName}};
-      }{{/bodyParams}}
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      {{#authMethods}}{{#isApiKey}}
-      $apiKey = $this->apiClient->getApiKeyWithPrefix('{{keyParamName}}');
-      if (isset($apiKey)) {
-        {{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $apiKey;{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $apiKey;{{/isKeyInQuery}}
-      }{{/isApiKey}}
-      {{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode($this->apiClient->getConfig()->getUsername().":".$this->apiClient->getConfig()->getPassword());{{/isBasic}}
-      {{#isOAuth}}//TODO support oauth{{/isOAuth}}
-      {{/authMethods}}
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { {{#responses}}{{#dataType}}
-          case {{code}}:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '{{dataType}}');
-            $e->setResponseObject($data);
-            break;{{/dataType}}{{/responses}}
+    /**
+     * API Client
+     * @var \{{invokerPackage}}\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \{{invokerPackage}}\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('{{basePath}}');
         }
-
-        throw $e;
-      }
-      {{#returnType}}
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'{{returnType}}');
-      return $responseObject;
-      {{/returnType}}
-  }
-  {{/operation}}
+  
+        $this->apiClient = $apiClient;
+    }
+  
+    /**
+     * Get API client
+     * @return \{{invokerPackage}}\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \{{invokerPackage}}\ApiClient $apiClient set the API client
+     * @return {{classname}}
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    {{#operation}}
+    /**
+     * {{{nickname}}}
+     *
+     * {{{summary}}}
+     *
+  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
+  {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+     * @throws \{{invokerPackage}}\ApiException on non-2xx response
+     */
+    public function {{nickname}}({{#allParams}}${{paramName}}{{^required}}=null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+    {
+        {{#allParams}}{{#required}}
+        // verify the required parameter '{{paramName}}' is set
+        if (${{paramName}} === null) {
+            throw new \InvalidArgumentException('Missing the required parameter ${{paramName}} when calling {{nickname}}');
+        }{{/required}}{{/allParams}}
+  
+        // parse inputs
+        $resourcePath = "{{path}}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "{{httpMethod}}";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}));
+  
+        {{#queryParams}}// query params
+        if (${{paramName}} !== null) {
+            $queryParams['{{baseName}}'] = $this->apiClient->getSerializer()->toQueryValue(${{paramName}});
+        }{{/queryParams}}
+        {{#headerParams}}// header params
+        if (${{paramName}} !== null) {
+            $headerParams['{{baseName}}'] = $this->apiClient->getSerializer()->toHeaderValue(${{paramName}});
+        }{{/headerParams}}
+        {{#pathParams}}// path params
+        if (${{paramName}} !== null) {
+            $resourcePath = str_replace(
+                "{" . "{{baseName}}" . "}",
+                $this->apiClient->getSerializer()->toPathValue(${{paramName}}),
+                $resourcePath
+            );
+        }{{/pathParams}}
+        {{#formParams}}// form params
+        if (${{paramName}} !== null) {
+            $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->getSerializer()->toFormValue(${{paramName}});
+        }{{/formParams}}
+        {{#bodyParams}}// body params
+        $_tempBody = null;
+        if (isset(${{paramName}})) {
+            $_tempBody = ${{paramName}};
+        }{{/bodyParams}}
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        {{#authMethods}}{{#isApiKey}}
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('{{keyParamName}}');
+        if (isset($apiKey)) {
+            {{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $apiKey;{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $apiKey;{{/isKeyInQuery}}
+        }{{/isApiKey}}
+        {{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode($this->apiClient->getConfig()->getUsername().":".$this->apiClient->getConfig()->getPassword());{{/isBasic}}
+        {{#isOAuth}}//TODO support oauth{{/isOAuth}}
+        {{/authMethods}}
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams{{#returnType}}, '{{returnType}}'{{/returnType}}
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { {{#responses}}{{#dataType}}
+            case {{code}}:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '{{dataType}}', $httpHeader);
+                $e->setResponseObject($data);
+                break;{{/dataType}}{{/responses}}
+            }
+  
+            throw $e;
+        }
+        {{#returnType}}
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '{{returnType}}');
+        {{/returnType}}
+    }
+    {{/operation}}
 }
 {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index d36267617c4d..52425899ce74 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -1,33 +1,33 @@
 {
-  "name": "{{groupId}}/{{artifactId}}",{{#artifactVersion}}
-  "version": "{{artifactVersion}}",{{/artifactVersion}}
-  "description": "{{description}}",
-  "keywords": [
-    "swagger",
-    "php",
-    "sdk",
-    "api"
-  ],
-  "homepage": "http://swagger.io",
-  "license": "Apache v2",
-  "authors": [
-    {
-      "name": "Swagger and contributors",
-      "homepage": "https://github.com/swagger-api/swagger-codegen"
+    "name": "{{groupId}}/{{artifactId}}",{{#artifactVersion}}
+    "version": "{{artifactVersion}}",{{/artifactVersion}}
+    "description": "{{description}}",
+    "keywords": [
+        "swagger",
+        "php",
+        "sdk",
+        "api"
+    ],
+    "homepage": "http://swagger.io",
+    "license": "Apache v2",
+    "authors": [
+        {
+            "name": "Swagger and contributors",
+            "homepage": "https://github.com/swagger-api/swagger-codegen"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "ext-curl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0",
+        "satooshi/php-coveralls": "~0.6.1",
+        "squizlabs/php_codesniffer": "~2.0"
+    },
+    "autoload": {
+        "psr-4": { "{{escapedInvokerPackage}}\\" : "{{srcBasePath}}/" }
     }
-  ],
-  "require": {
-    "php": ">=5.3.3",
-    "ext-curl": "*",
-    "ext-json": "*",
-    "ext-mbstring": "*"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "satooshi/php-coveralls": "~0.6.1",
-    "squizlabs/php_codesniffer": "~2.0"
-  },
-  "autoload": {
-    "psr-4": { "{{escapedInvokerPackage}}\\" : "{{srcBasePath}}/" }
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index b85ad289418c..73d4000d950f 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Configuration
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -15,252 +26,439 @@
  *  limitations under the License.
  */
 
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
+
 namespace {{invokerPackage}};
 
-class Configuration {
+/**
+ * Configuration Class Doc Comment
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class Configuration
+{
 
-  private static $defaultConfiguration = null;
+    private static $_defaultConfiguration = null;
+  
+    /** 
+     * Associate array to store API key(s)
+     *
+     * @var string[]
+     */
+    protected $apiKeys = array();
+  
+    /**
+     * Associate array to store API prefix (e.g. Bearer)
+     *
+     * @var string[]
+     */
+    protected $apiKeyPrefixes = array();
+  
+    /** 
+     * Username for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $username = '';
+  
+    /**
+     * Password for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $password = '';
+  
+    /**
+     * The default instance of ApiClient
+     *
+     * @var \{{invokerPackage}}\ApiClient
+     */
+    protected $defaultHeaders = array();
+  
+    /**
+     * The host
+     *
+     * @var string
+     */
+    protected $host = 'http://localhost';
+  
+    /**
+     * Timeout (second) of the HTTP request, by default set to 0, no timeout
+     *
+     * @var string 
+     */
+    protected $curlTimeout = 0;
+  
+    /**
+     * User agent of the HTTP request, set to "PHP-Swagger" by default
+     *
+     * @var string
+     */
+    protected $userAgent = "PHP-Swagger";
+  
+    /**
+     * Debug switch (default set to false)
+     *
+     * @var bool
+     */
+    protected $debug = false;
+  
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $debugFile = 'php://output';
 
-  /** @var string[] Associate array to store API key(s) */
-  protected $apiKeys = array();
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $tempFolderPath;
 
-  /** string[] Associate array to store API prefix (e.g. Bearer) */
-  protected $apiKeyPrefixes = array();
-
-  /** @var string Username for HTTP basic authentication */
-  protected $username = '';
-
-  /** @var string Password for HTTP basic authentication */
-  protected $password = '';
-
-  /** @var \{{invokerPackage}}\ApiClient The default instance of ApiClient */
-  protected $defaultHeaders = array();
-
-  /** @var string The host */
-  protected $host = 'http://localhost';
-
-  /** @var string timeout (second) of the HTTP request, by default set to 0, no timeout */
-  protected $curlTimeout = 0;
-
-  /** @var string user agent of the HTTP request, set to "PHP-Swagger" by default */
-  protected $userAgent = "PHP-Swagger";
-
-  /** @var bool Debug switch (default set to false) */
-  protected $debug = false;
-
-  /** @var string Debug file location (log to STDOUT by default) */
-  protected $debugFile = 'php://output';
-
-  /**
-   * @param string $key
-   * @param string $value
-   * @return Configuration
-   */
-  public function setApiKey($key, $value) {
-    $this->apiKeys[$key] = $value;
-    return $this;
-  }
-
-  /**
-   * @param $key
-   * @return string
-   */
-  public function getApiKey($key) {
-    return isset($this->apiKeys[$key]) ? $this->apiKeys[$key] : null;
-  }
-
-  /**
-   * @param string $key
-   * @param string $value
-   * @return Configuration
-   */
-  public function setApiKeyPrefix($key, $value) {
-    $this->apiKeyPrefixes[$key] = $value;
-    return $this;
-  }
-
-  /**
-   * @param $key
-   * @return string
-   */
-  public function getApiKeyPrefix($key) {
-    return isset($this->apiKeyPrefixes[$key]) ? $this->apiKeyPrefixes[$key] : null;
-  }
-
-  /**
-   * @param string $username
-   * @return Configuration
-   */
-  public function setUsername($username) {
-    $this->username = $username;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getUsername() {
-    return $this->username;
-  }
-
-  /**
-   * @param string $password
-   * @return Configuration
-   */
-  public function setPassword($password) {
-    $this->password = $password;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getPassword() {
-    return $this->password;
-  }
-
-  /**
-   * add default header
-   *
-   * @param string $headerName header name (e.g. Token)
-   * @param string $headerValue header value (e.g. 1z8wp3)
-   * @return ApiClient
-   */
-  public function addDefaultHeader($headerName, $headerValue) {
-    if (!is_string($headerName)) {
-      throw new \InvalidArgumentException('Header name must be a string.');
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->tempFolderPath = sys_get_temp_dir();
     }
-
-    $this->defaultHeaders[$headerName] =  $headerValue;
-    return $this;
-  }
-
-  /**
-   * get the default header
-   *
-   * @return array default header
-   */
-  public function getDefaultHeaders() {
-    return $this->defaultHeaders;
-  }
-
-  /**
-   * delete a default header
-   * @param string $headerName the header to delete
-   * @return Configuration
-   */
-  public function deleteDefaultHeader($headerName) {
-    unset($this->defaultHeaders[$headerName]);
-  }
-
-  /**
-   * @param string $host
-   * @return Configuration
-   */
-  public function setHost($host) {
-    $this->host = $host;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getHost() {
-    return $this->host;
-  }
-
-  /**
-   * set the user agent of the api client
-   *
-   * @param string $userAgent the user agent of the api client
-   * @return ApiClient
-   */
-  public function setUserAgent($userAgent) {
-    if (!is_string($userAgent)) {
-      throw new \InvalidArgumentException('User-agent must be a string.');
+  
+    /**
+     * Sets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $key              API key or token
+     *
+     * @return Configuration
+     */
+    public function setApiKey($apiKeyIdentifier, $key)
+    {
+        $this->apiKeys[$apiKeyIdentifier] = $key;
+        return $this;
     }
-
-    $this->userAgent = $userAgent;
-    return $this;
-  }
-
-  /**
-   * get the user agent of the api client
-   *
-   * @return string user agent
-   */
-  public function getUserAgent() {
-    return $this->userAgent;
-  }
-
-  /**
-   * set the HTTP timeout value
-   *
-   * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
-   * @return ApiClient
-   */
-  public function setCurlTimeout($seconds) {
-    if (!is_numeric($seconds) || $seconds < 0) {
-      throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
+  
+    /**
+     * Gets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string API key or token
+     */
+    public function getApiKey($apiKeyIdentifier)
+    {
+        return isset($this->apiKeys[$apiKeyIdentifier]) ? $this->apiKeys[$apiKeyIdentifier] : null;
     }
-
-    $this->curlTimeout = $seconds;
-    return $this;
-  }
-
-  /**
-   * get the HTTP timeout value
-   *
-   * @return string HTTP timeout value
-   */
-  public function getCurlTimeout() {
-    return $this->curlTimeout;
-  }
-
-  /**
-   * @param bool $debug
-   * @return Configuration
-   */
-  public function setDebug($debug) {
-    $this->debug = $debug;
-    return $this;
-  }
-
-  /**
-   * @return bool
-   */
-  public function getDebug() {
-    return $this->debug;
-  }
-
-  /**
-   * @param string $debugFile
-   * @return Configuration
-   */
-  public function setDebugFile($debugFile) {
-    $this->debugFile = $debugFile;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getDebugFile() {
-    return $this->debugFile;
-  }
-
-  /**
-   * @return Configuration
-   */
-  public static function getDefaultConfiguration() {
-    if (self::$defaultConfiguration == null) {
-      return new Configuration();
+  
+    /**
+     * Sets the prefix for API key (e.g. Bearer)
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $prefix           API key prefix, e.g. Bearer
+     *
+     * @return Configuration
+     */
+    public function setApiKeyPrefix($apiKeyIdentifier, $prefix)
+    {
+        $this->apiKeyPrefixes[$apiKeyIdentifier] = $prefix;
+        return $this;
     }
-
-    return self::$defaultConfiguration;
-  }
-
-  public static function setDefaultConfiguration(Configuration $config) {
-    self::$defaultConfiguration = $config;
-  }
+  
+    /**
+     * Gets API key prefix
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string
+     */
+    public function getApiKeyPrefix($apiKeyIdentifier)
+    {
+        return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null;
+    }
+  
+    /**
+     * Sets the username for HTTP basic authentication
+     *
+     * @param string $username Username for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setUsername($username)
+    {
+        $this->username = $username;
+        return $this;
+    }
+  
+    /**
+     * Gets the username for HTTP basic authentication
+     *
+     * @return string Username for HTTP basic authentication
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+  
+    /**
+     * Sets the password for HTTP basic authentication
+     *
+     * @param string $password Password for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setPassword($password)
+    {
+        $this->password = $password;
+        return $this;
+    }
+  
+    /**
+     * Gets the password for HTTP basic authentication
+     *
+     * @return string Password for HTTP basic authentication
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+  
+    /**
+     * Adds a default header
+     *
+     * @param string $headerName  header name (e.g. Token)
+     * @param string $headerValue header value (e.g. 1z8wp3)
+     *
+     * @return ApiClient
+     */
+    public function addDefaultHeader($headerName, $headerValue)
+    {
+        if (!is_string($headerName)) {
+            throw new \InvalidArgumentException('Header name must be a string.');
+        }
+  
+        $this->defaultHeaders[$headerName] =  $headerValue;
+        return $this;
+    }
+  
+    /**
+     * Gets the default header
+     *
+     * @return array An array of default header(s)
+     */
+    public function getDefaultHeaders()
+    {
+        return $this->defaultHeaders;
+    }
+  
+    /**
+     * Deletes a default header
+     *
+     * @param string $headerName the header to delete
+     *
+     * @return Configuration
+     */
+    public function deleteDefaultHeader($headerName)
+    {
+        unset($this->defaultHeaders[$headerName]);
+    }
+  
+    /**
+     * Sets the host
+     *
+     * @param string $host Host
+     *
+     * @return Configuration
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+        return $this;
+    }
+  
+    /**
+     * Gets the host
+     *
+     * @return string Host
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+  
+    /**
+     * Sets the user agent of the api client
+     *
+     * @param string $userAgent the user agent of the api client
+     *
+     * @return ApiClient
+     */
+    public function setUserAgent($userAgent)
+    {
+        if (!is_string($userAgent)) {
+            throw new \InvalidArgumentException('User-agent must be a string.');
+        }
+  
+        $this->userAgent = $userAgent;
+        return $this;
+    }
+  
+    /**
+     * Gets the user agent of the api client
+     *
+     * @return string user agent
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
+  
+    /**
+     * Sets the HTTP timeout value
+     *
+     * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
+     *
+     * @return ApiClient
+     */
+    public function setCurlTimeout($seconds)
+    {
+        if (!is_numeric($seconds) || $seconds < 0) {
+            throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
+        }
+  
+        $this->curlTimeout = $seconds;
+        return $this;
+    }
+  
+    /**
+     * Gets the HTTP timeout value
+     *
+     * @return string HTTP timeout value
+     */
+    public function getCurlTimeout()
+    {
+        return $this->curlTimeout;
+    }
+  
+    /**
+     * Sets debug flag
+     * 
+     * @param bool $debug Debug flag
+     *
+     * @return Configuration
+     */
+    public function setDebug($debug)
+    {
+        $this->debug = $debug;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug flag
+     *
+     * @return bool
+     */
+    public function getDebug()
+    {
+        return $this->debug;
+    }
+  
+    /**
+     * Sets the debug file
+     *
+     * @param string $debugFile Debug file
+     *
+     * @return Configuration
+     */
+    public function setDebugFile($debugFile)
+    {
+        $this->debugFile = $debugFile;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug file
+     *
+     * @return string
+     */
+    public function getDebugFile()
+    {
+        return $this->debugFile;
+    }
+ 
+    /**
+     * Sets the temp folder path
+     *
+     * @param string $tempFolderPath Temp folder path
+     *
+     * @return Configuration
+     */
+    public function setTempFolderPath($tempFolderPath)
+    {
+        $this->tempFolderPath = $tempFolderPath;
+        return $this;
+    }
+ 
+    /**
+     * Gets the temp folder path
+     *
+     * @return string Temp folder path
+     */
+    public function getTempFolderPath()
+    {
+        return $this->tempFolderPath;
+    }
+ 
+    /**
+     * Gets the default configuration instance
+     *
+     * @return Configuration
+     */
+    public static function getDefaultConfiguration()
+    {
+        if (self::$_defaultConfiguration == null) {
+            self::$_defaultConfiguration = new Configuration();
+        }
+  
+        return self::$_defaultConfiguration;
+    }
+  
+    /**
+     * Sets the detault configuration instance
+     *
+     * @param Configuration $config An instance of the Configuration Object
+     *
+     * @return void
+     */
+    public static function setDefaultConfiguration(Configuration $config)
+    {
+        self::$_defaultConfiguration = $config;
+    }
+  
+    /**
+     * Gets the essential information for debugging
+     *
+     * @return string The report for debugging
+     */
+    public static function toDebugReport()
+    {
+        $report  = "PHP SDK ({{invokerPackage}}) Debug Report:\n";
+        $report .= "    OS: ".php_uname()."\n";
+        $report .= "    PHP Version: ".phpversion()."\n";
+        $report .= "    Swagger Spec Version: {{version}}\n";
+        $report .= "    SDK Package Version: {{artifactVersion}}\n";
+        $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n";
+  
+        return $report;
+    }
+  
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index 35795bf8c0b7..861673982f22 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -1,4 +1,17 @@
 <?php
+{{#models}}
+{{#model}}
+/**
+ * {{classname}}
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,97 +27,160 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
-{{#models}}
-{{#model}}
 /**
- * {{description}}
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
  */
 
 namespace {{modelPackage}};
 
 use \ArrayAccess;
+/**
+ * {{classname}} Class Doc Comment
+ *
+ * @category    Class
+ * @description {{description}}
+ * @package     {{invokerPackage}}
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class {{classname}} implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        {{#vars}}'{{name}}' => '{{setter}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        {{#vars}}'{{name}}' => '{{getter}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    {{#vars}}
+    /**
+      * ${{name}} {{#description}}{{{description}}}{{/description}}
+      * @var {{datatype}}
+      */
+    protected ${{name}};
+    {{/vars}}
 
-class {{classname}} implements ArrayAccess {
-  /** @var string[] Array of property to type mappings. Used for (de)serialization */
-  static $swaggerTypes = array(
-      {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
-      {{/hasMore}}{{/vars}}
-  );
-
-  /** @var string[] Array of attributes where the key is the local name, and the value is the original name */
-  static $attributeMap = array(
-      {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
-      {{/hasMore}}{{/vars}}
-  );
-
-  /** @var string[] Array of attributes to setter functions (for deserialization of responses) */
-  static $setters = array(
-    {{#vars}}'{{name}}' => '{{setter}}'{{#hasMore}},
-    {{/hasMore}}{{/vars}}
-  );
-
-  /** @var string[] Array of attributes to getter functions (for serialization of requests) */
-  static $getters = array(
-    {{#vars}}'{{name}}' => '{{getter}}'{{#hasMore}},
-    {{/hasMore}}{{/vars}}
-  );
-
-  {{#vars}}
-  /** @var {{datatype}} ${{name}} {{#description}}{{{description}}} {{/description}}*/
-  protected ${{name}};
-  {{/vars}}
-  public function __construct(array $data = null) {
-    if ($data != null) {
-      {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
-      {{/hasMore}}{{/vars}}
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
+            {{/hasMore}}{{/vars}}
+        }
     }
-  }
-  {{#vars}}
-  /**
-   * get {{name}}
-   * @return {{datatype}}
-   */
-  public function {{getter}}() {
-    return $this->{{name}};
-  }
-
-  /**
-   * set {{name}}
-   * @param {{datatype}} ${{name}}
-   * @return $this
-   */
-  public function {{setter}}(${{name}}) {
-    $this->{{name}} = ${{name}};
-    return $this;
-  }
-  {{/vars}}
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-
-  public function __toString() {
-    if (defined('JSON_PRETTY_PRINT')) {
-      return json_encode($this, JSON_PRETTY_PRINT);
-    } else {
-      return json_encode($this);
+    {{#vars}}
+    /**
+     * Gets {{name}}
+     * @return {{datatype}}
+     */
+    public function {{getter}}()
+    {
+        return $this->{{name}};
+    }
+  
+    /**
+     * Sets {{name}}
+     * @param {{datatype}} ${{name}} {{#description}}{{{description}}}{{/description}}
+     * @return $this
+     */
+    public function {{setter}}(${{name}})
+    {
+        {{#isEnum}}$allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
+        if (!in_array(${{{name}}}, $allowed_values)) {
+            throw new \InvalidArgumentException("Invalid value for '{{name}}', must be one of {{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}");
+        }{{/isEnum}}
+        $this->{{name}} = ${{name}};
+        return $this;
+    }
+    {{/vars}}
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
     }
-  }
 }
 {{/model}}
 {{/models}}
diff --git a/samples/client/petstore/php/SwaggerClient-php/composer.json b/samples/client/petstore/php/SwaggerClient-php/composer.json
index db0fe7cd5b93..3b432d83b92b 100644
--- a/samples/client/petstore/php/SwaggerClient-php/composer.json
+++ b/samples/client/petstore/php/SwaggerClient-php/composer.json
@@ -1,32 +1,33 @@
 {
-  "name": "swagger/swagger-client",
-  "description": "",
-  "keywords": [
-    "swagger",
-    "php",
-    "sdk",
-    "api"
-  ],
-  "homepage": "http://swagger.io",
-  "license": "Apache v2",
-  "authors": [
-    {
-      "name": "Swagger and contributors",
-      "homepage": "https://github.com/swagger-api/swagger-codegen"
+    "name": "swagger/swagger-client",
+    "version": "1.0.0",
+    "description": "",
+    "keywords": [
+        "swagger",
+        "php",
+        "sdk",
+        "api"
+    ],
+    "homepage": "http://swagger.io",
+    "license": "Apache v2",
+    "authors": [
+        {
+            "name": "Swagger and contributors",
+            "homepage": "https://github.com/swagger-api/swagger-codegen"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "ext-curl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0",
+        "satooshi/php-coveralls": "~0.6.1",
+        "squizlabs/php_codesniffer": "~2.0"
+    },
+    "autoload": {
+        "psr-4": { "Swagger\\Client\\" : "lib/" }
     }
-  ],
-  "require": {
-    "php": ">=5.3.3",
-    "ext-curl": "*",
-    "ext-json": "*",
-    "ext-mbstring": "*"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "satooshi/php-coveralls": "~0.6.1",
-    "squizlabs/php_codesniffer": "~2.0"
-  },
-  "autoload": {
-    "psr-4": { "Swagger\\Client\\" : "lib/" }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
index b6766d8d13f2..8c0ce100d507 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * PetApi
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -16,8 +26,9 @@
  */
 
 /**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Api;
@@ -27,608 +38,652 @@ use \Swagger\Client\ApiClient;
 use \Swagger\Client\ApiException;
 use \Swagger\Client\ObjectSerializer;
 
-class PetApi {
+/**
+ * PetApi Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class PetApi
+{
 
-  /** @var \Swagger\Client\ApiClient instance of the ApiClient */
-  private $apiClient;
-
-  /**
-   * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
-   */
-  function __construct($apiClient = null) {
-    if ($apiClient == null) {
-      $apiClient = new ApiClient();
-      $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+    /**
+     * API Client
+     * @var \Swagger\Client\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+        }
+  
+        $this->apiClient = $apiClient;
     }
-
-    $this->apiClient = $apiClient;
-  }
-
-  /**
-   * @return \Swagger\Client\ApiClient get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * @param \Swagger\Client\ApiClient $apiClient set the API client
-   * @return PetApi
-   */
-  public function setApiClient(ApiClient $apiClient) {
-    $this->apiClient = $apiClient;
-    return $this;
-  }
-
   
-  /**
-   * updatePet
-   *
-   * Update an existing pet
-   *
-   * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function updatePet($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "PUT";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      
-      //TODO support oauth
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+    /**
+     * Get API client
+     * @return \Swagger\Client\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \Swagger\Client\ApiClient $apiClient set the API client
+     * @return PetApi
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    
+    /**
+     * updatePet
+     *
+     * Update an existing pet
+     *
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updatePet($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/pet";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "PUT";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
         }
-
-        throw $e;
-      }
-      
-  }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
   
-  /**
-   * addPet
-   *
-   * Add a new pet to the store
-   *
-   * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function addPet($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      
-      //TODO support oauth
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+        
+        
+        
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
         }
-
-        throw $e;
-      }
-      
-  }
   
-  /**
-   * findPetsByStatus
-   *
-   * Finds Pets by status
-   *
-   * @param string[] $status Status values that need to be considered for filter (required)
-   * @return \Swagger\Client\Model\Pet[]
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function findPetsByStatus($status) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet/findByStatus";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      // query params
-      if($status !== null) {
-        $queryParams['status'] = $this->apiClient->getSerializer()->toQueryValue($status);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      
-      //TODO support oauth
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]');
-            $e->setResponseObject($data);
-            break;
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Pet[]');
-      return $responseObject;
-      
-  }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
   
-  /**
-   * findPetsByTags
-   *
-   * Finds Pets by tags
-   *
-   * @param string[] $tags Tags to filter by (required)
-   * @return \Swagger\Client\Model\Pet[]
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function findPetsByTags($tags) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet/findByTags";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      // query params
-      if($tags !== null) {
-        $queryParams['tags'] = $this->apiClient->getSerializer()->toQueryValue($tags);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      
-      //TODO support oauth
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]');
-            $e->setResponseObject($data);
-            break;
+            throw $e;
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Pet[]');
-      return $responseObject;
-      
-  }
+        
+    }
+    
+    /**
+     * addPet
+     *
+     * Add a new pet to the store
+     *
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function addPet($body=null)
+    {
+        
   
-  /**
-   * getPetById
-   *
-   * Find pet by ID
-   *
-   * @param int $pet_id ID of pet that needs to be fetched (required)
-   * @return \Swagger\Client\Model\Pet
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function getPetById($pet_id) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetById');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
-                                    $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      //TODO support oauth
-      
-
-      $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
-      if (isset($apiKey)) {
-        $headerParams['api_key'] = $apiKey;
-      }
-      
-      
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet');
-            $e->setResponseObject($data);
-            break;
+        // parse inputs
+        $resourcePath = "/pet";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Pet');
-      return $responseObject;
-      
-  }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
   
-  /**
-   * updatePetWithForm
-   *
-   * Updates a pet in the store with form data
-   *
-   * @param string $pet_id ID of pet that needs to be updated (required)
-   * @param string $name Updated name of the pet (required)
-   * @param string $status Updated status of the pet (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function updatePetWithForm($pet_id, $name, $status) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling updatePetWithForm');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/x-www-form-urlencoded'));
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
-                                    $resourcePath);
-      }
-      // form params
-      if ($name !== null) {
-        $formParams['name'] = $this->apiClient->getSerializer()->toFormValue($name);
-      }// form params
-      if ($status !== null) {
-        $formParams['status'] = $this->apiClient->getSerializer()->toFormValue($status);
-      }
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      
-      //TODO support oauth
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+        
+        
+        
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
         }
-
-        throw $e;
-      }
-      
-  }
   
-  /**
-   * deletePet
-   *
-   * Deletes a pet
-   *
-   * @param string $api_key  (required)
-   * @param int $pet_id Pet id to delete (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function deletePet($api_key, $pet_id) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling deletePet');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      // header params
-      if($api_key !== null) {
-        $headerParams['api_key'] = $this->apiClient->getSerializer()->toHeaderValue($api_key);
-      }
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
-                                    $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      
-      //TODO support oauth
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
         }
-
-        throw $e;
-      }
-      
-  }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
   
-  /**
-   * uploadFile
-   *
-   * uploads an image
-   *
-   * @param int $pet_id ID of pet to update (required)
-   * @param string $additional_metadata Additional data to pass to server (required)
-   * @param string $file file to upload (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function uploadFile($pet_id, $additional_metadata, $file) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling uploadFile');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}/uploadImage";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('multipart/form-data'));
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
-                                    $resourcePath);
-      }
-      // form params
-      if ($additional_metadata !== null) {
-        $formParams['additionalMetadata'] = $this->apiClient->getSerializer()->toFormValue($additional_metadata);
-      }// form params
-      if ($file !== null) {
-        $formParams['file'] = '@' . $this->apiClient->getSerializer()->toFormValue($file);
-      }
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      
-      //TODO support oauth
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+            throw $e;
         }
-
-        throw $e;
-      }
-      
-  }
+        
+    }
+    
+    /**
+     * findPetsByStatus
+     *
+     * Finds Pets by status
+     *
+     * @param string[] $status Status values that need to be considered for filter (optional)
+     * @return \Swagger\Client\Model\Pet[]
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findPetsByStatus($status=null)
+    {
+        
   
+        // parse inputs
+        $resourcePath = "/pet/findByStatus";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        // query params
+        if ($status !== null) {
+            $queryParams['status'] = $this->apiClient->getSerializer()->toQueryValue($status);
+        }
+        
+        
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet[]'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet[]');
+        
+    }
+    
+    /**
+     * findPetsByTags
+     *
+     * Finds Pets by tags
+     *
+     * @param string[] $tags Tags to filter by (optional)
+     * @return \Swagger\Client\Model\Pet[]
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findPetsByTags($tags=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/pet/findByTags";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        // query params
+        if ($tags !== null) {
+            $queryParams['tags'] = $this->apiClient->getSerializer()->toQueryValue($tags);
+        }
+        
+        
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet[]'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet[]');
+        
+    }
+    
+    /**
+     * getPetById
+     *
+     * Find pet by ID
+     *
+     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @return \Swagger\Client\Model\Pet
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getPetById($pet_id)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetById');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (isset($apiKey)) {
+            $headerParams['api_key'] = $apiKey;
+        }
+        
+        
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet');
+        
+    }
+    
+    /**
+     * updatePetWithForm
+     *
+     * Updates a pet in the store with form data
+     *
+     * @param string $pet_id ID of pet that needs to be updated (required)
+     * @param string $name Updated name of the pet (optional)
+     * @param string $status Updated status of the pet (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updatePetWithForm($pet_id, $name=null, $status=null)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling updatePetWithForm');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/x-www-form-urlencoded'));
+  
+        
+        
+        // path params
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        // form params
+        if ($name !== null) {
+            $formParams['name'] = $this->apiClient->getSerializer()->toFormValue($name);
+        }// form params
+        if ($status !== null) {
+            $formParams['status'] = $this->apiClient->getSerializer()->toFormValue($status);
+        }
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * deletePet
+     *
+     * Deletes a pet
+     *
+     * @param string $api_key  (optional)
+     * @param int $pet_id Pet id to delete (required)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function deletePet($api_key=null, $pet_id)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling deletePet');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "DELETE";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        // header params
+        if ($api_key !== null) {
+            $headerParams['api_key'] = $this->apiClient->getSerializer()->toHeaderValue($api_key);
+        }
+        // path params
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * uploadFile
+     *
+     * uploads an image
+     *
+     * @param int $pet_id ID of pet to update (required)
+     * @param string $additional_metadata Additional data to pass to server (optional)
+     * @param \SplFileObject $file file to upload (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function uploadFile($pet_id, $additional_metadata=null, $file=null)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling uploadFile');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}/uploadImage";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('multipart/form-data'));
+  
+        
+        
+        // path params
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        // form params
+        if ($additional_metadata !== null) {
+            $formParams['additionalMetadata'] = $this->apiClient->getSerializer()->toFormValue($additional_metadata);
+        }// form params
+        if ($file !== null) {
+            $formParams['file'] = '@' . $this->apiClient->getSerializer()->toFormValue($file);
+        }
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
index 237ba3f1acf8..ede8a3c14dad 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * StoreApi
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -16,8 +26,9 @@
  */
 
 /**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Api;
@@ -27,317 +38,347 @@ use \Swagger\Client\ApiClient;
 use \Swagger\Client\ApiException;
 use \Swagger\Client\ObjectSerializer;
 
-class StoreApi {
+/**
+ * StoreApi Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class StoreApi
+{
 
-  /** @var \Swagger\Client\ApiClient instance of the ApiClient */
-  private $apiClient;
-
-  /**
-   * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
-   */
-  function __construct($apiClient = null) {
-    if ($apiClient == null) {
-      $apiClient = new ApiClient();
-      $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+    /**
+     * API Client
+     * @var \Swagger\Client\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+        }
+  
+        $this->apiClient = $apiClient;
     }
-
-    $this->apiClient = $apiClient;
-  }
-
-  /**
-   * @return \Swagger\Client\ApiClient get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * @param \Swagger\Client\ApiClient $apiClient set the API client
-   * @return StoreApi
-   */
-  public function setApiClient(ApiClient $apiClient) {
-    $this->apiClient = $apiClient;
-    return $this;
-  }
-
   
-  /**
-   * getInventory
-   *
-   * Returns pet inventories by status
-   *
-   * @return map[string,int]
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function getInventory() {
-      
-
-      // parse inputs
-      $resourcePath = "/store/inventory";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
-      if (isset($apiKey)) {
-        $headerParams['api_key'] = $apiKey;
-      }
-      
-      
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'map[string,int]');
-            $e->setResponseObject($data);
-            break;
+    /**
+     * Get API client
+     * @return \Swagger\Client\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \Swagger\Client\ApiClient $apiClient set the API client
+     * @return StoreApi
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    
+    /**
+     * getInventory
+     *
+     * Returns pet inventories by status
+     *
+     * @return map[string,int]
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getInventory()
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/store/inventory";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'map[string,int]');
-      return $responseObject;
-      
-  }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
   
-  /**
-   * placeOrder
-   *
-   * Place an order for a pet
-   *
-   * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (required)
-   * @return \Swagger\Client\Model\Order
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function placeOrder($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/store/order";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order');
-            $e->setResponseObject($data);
-            break;
+        
+        
+        
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Order');
-      return $responseObject;
-      
-  }
-  
-  /**
-   * getOrderById
-   *
-   * Find purchase order by ID
-   *
-   * @param string $order_id ID of pet that needs to be fetched (required)
-   * @return \Swagger\Client\Model\Order
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function getOrderById($order_id) {
-      
-      // verify the required parameter 'order_id' is set
-      if ($order_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $order_id when calling getOrderById');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/store/order/{orderId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($order_id !== null) {
-        $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($order_id),
-                                    $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order');
-            $e->setResponseObject($data);
-            break;
+        
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (isset($apiKey)) {
+            $headerParams['api_key'] = $apiKey;
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Order');
-      return $responseObject;
-      
-  }
+        
+        
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, 'map[string,int]'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'map[string,int]', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
   
-  /**
-   * deleteOrder
-   *
-   * Delete purchase order by ID
-   *
-   * @param string $order_id ID of the order that needs to be deleted (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function deleteOrder($order_id) {
-      
-      // verify the required parameter 'order_id' is set
-      if ($order_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $order_id when calling deleteOrder');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/store/order/{orderId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($order_id !== null) {
-        $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($order_id),
-                                    $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
         }
-
-        throw $e;
-      }
-      
-  }
   
+        return $this->apiClient->getSerializer()->deserialize($response, 'map[string,int]');
+        
+    }
+    
+    /**
+     * placeOrder
+     *
+     * Place an order for a pet
+     *
+     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (optional)
+     * @return \Swagger\Client\Model\Order
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function placeOrder($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/store/order";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
+        }
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Order'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Order');
+        
+    }
+    
+    /**
+     * getOrderById
+     *
+     * Find purchase order by ID
+     *
+     * @param string $order_id ID of pet that needs to be fetched (required)
+     * @return \Swagger\Client\Model\Order
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getOrderById($order_id)
+    {
+        
+        // verify the required parameter 'order_id' is set
+        if ($order_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $order_id when calling getOrderById');
+        }
+  
+        // parse inputs
+        $resourcePath = "/store/order/{orderId}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        if ($order_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "orderId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($order_id),
+                $resourcePath
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Order'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Order');
+        
+    }
+    
+    /**
+     * deleteOrder
+     *
+     * Delete purchase order by ID
+     *
+     * @param string $order_id ID of the order that needs to be deleted (required)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function deleteOrder($order_id)
+    {
+        
+        // verify the required parameter 'order_id' is set
+        if ($order_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $order_id when calling deleteOrder');
+        }
+  
+        // parse inputs
+        $resourcePath = "/store/order/{orderId}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "DELETE";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        if ($order_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "orderId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($order_id),
+                $resourcePath
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
index 1d0765bbb815..773181a52fc0 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * UserApi
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -16,8 +26,9 @@
  */
 
 /**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Api;
@@ -27,545 +38,589 @@ use \Swagger\Client\ApiClient;
 use \Swagger\Client\ApiException;
 use \Swagger\Client\ObjectSerializer;
 
-class UserApi {
+/**
+ * UserApi Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class UserApi
+{
 
-  /** @var \Swagger\Client\ApiClient instance of the ApiClient */
-  private $apiClient;
-
-  /**
-   * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
-   */
-  function __construct($apiClient = null) {
-    if ($apiClient == null) {
-      $apiClient = new ApiClient();
-      $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+    /**
+     * API Client
+     * @var \Swagger\Client\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+        }
+  
+        $this->apiClient = $apiClient;
     }
-
-    $this->apiClient = $apiClient;
-  }
-
-  /**
-   * @return \Swagger\Client\ApiClient get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * @param \Swagger\Client\ApiClient $apiClient set the API client
-   * @return UserApi
-   */
-  public function setApiClient(ApiClient $apiClient) {
-    $this->apiClient = $apiClient;
-    return $this;
-  }
-
   
-  /**
-   * createUser
-   *
-   * Create user
-   *
-   * @param \Swagger\Client\Model\User $body Created user object (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function createUser($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+    /**
+     * Get API client
+     * @return \Swagger\Client\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \Swagger\Client\ApiClient $apiClient set the API client
+     * @return UserApi
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    
+    /**
+     * createUser
+     *
+     * Create user
+     *
+     * @param \Swagger\Client\Model\User $body Created user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function createUser($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
         }
-
-        throw $e;
-      }
-      
-  }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
   
-  /**
-   * createUsersWithArrayInput
-   *
-   * Creates list of users with given input array
-   *
-   * @param \Swagger\Client\Model\User[] $body List of user object (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function createUsersWithArrayInput($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/createWithArray";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+        
+        
+        
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
         }
-
-        throw $e;
-      }
-      
-  }
   
-  /**
-   * createUsersWithListInput
-   *
-   * Creates list of users with given input array
-   *
-   * @param \Swagger\Client\Model\User[] $body List of user object (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function createUsersWithListInput($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/createWithList";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
         }
-
-        throw $e;
-      }
-      
-  }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
   
-  /**
-   * loginUser
-   *
-   * Logs user into the system
-   *
-   * @param string $username The user name for login (required)
-   * @param string $password The password for login in clear text (required)
-   * @return string
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function loginUser($username, $password) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/login";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      // query params
-      if($username !== null) {
-        $queryParams['username'] = $this->apiClient->getSerializer()->toQueryValue($username);
-      }// query params
-      if($password !== null) {
-        $queryParams['password'] = $this->apiClient->getSerializer()->toQueryValue($password);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'string');
-            $e->setResponseObject($data);
-            break;
+            throw $e;
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'string');
-      return $responseObject;
-      
-  }
+        
+    }
+    
+    /**
+     * createUsersWithArrayInput
+     *
+     * Creates list of users with given input array
+     *
+     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function createUsersWithArrayInput($body=null)
+    {
+        
   
-  /**
-   * logoutUser
-   *
-   * Logs out current logged in user session
-   *
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function logoutUser() {
-      
-
-      // parse inputs
-      $resourcePath = "/user/logout";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+        // parse inputs
+        $resourcePath = "/user/createWithArray";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
         }
-
-        throw $e;
-      }
-      
-  }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
   
-  /**
-   * getUserByName
-   *
-   * Get user by user name
-   *
-   * @param string $username The name that needs to be fetched. Use user1 for testing.  (required)
-   * @return \Swagger\Client\Model\User
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function getUserByName($username) {
-      
-      // verify the required parameter 'username' is set
-      if ($username === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $username when calling getUserByName');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/user/{username}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($username),
-                                    $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
-          case 200:
-            $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\User');
-            $e->setResponseObject($data);
-            break;
+        
+        
+        
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
         }
-
-        throw $e;
-      }
-      
-      if (!$response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\User');
-      return $responseObject;
-      
-  }
   
-  /**
-   * updateUser
-   *
-   * Updated user
-   *
-   * @param string $username name that need to be deleted (required)
-   * @param \Swagger\Client\Model\User $body Updated user object (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function updateUser($username, $body) {
-      
-      // verify the required parameter 'username' is set
-      if ($username === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/user/{username}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "PUT";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($username),
-                                    $resourcePath);
-      }
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
         }
-
-        throw $e;
-      }
-      
-  }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
   
-  /**
-   * deleteUser
-   *
-   * Delete user
-   *
-   * @param string $username The name that needs to be deleted (required)
-   * @return void
-   * @throws \Swagger\Client\ApiException on non-2xx response
-   */
-   public function deleteUser($username) {
-      
-      // verify the required parameter 'username' is set
-      if ($username === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $username when calling deleteUser');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/user/{username}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->getSerializer()->toPathValue($username),
-                                    $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-      
-      // make the API Call
-      try {
-        $response = $this->apiClient->callAPI($resourcePath, $method,
-                                              $queryParams, $httpBody,
-                                              $headerParams);
-      } catch (ApiException $e) {
-        switch ($e->getCode()) { 
+            throw $e;
         }
-
-        throw $e;
-      }
-      
-  }
+        
+    }
+    
+    /**
+     * createUsersWithListInput
+     *
+     * Creates list of users with given input array
+     *
+     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function createUsersWithListInput($body=null)
+    {
+        
   
+        // parse inputs
+        $resourcePath = "/user/createWithList";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
+        }
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * loginUser
+     *
+     * Logs user into the system
+     *
+     * @param string $username The user name for login (optional)
+     * @param string $password The password for login in clear text (optional)
+     * @return string
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function loginUser($username=null, $password=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user/login";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        // query params
+        if ($username !== null) {
+            $queryParams['username'] = $this->apiClient->getSerializer()->toQueryValue($username);
+        }// query params
+        if ($password !== null) {
+            $queryParams['password'] = $this->apiClient->getSerializer()->toQueryValue($password);
+        }
+        
+        
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, 'string'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'string', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, 'string');
+        
+    }
+    
+    /**
+     * logoutUser
+     *
+     * Logs out current logged in user session
+     *
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function logoutUser()
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user/logout";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * getUserByName
+     *
+     * Get user by user name
+     *
+     * @param string $username The name that needs to be fetched. Use user1 for testing.  (required)
+     * @return \Swagger\Client\Model\User
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getUserByName($username)
+    {
+        
+        // verify the required parameter 'username' is set
+        if ($username === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $username when calling getUserByName');
+        }
+  
+        // parse inputs
+        $resourcePath = "/user/{username}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "GET";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        if ($username !== null) {
+            $resourcePath = str_replace(
+                "{" . "username" . "}",
+                $this->apiClient->getSerializer()->toPathValue($username),
+                $resourcePath
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\User'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\User', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\User');
+        
+    }
+    
+    /**
+     * updateUser
+     *
+     * Updated user
+     *
+     * @param string $username name that need to be deleted (required)
+     * @param \Swagger\Client\Model\User $body Updated user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updateUser($username, $body=null)
+    {
+        
+        // verify the required parameter 'username' is set
+        if ($username === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser');
+        }
+  
+        // parse inputs
+        $resourcePath = "/user/{username}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "PUT";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        if ($username !== null) {
+            $resourcePath = str_replace(
+                "{" . "username" . "}",
+                $this->apiClient->getSerializer()->toPathValue($username),
+                $resourcePath
+            );
+        }
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
+        }
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * deleteUser
+     *
+     * Delete user
+     *
+     * @param string $username The name that needs to be deleted (required)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function deleteUser($username)
+    {
+        
+        // verify the required parameter 'username' is set
+        if ($username === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $username when calling deleteUser');
+        }
+  
+        // parse inputs
+        $resourcePath = "/user/{username}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "DELETE";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        if ($username !== null) {
+            $resourcePath = str_replace(
+                "{" . "username" . "}",
+                $this->apiClient->getSerializer()->toPathValue($username),
+                $resourcePath
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
index 66204f0c4f36..bf4f4e482bf6 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * ApiClient
+ * 
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client 
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,206 +25,248 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
 
 namespace Swagger\Client;
 
-class ApiClient {
+/**
+ * ApiClient Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client 
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class ApiClient
+{
 
-  public static $PATCH = "PATCH";
-  public static $POST = "POST";
-  public static $GET = "GET";
-  public static $PUT = "PUT";
-  public static $DELETE = "DELETE";
-
-  /** @var Configuration */
-  protected $config;
-
-  /** @var ObjectSerializer */
-  protected $serializer;
-
-  /**
-   * @param Configuration $config config for this ApiClient
-   */
-  function __construct(Configuration $config = null) {
-    if ($config == null) {
-      $config = Configuration::getDefaultConfiguration();
+    public static $PATCH = "PATCH";
+    public static $POST = "POST";
+    public static $GET = "GET";
+    public static $PUT = "PUT";
+    public static $DELETE = "DELETE";
+  
+    /** 
+     * Configuration
+     * @var Configuration
+     */
+    protected $config;
+  
+    /**
+     * Object Serializer
+     * @var ObjectSerializer
+     */
+    protected $serializer;
+  
+    /**
+     * Constructor of the class
+     * @param Configuration $config config for this ApiClient
+     */
+    function __construct(Configuration $config = null)
+    {
+        if ($config == null) {
+            $config = Configuration::getDefaultConfiguration();
+        }
+        
+        $this->config = $config;
+        $this->serializer = new ObjectSerializer();
+    }
+  
+    /**
+     * Get the config
+     * @return Configuration
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
+  
+    /**
+     * Get the serializer
+     * @return ObjectSerializer
+     */
+    public function getSerializer()
+    {
+        return $this->serializer;
+    }
+  
+    /**
+     * Get API key (with prefix if set)
+     * @param  string $apiKeyIdentifier name of apikey
+     * @return string API key with the prefix
+     */
+    public function getApiKeyWithPrefix($apiKeyIdentifier)
+    {
+        $prefix = $this->config->getApiKeyPrefix($apiKeyIdentifier);
+        $apiKey = $this->config->getApiKey($apiKeyIdentifier);
+  
+        if (!isset($apiKey)) {
+            return null;
+        }
+  
+        if (isset($prefix)) {
+            $keyWithPrefix = $prefix." ".$apiKey;
+        } else {
+            $keyWithPrefix = $apiKey;
+        }
+  
+        return $keyWithPrefix;
     }
     
-    $this->config = $config;
-    $this->serializer = new ObjectSerializer();
-  }
-
-  /**
-   * get the config
-   * @return Configuration
-   */
-  public function getConfig() {
-    return $this->config;
-  }
-
-  /**
-   * get the serializer
-   * @return ObjectSerializer
-   */
-  public function getSerializer() {
-    return $this->serializer;
-  }
-
-  /**
-   * Get API key (with prefix if set)
-   * @param string $apiKey name of apikey
-   * @return string API key with the prefix
-   */
-  public function getApiKeyWithPrefix($apiKey) {
-    $prefix = $this->config->getApiKeyPrefix($apiKey);
-    $apiKey = $this->config->getApiKey($apiKey);
-
-    if (!isset($apiKey)) {
-      return null;
-    }
-
-    if (isset($prefix)) {
-      $keyWithPrefix = $prefix." ".$apiKey;
-    } else {
-      $keyWithPrefix = $apiKey;
-    }
-
-    return $keyWithPrefix;
-  }
+    /**
+     * Make the HTTP call (Sync)
+     * @param string $resourcePath path to method endpoint
+     * @param string $method       method to call
+     * @param array  $queryParams  parameters to be place in query URL
+     * @param array  $postData     parameters to be placed in POST body
+     * @param array  $headerParams parameters to be place in request header
+     * @param string $responseType expected response type of the endpoint
+     * @throws \Swagger\Client\ApiException on a non 2xx response
+     * @return mixed
+     */
+    public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams, $responseType=null)
+    {
   
-  /**
-   * @param string $resourcePath path to method endpoint
-   * @param string $method method to call
-   * @param array $queryParams parameters to be place in query URL
-   * @param array $postData parameters to be placed in POST body
-   * @param array $headerParams parameters to be place in request header
-   * @throws \Swagger\Client\ApiException on a non 2xx response
-   * @return mixed
-   */
-  public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams) {
-
-    $headers = array();
-
-    # construct the http header
-    $headerParams = array_merge((array)$this->config->getDefaultHeaders(), (array)$headerParams);
-
-    foreach ($headerParams as $key => $val) {
-      $headers[] = "$key: $val";
+        $headers = array();
+  
+        // construct the http header
+        $headerParams = array_merge(
+            (array)$this->config->getDefaultHeaders(), 
+            (array)$headerParams
+        );
+  
+        foreach ($headerParams as $key => $val) {
+            $headers[] = "$key: $val";
+        }
+  
+        // form data
+        if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
+            $postData = http_build_query($postData);
+        } else if ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
+            $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
+        }
+  
+        $url = $this->config->getHost() . $resourcePath;
+  
+        $curl = curl_init();
+        // set timeout, if needed
+        if ($this->config->getCurlTimeout() != 0) {
+            curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout());
+        }
+        // return the result on success, rather than just TRUE
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+  
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+  
+        if (! empty($queryParams)) {
+            $url = ($url . '?' . http_build_query($queryParams));
+        }
+  
+        if ($method == self::$POST) {
+            curl_setopt($curl, CURLOPT_POST, true);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PATCH) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PUT) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$DELETE) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method != self::$GET) {
+            throw new ApiException('Method ' . $method . ' is not recognized.');
+        }
+        curl_setopt($curl, CURLOPT_URL, $url);
+  
+        // Set user agent
+        curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
+  
+        // debugging for curl
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, $this->config->getDebugFile());
+  
+            curl_setopt($curl, CURLOPT_VERBOSE, 1);
+            curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
+        } else {
+            curl_setopt($curl, CURLOPT_VERBOSE, 0);
+        }
+  
+        // obtain the HTTP response headers
+        curl_setopt($curl, CURLOPT_HEADER, 1);
+  
+        // Make the request
+        $response = curl_exec($curl);
+        $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+        $http_header = substr($response, 0, $http_header_size);
+        $http_body = substr($response, $http_header_size);
+        $response_info = curl_getinfo($curl);
+  
+        // debug HTTP response body
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, $this->config->getDebugFile());
+        }
+  
+        // Handle the response
+        if ($response_info['http_code'] == 0) {
+            throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
+        } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
+            // return raw body if response is a file 
+            if ($responseType == '\SplFileObject') {
+                return array($http_body, $http_header);
+            }
+  
+            $data = json_decode($http_body);
+            if (json_last_error() > 0) { // if response is a string
+                $data = $http_body;
+            }
+        } else {
+            throw new ApiException(
+                "[".$response_info['http_code']."] Error connecting to the API ($url)",
+                $response_info['http_code'], $http_header, $http_body
+            );
+        }
+        return array($data, $http_header);
     }
-
-    // form data
-    if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
-      $postData = http_build_query($postData);
+  
+    /**
+     * Return the header 'Accept' based on an array of Accept provided
+     *
+     * @param string[] $accept Array of header
+     *
+     * @return string Accept (e.g. application/json)
+     */
+    public static function selectHeaderAccept($accept)
+    {
+        if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
+            return null;
+        } elseif (preg_grep("/application\/json/i", $accept)) {
+            return 'application/json';
+        } else {
+            return implode(',', $accept);
+        }
     }
-    else if ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
-      $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
+  
+    /**
+     * Return the content type based on an array of content-type provided
+     *
+     * @param string[] $content_type Array fo content-type
+     *
+     * @return string Content-Type (e.g. application/json)
+     */
+    public static function selectHeaderContentType($content_type)
+    {
+        if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
+            return 'application/json';
+        } elseif (preg_grep("/application\/json/i", $content_type)) {
+            return 'application/json';
+        } else {
+            return implode(',', $content_type);
+        }
     }
-
-    $url = $this->config->getHost() . $resourcePath;
-
-    $curl = curl_init();
-    // set timeout, if needed
-    if ($this->config->getCurlTimeout() != 0) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout());
-    }
-    // return the result on success, rather than just TRUE
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-
-    curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-
-    if (! empty($queryParams)) {
-      $url = ($url . '?' . http_build_query($queryParams));
-    }
-
-    if ($method == self::$POST) {
-      curl_setopt($curl, CURLOPT_POST, true);
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PATCH) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PUT) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$DELETE) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method != self::$GET) {
-      throw new ApiException('Method ' . $method . ' is not recognized.');
-    }
-    curl_setopt($curl, CURLOPT_URL, $url);
-
-    // Set user agent
-    curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
-
-    // debugging for curl
-    if ($this->config->getDebug()) {
-      error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, $this->config->getDebugFile());
-
-      curl_setopt($curl, CURLOPT_VERBOSE, 1);
-      curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
-    } else {
-      curl_setopt($curl, CURLOPT_VERBOSE, 0);
-    }
-
-    // obtain the HTTP response headers
-    curl_setopt($curl, CURLOPT_HEADER, 1);
-
-    // Make the request
-    $response = curl_exec($curl);
-    $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
-    $http_header = substr($response, 0, $http_header_size);
-    $http_body = substr($response, $http_header_size);
-    $response_info = curl_getinfo($curl);
-
-    // debug HTTP response body
-    if ($this->config->getDebug()) {
-        error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, $this->config->getDebugFile());
-    }
-
-    // Handle the response
-    if ($response_info['http_code'] == 0) {
-      throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
-    } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
-      $data = json_decode($http_body);
-      if (json_last_error() > 0) { // if response is a string
-        $data = $http_body;
-      }
-    } else {
-      throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)",
-        $response_info['http_code'], $http_header, $http_body);
-    }
-    return $data;
-  }
-
-  /*
-   * return the header 'Accept' based on an array of Accept provided
-   *
-   * @param string[] $accept Array of header
-   * @return string Accept (e.g. application/json)
-   */
-  public static function selectHeaderAccept($accept) {
-    if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
-      return NULL;
-    } elseif (preg_grep("/application\/json/i", $accept)) {
-      return 'application/json';
-    } else {
-      return implode(',', $accept);
-    }
-  }
-
-  /*
-   * return the content type based on an array of content-type provided
-   *
-   * @param string[] content_type_array Array fo content-type
-   * @return string Content-Type (e.g. application/json)
-   */
-  public static function selectHeaderContentType($content_type) {
-    if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
-      return 'application/json';
-    } elseif (preg_grep("/application\/json/i", $content_type)) {
-      return 'application/json';
-    } else {
-      return implode(',', $content_type);
-    }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
index 51774137aed2..ce6c19e245f1 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * ApiException
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,57 +24,97 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
 
 namespace Swagger\Client;
 
 use \Exception;
 
-class ApiException extends Exception {
+/**
+ * ApiException Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class ApiException extends Exception
+{
 
-  /** @var string The HTTP body of the server response. */
-  protected $responseBody;
+    /** 
+     * The HTTP body of the server response.
+     * @var string
+     */
+    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 string $responseHeaders HTTP response header
+     * @param string $responseBody    Deseralized response object
+     */
+    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
+     *
+     * @return string HTTP response header
+     */
+    public function getResponseHeaders()
+    {
+        return $this->responseHeaders;
+    }
+  
+    /**
+     * Gets the HTTP response body
+     *
+     * @return string HTTP response body
+     */
+    public function getResponseBody()
+    {
+        return $this->responseBody;
+    }
+  
+    /**
+     * Sets the deseralized response object (during deserialization)
+     * @param mixed $obj Deserialized response object
+     * @return void
+     */
+    public function setResponseObject($obj)
+    {
+        $this->responseObject = $obj;
+    }
 
-  /** @var string[] The HTTP header of the server response. */
-  protected $responseHeaders;
-
-  /**
-   * The deserialized response object
-   */
-  protected $responseObject;
-
-  public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null) {
-    parent::__construct($message, $code);
-    $this->responseHeaders = $responseHeaders;
-    $this->responseBody = $responseBody;
-  }
-
-  /**
-   * Get the HTTP response header
-   *
-   * @return string HTTP response header
-   */
-  public function getResponseHeaders() {
-    return $this->responseHeaders;
-  }
-
-  /**
-   * Get the HTTP response body
-   *
-   * @return string HTTP response body
-   */
-  public function getResponseBody() {
-    return $this->responseBody;
-  }
-
-  /**
-   * sets the deseralized response object (during deserialization)
-   * @param mixed $obj
-   */
-  public function setResponseObject($obj) {
-    $this->responseObject = $obj;
-  }
-
-  public function getResponseObject() {
-    return $this->responseObject;
-  }
+    /**
+     * Gets the deseralized response object (during deserialization)
+     *
+     * @return mixed the deserialized response object
+     */
+    public function getResponseObject()
+    {
+        return $this->responseObject;
+    }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
index a407fe4dd49b..002df7fc7133 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Configuration
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -15,252 +26,439 @@
  *  limitations under the License.
  */
 
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
+
 namespace Swagger\Client;
 
-class Configuration {
+/**
+ * Configuration Class Doc Comment
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class Configuration
+{
 
-  private static $defaultConfiguration = null;
+    private static $_defaultConfiguration = null;
+  
+    /** 
+     * Associate array to store API key(s)
+     *
+     * @var string[]
+     */
+    protected $apiKeys = array();
+  
+    /**
+     * Associate array to store API prefix (e.g. Bearer)
+     *
+     * @var string[]
+     */
+    protected $apiKeyPrefixes = array();
+  
+    /** 
+     * Username for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $username = '';
+  
+    /**
+     * Password for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $password = '';
+  
+    /**
+     * The default instance of ApiClient
+     *
+     * @var \Swagger\Client\ApiClient
+     */
+    protected $defaultHeaders = array();
+  
+    /**
+     * The host
+     *
+     * @var string
+     */
+    protected $host = 'http://localhost';
+  
+    /**
+     * Timeout (second) of the HTTP request, by default set to 0, no timeout
+     *
+     * @var string 
+     */
+    protected $curlTimeout = 0;
+  
+    /**
+     * User agent of the HTTP request, set to "PHP-Swagger" by default
+     *
+     * @var string
+     */
+    protected $userAgent = "PHP-Swagger";
+  
+    /**
+     * Debug switch (default set to false)
+     *
+     * @var bool
+     */
+    protected $debug = false;
+  
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $debugFile = 'php://output';
 
-  /** @var string[] Associate array to store API key(s) */
-  protected $apiKeys = array();
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $tempFolderPath;
 
-  /** string[] Associate array to store API prefix (e.g. Bearer) */
-  protected $apiKeyPrefixes = array();
-
-  /** @var string Username for HTTP basic authentication */
-  protected $username = '';
-
-  /** @var string Password for HTTP basic authentication */
-  protected $password = '';
-
-  /** @var \Swagger\Client\ApiClient The default instance of ApiClient */
-  protected $defaultHeaders = array();
-
-  /** @var string The host */
-  protected $host = 'http://localhost';
-
-  /** @var string timeout (second) of the HTTP request, by default set to 0, no timeout */
-  protected $curlTimeout = 0;
-
-  /** @var string user agent of the HTTP request, set to "PHP-Swagger" by default */
-  protected $userAgent = "PHP-Swagger";
-
-  /** @var bool Debug switch (default set to false) */
-  protected $debug = false;
-
-  /** @var string Debug file location (log to STDOUT by default) */
-  protected $debugFile = 'php://output';
-
-  /**
-   * @param string $key
-   * @param string $value
-   * @return Configuration
-   */
-  public function setApiKey($key, $value) {
-    $this->apiKeys[$key] = $value;
-    return $this;
-  }
-
-  /**
-   * @param $key
-   * @return string
-   */
-  public function getApiKey($key) {
-    return isset($this->apiKeys[$key]) ? $this->apiKeys[$key] : null;
-  }
-
-  /**
-   * @param string $key
-   * @param string $value
-   * @return Configuration
-   */
-  public function setApiKeyPrefix($key, $value) {
-    $this->apiKeyPrefixes[$key] = $value;
-    return $this;
-  }
-
-  /**
-   * @param $key
-   * @return string
-   */
-  public function getApiKeyPrefix($key) {
-    return isset($this->apiKeyPrefixes[$key]) ? $this->apiKeyPrefixes[$key] : null;
-  }
-
-  /**
-   * @param string $username
-   * @return Configuration
-   */
-  public function setUsername($username) {
-    $this->username = $username;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getUsername() {
-    return $this->username;
-  }
-
-  /**
-   * @param string $password
-   * @return Configuration
-   */
-  public function setPassword($password) {
-    $this->password = $password;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getPassword() {
-    return $this->password;
-  }
-
-  /**
-   * add default header
-   *
-   * @param string $headerName header name (e.g. Token)
-   * @param string $headerValue header value (e.g. 1z8wp3)
-   * @return ApiClient
-   */
-  public function addDefaultHeader($headerName, $headerValue) {
-    if (!is_string($headerName)) {
-      throw new \InvalidArgumentException('Header name must be a string.');
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->tempFolderPath = sys_get_temp_dir();
     }
-
-    $this->defaultHeaders[$headerName] =  $headerValue;
-    return $this;
-  }
-
-  /**
-   * get the default header
-   *
-   * @return array default header
-   */
-  public function getDefaultHeaders() {
-    return $this->defaultHeaders;
-  }
-
-  /**
-   * delete a default header
-   * @param string $headerName the header to delete
-   * @return Configuration
-   */
-  public function deleteDefaultHeader($headerName) {
-    unset($this->defaultHeaders[$headerName]);
-  }
-
-  /**
-   * @param string $host
-   * @return Configuration
-   */
-  public function setHost($host) {
-    $this->host = $host;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getHost() {
-    return $this->host;
-  }
-
-  /**
-   * set the user agent of the api client
-   *
-   * @param string $userAgent the user agent of the api client
-   * @return ApiClient
-   */
-  public function setUserAgent($userAgent) {
-    if (!is_string($userAgent)) {
-      throw new \InvalidArgumentException('User-agent must be a string.');
+  
+    /**
+     * Sets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $key              API key or token
+     *
+     * @return Configuration
+     */
+    public function setApiKey($apiKeyIdentifier, $key)
+    {
+        $this->apiKeys[$apiKeyIdentifier] = $key;
+        return $this;
     }
-
-    $this->userAgent = $userAgent;
-    return $this;
-  }
-
-  /**
-   * get the user agent of the api client
-   *
-   * @return string user agent
-   */
-  public function getUserAgent() {
-    return $this->userAgent;
-  }
-
-  /**
-   * set the HTTP timeout value
-   *
-   * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
-   * @return ApiClient
-   */
-  public function setCurlTimeout($seconds) {
-    if (!is_numeric($seconds) || $seconds < 0) {
-      throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
+  
+    /**
+     * Gets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string API key or token
+     */
+    public function getApiKey($apiKeyIdentifier)
+    {
+        return isset($this->apiKeys[$apiKeyIdentifier]) ? $this->apiKeys[$apiKeyIdentifier] : null;
     }
-
-    $this->curlTimeout = $seconds;
-    return $this;
-  }
-
-  /**
-   * get the HTTP timeout value
-   *
-   * @return string HTTP timeout value
-   */
-  public function getCurlTimeout() {
-    return $this->curlTimeout;
-  }
-
-  /**
-   * @param bool $debug
-   * @return Configuration
-   */
-  public function setDebug($debug) {
-    $this->debug = $debug;
-    return $this;
-  }
-
-  /**
-   * @return bool
-   */
-  public function getDebug() {
-    return $this->debug;
-  }
-
-  /**
-   * @param string $debugFile
-   * @return Configuration
-   */
-  public function setDebugFile($debugFile) {
-    $this->debugFile = $debugFile;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getDebugFile() {
-    return $this->debugFile;
-  }
-
-  /**
-   * @return Configuration
-   */
-  public static function getDefaultConfiguration() {
-    if (self::$defaultConfiguration == null) {
-      return new Configuration();
+  
+    /**
+     * Sets the prefix for API key (e.g. Bearer)
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $prefix           API key prefix, e.g. Bearer
+     *
+     * @return Configuration
+     */
+    public function setApiKeyPrefix($apiKeyIdentifier, $prefix)
+    {
+        $this->apiKeyPrefixes[$apiKeyIdentifier] = $prefix;
+        return $this;
     }
-
-    return self::$defaultConfiguration;
-  }
-
-  public static function setDefaultConfiguration(Configuration $config) {
-    self::$defaultConfiguration = $config;
-  }
+  
+    /**
+     * Gets API key prefix
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string
+     */
+    public function getApiKeyPrefix($apiKeyIdentifier)
+    {
+        return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null;
+    }
+  
+    /**
+     * Sets the username for HTTP basic authentication
+     *
+     * @param string $username Username for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setUsername($username)
+    {
+        $this->username = $username;
+        return $this;
+    }
+  
+    /**
+     * Gets the username for HTTP basic authentication
+     *
+     * @return string Username for HTTP basic authentication
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+  
+    /**
+     * Sets the password for HTTP basic authentication
+     *
+     * @param string $password Password for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setPassword($password)
+    {
+        $this->password = $password;
+        return $this;
+    }
+  
+    /**
+     * Gets the password for HTTP basic authentication
+     *
+     * @return string Password for HTTP basic authentication
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+  
+    /**
+     * Adds a default header
+     *
+     * @param string $headerName  header name (e.g. Token)
+     * @param string $headerValue header value (e.g. 1z8wp3)
+     *
+     * @return ApiClient
+     */
+    public function addDefaultHeader($headerName, $headerValue)
+    {
+        if (!is_string($headerName)) {
+            throw new \InvalidArgumentException('Header name must be a string.');
+        }
+  
+        $this->defaultHeaders[$headerName] =  $headerValue;
+        return $this;
+    }
+  
+    /**
+     * Gets the default header
+     *
+     * @return array An array of default header(s)
+     */
+    public function getDefaultHeaders()
+    {
+        return $this->defaultHeaders;
+    }
+  
+    /**
+     * Deletes a default header
+     *
+     * @param string $headerName the header to delete
+     *
+     * @return Configuration
+     */
+    public function deleteDefaultHeader($headerName)
+    {
+        unset($this->defaultHeaders[$headerName]);
+    }
+  
+    /**
+     * Sets the host
+     *
+     * @param string $host Host
+     *
+     * @return Configuration
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+        return $this;
+    }
+  
+    /**
+     * Gets the host
+     *
+     * @return string Host
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+  
+    /**
+     * Sets the user agent of the api client
+     *
+     * @param string $userAgent the user agent of the api client
+     *
+     * @return ApiClient
+     */
+    public function setUserAgent($userAgent)
+    {
+        if (!is_string($userAgent)) {
+            throw new \InvalidArgumentException('User-agent must be a string.');
+        }
+  
+        $this->userAgent = $userAgent;
+        return $this;
+    }
+  
+    /**
+     * Gets the user agent of the api client
+     *
+     * @return string user agent
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
+  
+    /**
+     * Sets the HTTP timeout value
+     *
+     * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
+     *
+     * @return ApiClient
+     */
+    public function setCurlTimeout($seconds)
+    {
+        if (!is_numeric($seconds) || $seconds < 0) {
+            throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
+        }
+  
+        $this->curlTimeout = $seconds;
+        return $this;
+    }
+  
+    /**
+     * Gets the HTTP timeout value
+     *
+     * @return string HTTP timeout value
+     */
+    public function getCurlTimeout()
+    {
+        return $this->curlTimeout;
+    }
+  
+    /**
+     * Sets debug flag
+     * 
+     * @param bool $debug Debug flag
+     *
+     * @return Configuration
+     */
+    public function setDebug($debug)
+    {
+        $this->debug = $debug;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug flag
+     *
+     * @return bool
+     */
+    public function getDebug()
+    {
+        return $this->debug;
+    }
+  
+    /**
+     * Sets the debug file
+     *
+     * @param string $debugFile Debug file
+     *
+     * @return Configuration
+     */
+    public function setDebugFile($debugFile)
+    {
+        $this->debugFile = $debugFile;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug file
+     *
+     * @return string
+     */
+    public function getDebugFile()
+    {
+        return $this->debugFile;
+    }
+ 
+    /**
+     * Sets the temp folder path
+     *
+     * @param string $tempFolderPath Temp folder path
+     *
+     * @return Configuration
+     */
+    public function setTempFolderPath($tempFolderPath)
+    {
+        $this->tempFolderPath = $tempFolderPath;
+        return $this;
+    }
+ 
+    /**
+     * Gets the temp folder path
+     *
+     * @return string Temp folder path
+     */
+    public function getTempFolderPath()
+    {
+        return $this->tempFolderPath;
+    }
+ 
+    /**
+     * Gets the default configuration instance
+     *
+     * @return Configuration
+     */
+    public static function getDefaultConfiguration()
+    {
+        if (self::$_defaultConfiguration == null) {
+            self::$_defaultConfiguration = new Configuration();
+        }
+  
+        return self::$_defaultConfiguration;
+    }
+  
+    /**
+     * Sets the detault configuration instance
+     *
+     * @param Configuration $config An instance of the Configuration Object
+     *
+     * @return void
+     */
+    public static function setDefaultConfiguration(Configuration $config)
+    {
+        self::$_defaultConfiguration = $config;
+    }
+  
+    /**
+     * Gets the essential information for debugging
+     *
+     * @return string The report for debugging
+     */
+    public static function toDebugReport()
+    {
+        $report  = "PHP SDK (Swagger\Client) Debug Report:\n";
+        $report .= "    OS: ".php_uname()."\n";
+        $report .= "    PHP Version: ".phpversion()."\n";
+        $report .= "    Swagger Spec Version: 1.0.0\n";
+        $report .= "    SDK Package Version: 1.0.0\n";
+        $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n";
+  
+        return $report;
+    }
+  
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
index 75aaf2eeeada..444c3c1ed7e1 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Category
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,114 +25,182 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 /**
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Model;
 
 use \ArrayAccess;
-
-class Category implements ArrayAccess {
-  /** @var string[] Array of property to type mappings. Used for (de)serialization */
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'name' => 'string'
-  );
-
-  /** @var string[] Array of attributes where the key is the local name, and the value is the original name */
-  static $attributeMap = array(
-      'id' => 'id',
-      'name' => 'name'
-  );
-
-  /** @var string[] Array of attributes to setter functions (for deserialization of responses) */
-  static $setters = array(
-    'id' => 'setId',
-    'name' => 'setName'
-  );
-
-  /** @var string[] Array of attributes to getter functions (for serialization of requests) */
-  static $getters = array(
-    'id' => 'getId',
-    'name' => 'getName'
-  );
-
+/**
+ * Category Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Category implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'name' => 'string'
+    );
   
-  /** @var int $id */
-  protected $id;
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'name' => 'name'
+    );
   
-  /** @var string $name */
-  protected $name;
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'name' => 'setName'
+    );
   
-  public function __construct(array $data = null) {
-    if ($data != null) {
-      $this->id = $data["id"];
-      $this->name = $data["name"];
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'name' => 'getName'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $name 
+      * @var string
+      */
+    protected $name;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->name = $data["name"];
+        }
     }
-  }
-  
-  /**
-   * get id
-   * @return int
-   */
-  public function getId() {
-    return $this->id;
-  }
-
-  /**
-   * set id
-   * @param int $id
-   * @return $this
-   */
-  public function setId($id) {
-    $this->id = $id;
-    return $this;
-  }
-  
-  /**
-   * get name
-   * @return string
-   */
-  public function getName() {
-    return $this->name;
-  }
-
-  /**
-   * set name
-   * @param string $name
-   * @return $this
-   */
-  public function setName($name) {
-    $this->name = $name;
-    return $this;
-  }
-  
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-
-  public function __toString() {
-    if (defined('JSON_PRETTY_PRINT')) {
-      return json_encode($this, JSON_PRETTY_PRINT);
-    } else {
-      return json_encode($this);
+    
+    /**
+     * Gets id
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+  
+    /**
+     * Sets id
+     * @param int $id 
+     * @return $this
+     */
+    public function setId($id)
+    {
+        
+        $this->id = $id;
+        return $this;
+    }
+    
+    /**
+     * Gets name
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+  
+    /**
+     * Sets name
+     * @param string $name 
+     * @return $this
+     */
+    public function setName($name)
+    {
+        
+        $this->name = $name;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
     }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
index c7a433c3d8c4..b803bd7325e7 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Order
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,218 +25,313 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 /**
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Model;
 
 use \ArrayAccess;
+/**
+ * Order Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Order implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'pet_id' => 'int',
+        'quantity' => 'int',
+        'ship_date' => '\DateTime',
+        'status' => 'string',
+        'complete' => 'bool'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'pet_id' => 'petId',
+        'quantity' => 'quantity',
+        'ship_date' => 'shipDate',
+        'status' => 'status',
+        'complete' => 'complete'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'pet_id' => 'setPetId',
+        'quantity' => 'setQuantity',
+        'ship_date' => 'setShipDate',
+        'status' => 'setStatus',
+        'complete' => 'setComplete'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'pet_id' => 'getPetId',
+        'quantity' => 'getQuantity',
+        'ship_date' => 'getShipDate',
+        'status' => 'getStatus',
+        'complete' => 'getComplete'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $pet_id 
+      * @var int
+      */
+    protected $pet_id;
+    
+    /**
+      * $quantity 
+      * @var int
+      */
+    protected $quantity;
+    
+    /**
+      * $ship_date 
+      * @var \DateTime
+      */
+    protected $ship_date;
+    
+    /**
+      * $status Order Status
+      * @var string
+      */
+    protected $status;
+    
+    /**
+      * $complete 
+      * @var bool
+      */
+    protected $complete;
+    
 
-class Order implements ArrayAccess {
-  /** @var string[] Array of property to type mappings. Used for (de)serialization */
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'pet_id' => 'int',
-      'quantity' => 'int',
-      'ship_date' => '\DateTime',
-      'status' => 'string',
-      'complete' => 'bool'
-  );
-
-  /** @var string[] Array of attributes where the key is the local name, and the value is the original name */
-  static $attributeMap = array(
-      'id' => 'id',
-      'pet_id' => 'petId',
-      'quantity' => 'quantity',
-      'ship_date' => 'shipDate',
-      'status' => 'status',
-      'complete' => 'complete'
-  );
-
-  /** @var string[] Array of attributes to setter functions (for deserialization of responses) */
-  static $setters = array(
-    'id' => 'setId',
-    'pet_id' => 'setPetId',
-    'quantity' => 'setQuantity',
-    'ship_date' => 'setShipDate',
-    'status' => 'setStatus',
-    'complete' => 'setComplete'
-  );
-
-  /** @var string[] Array of attributes to getter functions (for serialization of requests) */
-  static $getters = array(
-    'id' => 'getId',
-    'pet_id' => 'getPetId',
-    'quantity' => 'getQuantity',
-    'ship_date' => 'getShipDate',
-    'status' => 'getStatus',
-    'complete' => 'getComplete'
-  );
-
-  
-  /** @var int $id */
-  protected $id;
-  
-  /** @var int $pet_id */
-  protected $pet_id;
-  
-  /** @var int $quantity */
-  protected $quantity;
-  
-  /** @var \DateTime $ship_date */
-  protected $ship_date;
-  
-  /** @var string $status Order Status */
-  protected $status;
-  
-  /** @var bool $complete */
-  protected $complete;
-  
-  public function __construct(array $data = null) {
-    if ($data != null) {
-      $this->id = $data["id"];
-      $this->pet_id = $data["pet_id"];
-      $this->quantity = $data["quantity"];
-      $this->ship_date = $data["ship_date"];
-      $this->status = $data["status"];
-      $this->complete = $data["complete"];
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->pet_id = $data["pet_id"];
+            $this->quantity = $data["quantity"];
+            $this->ship_date = $data["ship_date"];
+            $this->status = $data["status"];
+            $this->complete = $data["complete"];
+        }
     }
-  }
-  
-  /**
-   * get id
-   * @return int
-   */
-  public function getId() {
-    return $this->id;
-  }
-
-  /**
-   * set id
-   * @param int $id
-   * @return $this
-   */
-  public function setId($id) {
-    $this->id = $id;
-    return $this;
-  }
-  
-  /**
-   * get pet_id
-   * @return int
-   */
-  public function getPetId() {
-    return $this->pet_id;
-  }
-
-  /**
-   * set pet_id
-   * @param int $pet_id
-   * @return $this
-   */
-  public function setPetId($pet_id) {
-    $this->pet_id = $pet_id;
-    return $this;
-  }
-  
-  /**
-   * get quantity
-   * @return int
-   */
-  public function getQuantity() {
-    return $this->quantity;
-  }
-
-  /**
-   * set quantity
-   * @param int $quantity
-   * @return $this
-   */
-  public function setQuantity($quantity) {
-    $this->quantity = $quantity;
-    return $this;
-  }
-  
-  /**
-   * get ship_date
-   * @return \DateTime
-   */
-  public function getShipDate() {
-    return $this->ship_date;
-  }
-
-  /**
-   * set ship_date
-   * @param \DateTime $ship_date
-   * @return $this
-   */
-  public function setShipDate($ship_date) {
-    $this->ship_date = $ship_date;
-    return $this;
-  }
-  
-  /**
-   * get status
-   * @return string
-   */
-  public function getStatus() {
-    return $this->status;
-  }
-
-  /**
-   * set status
-   * @param string $status
-   * @return $this
-   */
-  public function setStatus($status) {
-    $this->status = $status;
-    return $this;
-  }
-  
-  /**
-   * get complete
-   * @return bool
-   */
-  public function getComplete() {
-    return $this->complete;
-  }
-
-  /**
-   * set complete
-   * @param bool $complete
-   * @return $this
-   */
-  public function setComplete($complete) {
-    $this->complete = $complete;
-    return $this;
-  }
-  
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-
-  public function __toString() {
-    if (defined('JSON_PRETTY_PRINT')) {
-      return json_encode($this, JSON_PRETTY_PRINT);
-    } else {
-      return json_encode($this);
+    
+    /**
+     * Gets id
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+  
+    /**
+     * Sets id
+     * @param int $id 
+     * @return $this
+     */
+    public function setId($id)
+    {
+        
+        $this->id = $id;
+        return $this;
+    }
+    
+    /**
+     * Gets pet_id
+     * @return int
+     */
+    public function getPetId()
+    {
+        return $this->pet_id;
+    }
+  
+    /**
+     * Sets pet_id
+     * @param int $pet_id 
+     * @return $this
+     */
+    public function setPetId($pet_id)
+    {
+        
+        $this->pet_id = $pet_id;
+        return $this;
+    }
+    
+    /**
+     * Gets quantity
+     * @return int
+     */
+    public function getQuantity()
+    {
+        return $this->quantity;
+    }
+  
+    /**
+     * Sets quantity
+     * @param int $quantity 
+     * @return $this
+     */
+    public function setQuantity($quantity)
+    {
+        
+        $this->quantity = $quantity;
+        return $this;
+    }
+    
+    /**
+     * Gets ship_date
+     * @return \DateTime
+     */
+    public function getShipDate()
+    {
+        return $this->ship_date;
+    }
+  
+    /**
+     * Sets ship_date
+     * @param \DateTime $ship_date 
+     * @return $this
+     */
+    public function setShipDate($ship_date)
+    {
+        
+        $this->ship_date = $ship_date;
+        return $this;
+    }
+    
+    /**
+     * Gets status
+     * @return string
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+  
+    /**
+     * Sets status
+     * @param string $status Order Status
+     * @return $this
+     */
+    public function setStatus($status)
+    {
+        $allowed_values = array("placed", "approved", "delivered");
+        if (!in_array($status, $allowed_values)) {
+            throw new \InvalidArgumentException("Invalid value for 'status', must be one of 'placed', 'approved', 'delivered'");
+        }
+        $this->status = $status;
+        return $this;
+    }
+    
+    /**
+     * Gets complete
+     * @return bool
+     */
+    public function getComplete()
+    {
+        return $this->complete;
+    }
+  
+    /**
+     * Sets complete
+     * @param bool $complete 
+     * @return $this
+     */
+    public function setComplete($complete)
+    {
+        
+        $this->complete = $complete;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
     }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
index cbe27e1fce93..6871ea9d9be5 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Pet
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,218 +25,313 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 /**
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Model;
 
 use \ArrayAccess;
+/**
+ * Pet Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Pet implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'category' => '\Swagger\Client\Model\Category',
+        'name' => 'string',
+        'photo_urls' => 'string[]',
+        'tags' => '\Swagger\Client\Model\Tag[]',
+        'status' => 'string'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'category' => 'category',
+        'name' => 'name',
+        'photo_urls' => 'photoUrls',
+        'tags' => 'tags',
+        'status' => 'status'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'category' => 'setCategory',
+        'name' => 'setName',
+        'photo_urls' => 'setPhotoUrls',
+        'tags' => 'setTags',
+        'status' => 'setStatus'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'category' => 'getCategory',
+        'name' => 'getName',
+        'photo_urls' => 'getPhotoUrls',
+        'tags' => 'getTags',
+        'status' => 'getStatus'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $category 
+      * @var \Swagger\Client\Model\Category
+      */
+    protected $category;
+    
+    /**
+      * $name 
+      * @var string
+      */
+    protected $name;
+    
+    /**
+      * $photo_urls 
+      * @var string[]
+      */
+    protected $photo_urls;
+    
+    /**
+      * $tags 
+      * @var \Swagger\Client\Model\Tag[]
+      */
+    protected $tags;
+    
+    /**
+      * $status pet status in the store
+      * @var string
+      */
+    protected $status;
+    
 
-class Pet implements ArrayAccess {
-  /** @var string[] Array of property to type mappings. Used for (de)serialization */
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'category' => '\Swagger\Client\Model\Category',
-      'name' => 'string',
-      'photo_urls' => 'string[]',
-      'tags' => '\Swagger\Client\Model\Tag[]',
-      'status' => 'string'
-  );
-
-  /** @var string[] Array of attributes where the key is the local name, and the value is the original name */
-  static $attributeMap = array(
-      'id' => 'id',
-      'category' => 'category',
-      'name' => 'name',
-      'photo_urls' => 'photoUrls',
-      'tags' => 'tags',
-      'status' => 'status'
-  );
-
-  /** @var string[] Array of attributes to setter functions (for deserialization of responses) */
-  static $setters = array(
-    'id' => 'setId',
-    'category' => 'setCategory',
-    'name' => 'setName',
-    'photo_urls' => 'setPhotoUrls',
-    'tags' => 'setTags',
-    'status' => 'setStatus'
-  );
-
-  /** @var string[] Array of attributes to getter functions (for serialization of requests) */
-  static $getters = array(
-    'id' => 'getId',
-    'category' => 'getCategory',
-    'name' => 'getName',
-    'photo_urls' => 'getPhotoUrls',
-    'tags' => 'getTags',
-    'status' => 'getStatus'
-  );
-
-  
-  /** @var int $id */
-  protected $id;
-  
-  /** @var \Swagger\Client\Model\Category $category */
-  protected $category;
-  
-  /** @var string $name */
-  protected $name;
-  
-  /** @var string[] $photo_urls */
-  protected $photo_urls;
-  
-  /** @var \Swagger\Client\Model\Tag[] $tags */
-  protected $tags;
-  
-  /** @var string $status pet status in the store */
-  protected $status;
-  
-  public function __construct(array $data = null) {
-    if ($data != null) {
-      $this->id = $data["id"];
-      $this->category = $data["category"];
-      $this->name = $data["name"];
-      $this->photo_urls = $data["photo_urls"];
-      $this->tags = $data["tags"];
-      $this->status = $data["status"];
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->category = $data["category"];
+            $this->name = $data["name"];
+            $this->photo_urls = $data["photo_urls"];
+            $this->tags = $data["tags"];
+            $this->status = $data["status"];
+        }
     }
-  }
-  
-  /**
-   * get id
-   * @return int
-   */
-  public function getId() {
-    return $this->id;
-  }
-
-  /**
-   * set id
-   * @param int $id
-   * @return $this
-   */
-  public function setId($id) {
-    $this->id = $id;
-    return $this;
-  }
-  
-  /**
-   * get category
-   * @return \Swagger\Client\Model\Category
-   */
-  public function getCategory() {
-    return $this->category;
-  }
-
-  /**
-   * set category
-   * @param \Swagger\Client\Model\Category $category
-   * @return $this
-   */
-  public function setCategory($category) {
-    $this->category = $category;
-    return $this;
-  }
-  
-  /**
-   * get name
-   * @return string
-   */
-  public function getName() {
-    return $this->name;
-  }
-
-  /**
-   * set name
-   * @param string $name
-   * @return $this
-   */
-  public function setName($name) {
-    $this->name = $name;
-    return $this;
-  }
-  
-  /**
-   * get photo_urls
-   * @return string[]
-   */
-  public function getPhotoUrls() {
-    return $this->photo_urls;
-  }
-
-  /**
-   * set photo_urls
-   * @param string[] $photo_urls
-   * @return $this
-   */
-  public function setPhotoUrls($photo_urls) {
-    $this->photo_urls = $photo_urls;
-    return $this;
-  }
-  
-  /**
-   * get tags
-   * @return \Swagger\Client\Model\Tag[]
-   */
-  public function getTags() {
-    return $this->tags;
-  }
-
-  /**
-   * set tags
-   * @param \Swagger\Client\Model\Tag[] $tags
-   * @return $this
-   */
-  public function setTags($tags) {
-    $this->tags = $tags;
-    return $this;
-  }
-  
-  /**
-   * get status
-   * @return string
-   */
-  public function getStatus() {
-    return $this->status;
-  }
-
-  /**
-   * set status
-   * @param string $status
-   * @return $this
-   */
-  public function setStatus($status) {
-    $this->status = $status;
-    return $this;
-  }
-  
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-
-  public function __toString() {
-    if (defined('JSON_PRETTY_PRINT')) {
-      return json_encode($this, JSON_PRETTY_PRINT);
-    } else {
-      return json_encode($this);
+    
+    /**
+     * Gets id
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+  
+    /**
+     * Sets id
+     * @param int $id 
+     * @return $this
+     */
+    public function setId($id)
+    {
+        
+        $this->id = $id;
+        return $this;
+    }
+    
+    /**
+     * Gets category
+     * @return \Swagger\Client\Model\Category
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+  
+    /**
+     * Sets category
+     * @param \Swagger\Client\Model\Category $category 
+     * @return $this
+     */
+    public function setCategory($category)
+    {
+        
+        $this->category = $category;
+        return $this;
+    }
+    
+    /**
+     * Gets name
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+  
+    /**
+     * Sets name
+     * @param string $name 
+     * @return $this
+     */
+    public function setName($name)
+    {
+        
+        $this->name = $name;
+        return $this;
+    }
+    
+    /**
+     * Gets photo_urls
+     * @return string[]
+     */
+    public function getPhotoUrls()
+    {
+        return $this->photo_urls;
+    }
+  
+    /**
+     * Sets photo_urls
+     * @param string[] $photo_urls 
+     * @return $this
+     */
+    public function setPhotoUrls($photo_urls)
+    {
+        
+        $this->photo_urls = $photo_urls;
+        return $this;
+    }
+    
+    /**
+     * Gets tags
+     * @return \Swagger\Client\Model\Tag[]
+     */
+    public function getTags()
+    {
+        return $this->tags;
+    }
+  
+    /**
+     * Sets tags
+     * @param \Swagger\Client\Model\Tag[] $tags 
+     * @return $this
+     */
+    public function setTags($tags)
+    {
+        
+        $this->tags = $tags;
+        return $this;
+    }
+    
+    /**
+     * Gets status
+     * @return string
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+  
+    /**
+     * Sets status
+     * @param string $status pet status in the store
+     * @return $this
+     */
+    public function setStatus($status)
+    {
+        $allowed_values = array("available", "pending", "sold");
+        if (!in_array($status, $allowed_values)) {
+            throw new \InvalidArgumentException("Invalid value for 'status', must be one of 'available', 'pending', 'sold'");
+        }
+        $this->status = $status;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
     }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
index 3fd785f001bd..bcecb32fa7e2 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Tag
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,114 +25,182 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 /**
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Model;
 
 use \ArrayAccess;
-
-class Tag implements ArrayAccess {
-  /** @var string[] Array of property to type mappings. Used for (de)serialization */
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'name' => 'string'
-  );
-
-  /** @var string[] Array of attributes where the key is the local name, and the value is the original name */
-  static $attributeMap = array(
-      'id' => 'id',
-      'name' => 'name'
-  );
-
-  /** @var string[] Array of attributes to setter functions (for deserialization of responses) */
-  static $setters = array(
-    'id' => 'setId',
-    'name' => 'setName'
-  );
-
-  /** @var string[] Array of attributes to getter functions (for serialization of requests) */
-  static $getters = array(
-    'id' => 'getId',
-    'name' => 'getName'
-  );
-
+/**
+ * Tag Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Tag implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'name' => 'string'
+    );
   
-  /** @var int $id */
-  protected $id;
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'name' => 'name'
+    );
   
-  /** @var string $name */
-  protected $name;
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'name' => 'setName'
+    );
   
-  public function __construct(array $data = null) {
-    if ($data != null) {
-      $this->id = $data["id"];
-      $this->name = $data["name"];
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'name' => 'getName'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $name 
+      * @var string
+      */
+    protected $name;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->name = $data["name"];
+        }
     }
-  }
-  
-  /**
-   * get id
-   * @return int
-   */
-  public function getId() {
-    return $this->id;
-  }
-
-  /**
-   * set id
-   * @param int $id
-   * @return $this
-   */
-  public function setId($id) {
-    $this->id = $id;
-    return $this;
-  }
-  
-  /**
-   * get name
-   * @return string
-   */
-  public function getName() {
-    return $this->name;
-  }
-
-  /**
-   * set name
-   * @param string $name
-   * @return $this
-   */
-  public function setName($name) {
-    $this->name = $name;
-    return $this;
-  }
-  
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-
-  public function __toString() {
-    if (defined('JSON_PRETTY_PRINT')) {
-      return json_encode($this, JSON_PRETTY_PRINT);
-    } else {
-      return json_encode($this);
+    
+    /**
+     * Gets id
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+  
+    /**
+     * Sets id
+     * @param int $id 
+     * @return $this
+     */
+    public function setId($id)
+    {
+        
+        $this->id = $id;
+        return $this;
+    }
+    
+    /**
+     * Gets name
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+  
+    /**
+     * Sets name
+     * @param string $name 
+     * @return $this
+     */
+    public function setName($name)
+    {
+        
+        $this->name = $name;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
     }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
index 2bb31056bdef..1650635d8cec 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * User
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
 /**
  *  Copyright 2015 SmartBear Software
  *
@@ -14,270 +25,374 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 /**
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
  */
 
 namespace Swagger\Client\Model;
 
 use \ArrayAccess;
+/**
+ * User Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class User implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'username' => 'string',
+        'first_name' => 'string',
+        'last_name' => 'string',
+        'email' => 'string',
+        'password' => 'string',
+        'phone' => 'string',
+        'user_status' => 'int'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'username' => 'username',
+        'first_name' => 'firstName',
+        'last_name' => 'lastName',
+        'email' => 'email',
+        'password' => 'password',
+        'phone' => 'phone',
+        'user_status' => 'userStatus'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'username' => 'setUsername',
+        'first_name' => 'setFirstName',
+        'last_name' => 'setLastName',
+        'email' => 'setEmail',
+        'password' => 'setPassword',
+        'phone' => 'setPhone',
+        'user_status' => 'setUserStatus'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'username' => 'getUsername',
+        'first_name' => 'getFirstName',
+        'last_name' => 'getLastName',
+        'email' => 'getEmail',
+        'password' => 'getPassword',
+        'phone' => 'getPhone',
+        'user_status' => 'getUserStatus'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $username 
+      * @var string
+      */
+    protected $username;
+    
+    /**
+      * $first_name 
+      * @var string
+      */
+    protected $first_name;
+    
+    /**
+      * $last_name 
+      * @var string
+      */
+    protected $last_name;
+    
+    /**
+      * $email 
+      * @var string
+      */
+    protected $email;
+    
+    /**
+      * $password 
+      * @var string
+      */
+    protected $password;
+    
+    /**
+      * $phone 
+      * @var string
+      */
+    protected $phone;
+    
+    /**
+      * $user_status User Status
+      * @var int
+      */
+    protected $user_status;
+    
 
-class User implements ArrayAccess {
-  /** @var string[] Array of property to type mappings. Used for (de)serialization */
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'username' => 'string',
-      'first_name' => 'string',
-      'last_name' => 'string',
-      'email' => 'string',
-      'password' => 'string',
-      'phone' => 'string',
-      'user_status' => 'int'
-  );
-
-  /** @var string[] Array of attributes where the key is the local name, and the value is the original name */
-  static $attributeMap = array(
-      'id' => 'id',
-      'username' => 'username',
-      'first_name' => 'firstName',
-      'last_name' => 'lastName',
-      'email' => 'email',
-      'password' => 'password',
-      'phone' => 'phone',
-      'user_status' => 'userStatus'
-  );
-
-  /** @var string[] Array of attributes to setter functions (for deserialization of responses) */
-  static $setters = array(
-    'id' => 'setId',
-    'username' => 'setUsername',
-    'first_name' => 'setFirstName',
-    'last_name' => 'setLastName',
-    'email' => 'setEmail',
-    'password' => 'setPassword',
-    'phone' => 'setPhone',
-    'user_status' => 'setUserStatus'
-  );
-
-  /** @var string[] Array of attributes to getter functions (for serialization of requests) */
-  static $getters = array(
-    'id' => 'getId',
-    'username' => 'getUsername',
-    'first_name' => 'getFirstName',
-    'last_name' => 'getLastName',
-    'email' => 'getEmail',
-    'password' => 'getPassword',
-    'phone' => 'getPhone',
-    'user_status' => 'getUserStatus'
-  );
-
-  
-  /** @var int $id */
-  protected $id;
-  
-  /** @var string $username */
-  protected $username;
-  
-  /** @var string $first_name */
-  protected $first_name;
-  
-  /** @var string $last_name */
-  protected $last_name;
-  
-  /** @var string $email */
-  protected $email;
-  
-  /** @var string $password */
-  protected $password;
-  
-  /** @var string $phone */
-  protected $phone;
-  
-  /** @var int $user_status User Status */
-  protected $user_status;
-  
-  public function __construct(array $data = null) {
-    if ($data != null) {
-      $this->id = $data["id"];
-      $this->username = $data["username"];
-      $this->first_name = $data["first_name"];
-      $this->last_name = $data["last_name"];
-      $this->email = $data["email"];
-      $this->password = $data["password"];
-      $this->phone = $data["phone"];
-      $this->user_status = $data["user_status"];
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->username = $data["username"];
+            $this->first_name = $data["first_name"];
+            $this->last_name = $data["last_name"];
+            $this->email = $data["email"];
+            $this->password = $data["password"];
+            $this->phone = $data["phone"];
+            $this->user_status = $data["user_status"];
+        }
     }
-  }
-  
-  /**
-   * get id
-   * @return int
-   */
-  public function getId() {
-    return $this->id;
-  }
-
-  /**
-   * set id
-   * @param int $id
-   * @return $this
-   */
-  public function setId($id) {
-    $this->id = $id;
-    return $this;
-  }
-  
-  /**
-   * get username
-   * @return string
-   */
-  public function getUsername() {
-    return $this->username;
-  }
-
-  /**
-   * set username
-   * @param string $username
-   * @return $this
-   */
-  public function setUsername($username) {
-    $this->username = $username;
-    return $this;
-  }
-  
-  /**
-   * get first_name
-   * @return string
-   */
-  public function getFirstName() {
-    return $this->first_name;
-  }
-
-  /**
-   * set first_name
-   * @param string $first_name
-   * @return $this
-   */
-  public function setFirstName($first_name) {
-    $this->first_name = $first_name;
-    return $this;
-  }
-  
-  /**
-   * get last_name
-   * @return string
-   */
-  public function getLastName() {
-    return $this->last_name;
-  }
-
-  /**
-   * set last_name
-   * @param string $last_name
-   * @return $this
-   */
-  public function setLastName($last_name) {
-    $this->last_name = $last_name;
-    return $this;
-  }
-  
-  /**
-   * get email
-   * @return string
-   */
-  public function getEmail() {
-    return $this->email;
-  }
-
-  /**
-   * set email
-   * @param string $email
-   * @return $this
-   */
-  public function setEmail($email) {
-    $this->email = $email;
-    return $this;
-  }
-  
-  /**
-   * get password
-   * @return string
-   */
-  public function getPassword() {
-    return $this->password;
-  }
-
-  /**
-   * set password
-   * @param string $password
-   * @return $this
-   */
-  public function setPassword($password) {
-    $this->password = $password;
-    return $this;
-  }
-  
-  /**
-   * get phone
-   * @return string
-   */
-  public function getPhone() {
-    return $this->phone;
-  }
-
-  /**
-   * set phone
-   * @param string $phone
-   * @return $this
-   */
-  public function setPhone($phone) {
-    $this->phone = $phone;
-    return $this;
-  }
-  
-  /**
-   * get user_status
-   * @return int
-   */
-  public function getUserStatus() {
-    return $this->user_status;
-  }
-
-  /**
-   * set user_status
-   * @param int $user_status
-   * @return $this
-   */
-  public function setUserStatus($user_status) {
-    $this->user_status = $user_status;
-    return $this;
-  }
-  
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-
-  public function __toString() {
-    if (defined('JSON_PRETTY_PRINT')) {
-      return json_encode($this, JSON_PRETTY_PRINT);
-    } else {
-      return json_encode($this);
+    
+    /**
+     * Gets id
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+  
+    /**
+     * Sets id
+     * @param int $id 
+     * @return $this
+     */
+    public function setId($id)
+    {
+        
+        $this->id = $id;
+        return $this;
+    }
+    
+    /**
+     * Gets username
+     * @return string
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+  
+    /**
+     * Sets username
+     * @param string $username 
+     * @return $this
+     */
+    public function setUsername($username)
+    {
+        
+        $this->username = $username;
+        return $this;
+    }
+    
+    /**
+     * Gets first_name
+     * @return string
+     */
+    public function getFirstName()
+    {
+        return $this->first_name;
+    }
+  
+    /**
+     * Sets first_name
+     * @param string $first_name 
+     * @return $this
+     */
+    public function setFirstName($first_name)
+    {
+        
+        $this->first_name = $first_name;
+        return $this;
+    }
+    
+    /**
+     * Gets last_name
+     * @return string
+     */
+    public function getLastName()
+    {
+        return $this->last_name;
+    }
+  
+    /**
+     * Sets last_name
+     * @param string $last_name 
+     * @return $this
+     */
+    public function setLastName($last_name)
+    {
+        
+        $this->last_name = $last_name;
+        return $this;
+    }
+    
+    /**
+     * Gets email
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+  
+    /**
+     * Sets email
+     * @param string $email 
+     * @return $this
+     */
+    public function setEmail($email)
+    {
+        
+        $this->email = $email;
+        return $this;
+    }
+    
+    /**
+     * Gets password
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+  
+    /**
+     * Sets password
+     * @param string $password 
+     * @return $this
+     */
+    public function setPassword($password)
+    {
+        
+        $this->password = $password;
+        return $this;
+    }
+    
+    /**
+     * Gets phone
+     * @return string
+     */
+    public function getPhone()
+    {
+        return $this->phone;
+    }
+  
+    /**
+     * Sets phone
+     * @param string $phone 
+     * @return $this
+     */
+    public function setPhone($phone)
+    {
+        
+        $this->phone = $phone;
+        return $this;
+    }
+    
+    /**
+     * Gets user_status
+     * @return int
+     */
+    public function getUserStatus()
+    {
+        return $this->user_status;
+    }
+  
+    /**
+     * Sets user_status
+     * @param int $user_status User Status
+     * @return $this
+     */
+    public function setUserStatus($user_status)
+    {
+        
+        $this->user_status = $user_status;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
     }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
index 802a49bc01ad..535c623118ac 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
@@ -1,47 +1,95 @@
 <?php
+/**
+ * ObjectSerializer 
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2015 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
 namespace Swagger\Client;
 
-class ObjectSerializer {
+/**
+ * ObjectSerializer Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client 
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class ObjectSerializer
+{
 
     /**
      * Build a JSON POST object
+     *
      * @param mixed $data the data to serialize
+     *
      * @return string serialized form of $data
      */
-    public function sanitizeForSerialization($data) {
-      if (is_scalar($data) || null === $data) {
-        $sanitized = $data;
-      } else if ($data instanceof \DateTime) {
-        $sanitized = $data->format(\DateTime::ISO8601);
-      } else if (is_array($data)) {
-        foreach ($data as $property => $value) {
-          $data[$property] = $this->sanitizeForSerialization($value);
+    public function sanitizeForSerialization($data)
+    {
+        if (is_scalar($data) || null === $data) {
+            $sanitized = $data;
+        } else if ($data instanceof \DateTime) {
+            $sanitized = $data->format(\DateTime::ISO8601);
+        } else if (is_array($data)) {
+            foreach ($data as $property => $value) {
+                $data[$property] = $this->sanitizeForSerialization($value);
+            }
+            $sanitized = $data;
+        } else if (is_object($data)) {
+            $values = array();
+            foreach (array_keys($data::$swaggerTypes) as $property) {
+                $getter = $data::$getters[$property];
+                if ($data->$getter() !== null) {
+                    $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
+                }
+            }
+            $sanitized = $values;
+        } else {
+            $sanitized = (string)$data;
         }
-        $sanitized = $data;
-      } else if (is_object($data)) {
-        $values = array();
-        foreach (array_keys($data::$swaggerTypes) as $property) {
-          $getter = $data::$getters[$property];
-          if ($data->$getter() !== null) {
-            $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
-          }
-        }
-        $sanitized = $values;
-      } else {
-        $sanitized = (string)$data;
-      }
 
-      return $sanitized;
+        return $sanitized;
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the path, by url-encoding.
+     *
      * @param string $value a string which will be part of the path
+     *
      * @return string the serialized object
      */
-    public function toPathValue($value) {
-      return rawurlencode($this->toString($value));
+    public function toPathValue($value)
+    {
+        return rawurlencode($this->toString($value));
     }
 
     /**
@@ -49,103 +97,133 @@ class ObjectSerializer {
      * the query, by imploding comma-separated if it's an object.
      * If it's a string, pass through unchanged. It will be url-encoded
      * later.
+     *
      * @param object $object an object to be serialized to a string
+     *
      * @return string the serialized object
      */
-    public function toQueryValue($object) {
-      if (is_array($object)) {
-        return implode(',', $object);
-      } else {
-        return $this->toString($object);
-      }
+    public function toQueryValue($object)
+    {
+        if (is_array($object)) {
+            return implode(',', $object);
+        } else {
+            return $this->toString($object);
+        }
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the header. If it's a string, pass through unchanged
      * If it's a datetime object, format it in ISO8601
+     *
      * @param string $value a string which will be part of the header
+     *
      * @return string the header string
      */
-    public function toHeaderValue($value) {
-      return $this->toString($value);
+    public function toHeaderValue($value)
+    {
+        return $this->toString($value);
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the http body (form parameter). If it's a string, pass through unchanged
      * If it's a datetime object, format it in ISO8601
+     *
      * @param string $value the value of the form parameter
+     *
      * @return string the form string
      */
-    public function toFormValue($value) {
-      return $this->toString($value);
+    public function toFormValue($value)
+    {
+        if ($value instanceof SplFileObject) {
+            return $value->getRealPath();
+        } else {
+            return $this->toString($value);
+        }
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the parameter. If it's a string, pass through unchanged
      * If it's a datetime object, format it in ISO8601
+     *
      * @param string $value the value of the parameter
+     *
      * @return string the header string
      */
-    public function toString($value) {
-      if ($value instanceof \DateTime) { // datetime in ISO8601 format
-        return $value->format(\DateTime::ISO8601);
-      } else {
-        return $value;
-      }
+    public function toString($value)
+    {
+        if ($value instanceof \DateTime) { // datetime in ISO8601 format
+            return $value->format(\DateTime::ISO8601);
+        } else {
+            return $value;
+        }
     }
 
     /**
      * Deserialize a JSON string into an object
      *
-     * @param mixed $data object or primitive to be deserialized
-     * @param string $class class name is passed as a string
+     * @param mixed  $data       object or primitive to be deserialized
+     * @param string $class      class name is passed as a string
+     * @param string $httpHeader HTTP headers
+     *
      * @return object an instance of $class
      */
-    public function deserialize($data, $class) {
-      if (null === $data) {
-        $deserialized = null;
-      } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int]
-        $inner = substr($class, 4, -1);
-        $deserialized = array();
-        if(strrpos($inner, ",") !== false) {
-          $subClass_array = explode(',', $inner, 2);
-          $subClass = $subClass_array[1];
-          foreach ($data as $key => $value) {
-            $deserialized[$key] = $this->deserialize($value, $subClass);
-          }
+    public function deserialize($data, $class, $httpHeader=null)
+    {
+        if (null === $data) {
+            $deserialized = null;
+        } elseif (substr($class, 0, 4) === 'map[') { // for associative array e.g. map[string,int]
+            $inner = substr($class, 4, -1);
+            $deserialized = array();
+            if (strrpos($inner, ",") !== false) {
+                $subClass_array = explode(',', $inner, 2);
+                $subClass = $subClass_array[1];
+                foreach ($data as $key => $value) {
+                    $deserialized[$key] = $this->deserialize($value, $subClass);
+                }
+            }
+        } elseif (strcasecmp(substr($class, -2), '[]') == 0) {
+            $subClass = substr($class, 0, -2);
+            $values = array();
+            foreach ($data as $key => $value) {
+                $values[] = $this->deserialize($value, $subClass);
+            }
+            $deserialized = $values;
+        } elseif ($class === 'DateTime') {
+            $deserialized = new \DateTime($data);
+        } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) {
+            settype($data, $class);
+            $deserialized = $data;
+        } elseif ($class === '\SplFileObject') {
+            // determine file name
+            if (preg_match('/Content-Disposition: inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeader, $match)) {
+                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1];
+            } else {
+                $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
+            }
+            $deserialized = new \SplFileObject($filename, "w");
+            $byte_written = $deserialized->fwrite($data);
+            error_log("[INFO] Written $byte_written byte to $filename. Please move the file to a proper folder or delete the temp file after processing.\n", 3, Configuration::getDefaultConfiguration()->getDebugFile());
+      
+        } else {
+            $instance = new $class();
+            foreach ($instance::$swaggerTypes as $property => $type) {
+                $propertySetter = $instance::$setters[$property];
+     
+                if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
+                    continue;
+                }
+     
+                $propertyValue = $data->{$instance::$attributeMap[$property]};
+                if (isset($propertyValue)) {
+                    $instance->$propertySetter($this->deserialize($propertyValue, $type));
+                }
+            }
+            $deserialized = $instance;
         }
-      } elseif (strcasecmp(substr($class, -2),'[]') == 0) {
-        $subClass = substr($class, 0, -2);
-        $values = array();
-        foreach ($data as $key => $value) {
-          $values[] = $this->deserialize($value, $subClass);
-        }
-        $deserialized = $values;
-      } elseif ($class == 'DateTime') {
-        $deserialized = new \DateTime($data);
-      } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) {
-        settype($data, $class);
-        $deserialized = $data;
-      } else {
-        $instance = new $class();
-        foreach ($instance::$swaggerTypes as $property => $type) {
-          $propertySetter = $instance::$setters[$property];
-
-          if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
-            continue;
-          }
-
-          $propertyValue = $data->{$instance::$attributeMap[$property]};
-          if (isset($propertyValue)) {
-            $instance->$propertySetter($this->deserialize($propertyValue, $type));
-          }
-        }
-        $deserialized = $instance;
-      }
-
-      return $deserialized;
+     
+        return $deserialized;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php
deleted file mode 100644
index 2e4b7a08b8a0..000000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-/**
- *  Copyright 2015 SmartBear Software
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- */
-
-namespace SwaggerClient;
-
-class PetApi {
-
-  function __construct($apiClient = null) {
-    if (null === $apiClient) {
-      if (Configuration::$apiClient === null) {
-        Configuration::$apiClient = new ApiClient(); // create a new API client if not present
-        $this->apiClient = Configuration::$apiClient;
-      }
-      else
-        $this->apiClient = Configuration::$apiClient; // use the default one
-    } else {
-      $this->apiClient = $apiClient; // use the one provided by the user
-    }
-  }
-
-  private $apiClient; // instance of the ApiClient
-
-  /**
-   * get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * set the API client
-   */
-  public function setApiClient($apiClient) {
-    $this->apiClient = $apiClient;
-  }
-
-  
-  /**
-   * updatePet
-   *
-   * Update an existing pet
-   *
-   * @param Pet $body Pet object that needs to be added to the store
-   * @return void
-   */
-   public function updatePet($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "PUT";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/json','application/xml'));
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * addPet
-   *
-   * Add a new pet to the store
-   *
-   * @param Pet $body Pet object that needs to be added to the store
-   * @return void
-   */
-   public function addPet($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/json','application/xml'));
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * findPetsByStatus
-   *
-   * Finds Pets by status
-   *
-   * @param array[string] $status Status values that need to be considered for filter
-   * @return array[Pet]
-   */
-   public function findPetsByStatus($status) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet/findByStatus";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      // query params
-      if($status !== null) {
-        $queryParams['status'] = $this->apiClient->toQueryValue($status);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'array[Pet]');
-      return $responseObject;
-  }
-  
-  /**
-   * findPetsByTags
-   *
-   * Finds Pets by tags
-   *
-   * @param array[string] $tags Tags to filter by
-   * @return array[Pet]
-   */
-   public function findPetsByTags($tags) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet/findByTags";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      // query params
-      if($tags !== null) {
-        $queryParams['tags'] = $this->apiClient->toQueryValue($tags);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'array[Pet]');
-      return $responseObject;
-  }
-  
-  /**
-   * getPetById
-   *
-   * Find pet by ID
-   *
-   * @param int $pet_id ID of pet that needs to be fetched (required)
-   * @return Pet
-   */
-   public function getPetById($pet_id) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetById');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('api_key', 'petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'Pet');
-      return $responseObject;
-  }
-  
-  /**
-   * updatePetWithForm
-   *
-   * Updates a pet in the store with form data
-   *
-   * @param string $pet_id ID of pet that needs to be updated (required)
-   * @param string $name Updated name of the pet
-   * @param string $status Updated status of the pet
-   * @return void
-   */
-   public function updatePetWithForm($pet_id, $name, $status) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling updatePetWithForm');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/x-www-form-urlencoded'));
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      // form params
-      if ($name !== null) {
-        $formParams['name'] = $this->apiClient->toFormValue($name);
-      }// form params
-      if ($status !== null) {
-        $formParams['status'] = $this->apiClient->toFormValue($status);
-      }
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * deletePet
-   *
-   * Deletes a pet
-   *
-   * @param int $pet_id Pet id to delete (required)
-   * @param string $api_key 
-   * @return void
-   */
-   public function deletePet($pet_id, $api_key) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling deletePet');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      // header params
-      if($api_key !== null) {
-        $headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key);
-      }
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * uploadFile
-   *
-   * uploads an image
-   *
-   * @param int $pet_id ID of pet to update (required)
-   * @param string $additional_metadata Additional data to pass to server
-   * @param string $file file to upload
-   * @return void
-   */
-   public function uploadFile($pet_id, $additional_metadata, $file) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling uploadFile');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}/uploadImage";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('multipart/form-data'));
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      // form params
-      if ($additional_metadata !== null) {
-        $formParams['additionalMetadata'] = $this->apiClient->toFormValue($additional_metadata);
-      }// form params
-      if ($file !== null) {
-        $formParams['file'] = '@'.$this->apiClient->toFormValue($file);
-      }
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
deleted file mode 100644
index eb15f2d97cd5..000000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- *  Copyright 2015 SmartBear Software
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- */
-
-namespace SwaggerClient;
-
-class StoreApi {
-
-  function __construct($apiClient = null) {
-    if (null === $apiClient) {
-      if (Configuration::$apiClient === null) {
-        Configuration::$apiClient = new ApiClient(); // create a new API client if not present
-        $this->apiClient = Configuration::$apiClient;
-      }
-      else
-        $this->apiClient = Configuration::$apiClient; // use the default one
-    } else {
-      $this->apiClient = $apiClient; // use the one provided by the user
-    }
-  }
-
-  private $apiClient; // instance of the ApiClient
-
-  /**
-   * get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * set the API client
-   */
-  public function setApiClient($apiClient) {
-    $this->apiClient = $apiClient;
-  }
-
-  
-  /**
-   * getInventory
-   *
-   * Returns pet inventories by status
-   *
-   * @return map[string,int]
-   */
-   public function getInventory() {
-      
-
-      // parse inputs
-      $resourcePath = "/store/inventory";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('api_key');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'map[string,int]');
-      return $responseObject;
-  }
-  
-  /**
-   * placeOrder
-   *
-   * Place an order for a pet
-   *
-   * @param Order $body order placed for purchasing the pet
-   * @return Order
-   */
-   public function placeOrder($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/store/order";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'Order');
-      return $responseObject;
-  }
-  
-  /**
-   * getOrderById
-   *
-   * Find purchase order by ID
-   *
-   * @param string $order_id ID of pet that needs to be fetched (required)
-   * @return Order
-   */
-   public function getOrderById($order_id) {
-      
-      // verify the required parameter 'order_id' is set
-      if ($order_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $order_id when calling getOrderById');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/store/order/{orderId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($order_id !== null) {
-        $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->toPathValue($order_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'Order');
-      return $responseObject;
-  }
-  
-  /**
-   * deleteOrder
-   *
-   * Delete purchase order by ID
-   *
-   * @param string $order_id ID of the order that needs to be deleted (required)
-   * @return void
-   */
-   public function deleteOrder($order_id) {
-      
-      // verify the required parameter 'order_id' is set
-      if ($order_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $order_id when calling deleteOrder');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/store/order/{orderId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($order_id !== null) {
-        $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->toPathValue($order_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php
deleted file mode 100644
index 387c093dcea6..000000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php
+++ /dev/null
@@ -1,518 +0,0 @@
-<?php
-/**
- *  Copyright 2015 SmartBear Software
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- */
-
-namespace SwaggerClient;
-
-class UserApi {
-
-  function __construct($apiClient = null) {
-    if (null === $apiClient) {
-      if (Configuration::$apiClient === null) {
-        Configuration::$apiClient = new ApiClient(); // create a new API client if not present
-        $this->apiClient = Configuration::$apiClient;
-      }
-      else
-        $this->apiClient = Configuration::$apiClient; // use the default one
-    } else {
-      $this->apiClient = $apiClient; // use the one provided by the user
-    }
-  }
-
-  private $apiClient; // instance of the ApiClient
-
-  /**
-   * get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * set the API client
-   */
-  public function setApiClient($apiClient) {
-    $this->apiClient = $apiClient;
-  }
-
-  
-  /**
-   * createUser
-   *
-   * Create user
-   *
-   * @param User $body Created user object
-   * @return void
-   */
-   public function createUser($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * createUsersWithArrayInput
-   *
-   * Creates list of users with given input array
-   *
-   * @param array[User] $body List of user object
-   * @return void
-   */
-   public function createUsersWithArrayInput($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/createWithArray";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * createUsersWithListInput
-   *
-   * Creates list of users with given input array
-   *
-   * @param array[User] $body List of user object
-   * @return void
-   */
-   public function createUsersWithListInput($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/createWithList";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * loginUser
-   *
-   * Logs user into the system
-   *
-   * @param string $username The user name for login
-   * @param string $password The password for login in clear text
-   * @return string
-   */
-   public function loginUser($username, $password) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/login";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      // query params
-      if($username !== null) {
-        $queryParams['username'] = $this->apiClient->toQueryValue($username);
-      }// query params
-      if($password !== null) {
-        $queryParams['password'] = $this->apiClient->toQueryValue($password);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'string');
-      return $responseObject;
-  }
-  
-  /**
-   * logoutUser
-   *
-   * Logs out current logged in user session
-   *
-   * @return void
-   */
-   public function logoutUser() {
-      
-
-      // parse inputs
-      $resourcePath = "/user/logout";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * getUserByName
-   *
-   * Get user by user name
-   *
-   * @param string $username The name that needs to be fetched. Use user1 for testing.  (required)
-   * @return User
-   */
-   public function getUserByName($username) {
-      
-      // verify the required parameter 'username' is set
-      if ($username === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $username when calling getUserByName');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/user/{username}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'User');
-      return $responseObject;
-  }
-  
-  /**
-   * updateUser
-   *
-   * Updated user
-   *
-   * @param string $username name that need to be deleted (required)
-   * @param User $body Updated user object
-   * @return void
-   */
-   public function updateUser($username, $body) {
-      
-      // verify the required parameter 'username' is set
-      if ($username === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/user/{username}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "PUT";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
-      }
-      
-      // body params
-      $_tempBody = null;
-      if (isset($body)) {
-        $_tempBody = $body;
-      }
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * deleteUser
-   *
-   * Delete user
-   *
-   * @param string $username The name that needs to be deleted (required)
-   * @return void
-   */
-   public function deleteUser($username) {
-      
-      // verify the required parameter 'username' is set
-      if ($username === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $username when calling deleteUser');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/user/{username}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php
new file mode 100644
index 000000000000..7672667a2358
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php
@@ -0,0 +1,38 @@
+<?php
+
+require_once('autoload.php');
+
+class OrderApiTest extends \PHPUnit_Framework_TestCase
+{
+
+    // add a new pet (id 10005) to ensure the pet object is available for all the tests
+    public static function setUpBeforeClass() {
+        // for error reporting (need to run with php5.3 to get no warning)
+        //ini_set('display_errors', 1);
+        //error_reporting(~0);
+    }
+  
+    // test get inventory
+    public function testOrder()
+    {
+        // initialize the API client
+        $order = new Swagger\Client\Model\Order();
+  
+        $order->setStatus("placed");
+        $this->assertSame("placed", $order->getStatus());
+    }
+ 
+    /**
+     * @expectedException InvalidArgumentException
+     */ 
+    public function testOrderException()
+    {
+        // initialize the API client
+        $order = new Swagger\Client\Model\Order();
+        $order->setStatus("invalid_value");
+    }
+  
+}
+
+?>
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
index 3ac287722915..fe818069dac5 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
@@ -10,9 +10,11 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
     // for error reporting (need to run with php5.3 to get no warning)
     //ini_set('display_errors', 1);
     //error_reporting(~0);
-    ini_set('display_startup_errors',1);
-    ini_set('display_errors',1);
-    error_reporting(-1);
+    // when running with php5.5, comment out below to skip the warning about
+    // using @ to handle file upload
+    //ini_set('display_startup_errors',1);
+    //ini_set('display_errors',1);
+    //error_reporting(-1);
 
     // enable debugging 
     //Swagger\Client\Configuration::$debug = true;
@@ -68,9 +70,11 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
     $this->assertFalse(isset($defaultHeader['test2']));
 
     $pet_api2 = new Swagger\Client\Api\PetAPI();
-    $apiClient3 = new Swagger\Client\ApiClient();
+    $config3 = new Swagger\Client\Configuration();
+    $apiClient3 = new Swagger\Client\ApiClient($config3);
     $apiClient3->getConfig()->setUserAgent('api client 3');
-    $apiClient4 = new Swagger\Client\ApiClient();
+    $config4 = new Swagger\Client\Configuration();
+    $apiClient4 = new Swagger\Client\ApiClient($config4);
     $apiClient4->getConfig()->setUserAgent('api client 4');
     $pet_api3 = new Swagger\Client\Api\PetAPI($apiClient3);
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
index 05bd873c993d..fcba8adf20ad 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
@@ -10,6 +10,27 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
     // for error reporting (need to run with php5.3 to get no warning)
     //ini_set('display_errors', 1);
     //error_reporting(~0);
+    // new pet
+    $new_pet_id = 10005;
+    $new_pet = new Swagger\Client\Model\Pet;
+    $new_pet->setId($new_pet_id);
+    $new_pet->setName("PHP Unit Test");
+    $new_pet->setStatus("available");
+    // new tag
+    $tag= new Swagger\Client\Model\Tag;
+    $tag->setId($new_pet_id); // use the same id as pet
+    $tag->setName("test php tag");
+    // new category
+    $category = new Swagger\Client\Model\Category;
+    $category->setId($new_pet_id); // use the same id as pet
+    $category->setName("test php category");
+
+    $new_pet->setTags(array($tag));
+    $new_pet->setCategory($category);
+
+    $pet_api = new Swagger\Client\Api\PetAPI();
+    // add a new pet (model)
+    $add_response = $pet_api->addPet($new_pet);
   }
 
   // test get inventory
@@ -22,8 +43,7 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
     // get inventory
     $get_response = $store_api->getInventory();
 
-    $this->assertInternalType("int", $get_response['sold']);
-    $this->assertInternalType("int", $get_response['pending']);
+    $this->assertInternalType("int", $get_response['available']);
 
   }
 
diff --git a/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/apigen.neon b/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/apigen.neon
deleted file mode 100644
index c067c2c290f2..000000000000
--- a/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/apigen.neon
+++ /dev/null
@@ -1,5 +0,0 @@
-main:     Contrib
-title:    php-coveralls
-internal: yes
-todo:     yes
-wipeout:  yes
diff --git a/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/phpcs.xml b/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/phpcs.xml
deleted file mode 100644
index 82a58e1b3244..000000000000
--- a/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/phpcs.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="PHP">
-    <description>The coding standard for standard PHP application</description>
-    <exclude-pattern>*/img/*</exclude-pattern>
-    <exclude-pattern>*/images/*</exclude-pattern>
-    <exclude-pattern>*/less/*</exclude-pattern>
-    <exclude-pattern>*/css/*</exclude-pattern>
-    <exclude-pattern>*/js/*</exclude-pattern>
-    <exclude-pattern>*.html</exclude-pattern>
-    <exclude-pattern>*.twig</exclude-pattern>
-    <exclude-pattern>*.yml</exclude-pattern>
-    <exclude-pattern>*.xml</exclude-pattern>
-    <exclude-pattern>*.txt</exclude-pattern>
-    <exclude-pattern>*.less</exclude-pattern>
-    <exclude-pattern>*.css</exclude-pattern>
-    <exclude-pattern>*.js</exclude-pattern>
-    <exclude-pattern>*.jpg</exclude-pattern>
-    <exclude-pattern>*.jpeg</exclude-pattern>
-    <exclude-pattern>*.png</exclude-pattern>
-    <exclude-pattern>*.gif</exclude-pattern>
-
-    <!-- Include the whole PSR-2 standard -->
-    <rule ref="PSR2"/>
-    <rule ref="Generic.Files.LineLength">
-        <properties>
-            <property name="lineLimit" value="140"/>
-            <property name="absoluteLineLimit" value="0"/>
-        </properties>
-    </rule>
-
-</ruleset>
diff --git a/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/phpmd.xml b/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/phpmd.xml
deleted file mode 100644
index 27d3193e749f..000000000000
--- a/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/build/config/phpmd.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="My first PHPMD rule set"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
-        http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="
-        http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-    <description>My custom rule set that checks my code...</description>
-
-    <!-- Import the entire unused code rule set -->
-    <rule ref="rulesets/unusedcode.xml" />
-    <rule ref="rulesets/design.xml" />
-
-    <rule ref="rulesets/naming.xml">
-        <exclude name="ShortVariable"/>
-        <exclude name="LongVariable"/>
-    </rule>
-    <rule ref="rulesets/naming.xml/ShortVariable">
-        <properties>
-            <property name="minimum" value="2" />
-        </properties>
-    </rule>
-    <rule ref="rulesets/naming.xml/LongVariable">
-        <properties>
-            <property name="maximum" value="30" />
-        </properties>
-    </rule>
-
-    <rule ref="rulesets/codesize.xml">
-        <exclude name="TooManyMethods"/>
-        <exclude name="ExcessiveClassComplexity"/>
-    </rule>
-    <rule ref="rulesets/codesize.xml/TooManyMethods">
-        <properties>
-            <property name="maxmethods" value="20" />
-        </properties>
-    </rule>
-    <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity">
-        <properties>
-            <property name="maximum" value="70" />
-        </properties>
-    </rule>
-</ruleset>
diff --git a/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/travis/empty b/samples/client/petstore/php/SwaggerClient/vendor/satooshi/php-coveralls/travis/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/samples/client/petstore/php/test.php b/samples/client/petstore/php/test.php
index f5383a9a4dc5..79cc4ca4ad75 100644
--- a/samples/client/petstore/php/test.php
+++ b/samples/client/petstore/php/test.php
@@ -5,21 +5,26 @@ require_once(__DIR__ . '/SwaggerClient-php/autoload.php');
 //ini_set('display_errors', 1);
 //error_reporting(~0);
 
-// initialize the API client
-//$api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
-//$api_client->addDefaultHeader("test1", "value1");
-
 // to enable logging
-//SwaggerClient\Configuration::$debug = true;
-//SwaggerClient\Configuration::$debug_file = '/var/tmp/php_debug.log';
+//Swagger\Client\Configuration::$debug = true;
+//Swagger\Client\Configuration::$debug_file = '/var/tmp/php_debug.log';
+
+// to debug report
+print Swagger\Client\Configuration::toDebugReport();
+
+// to change temp folder path
+Swagger\Client\Configuration::getDefaultConfiguration()->setTempFolderPath('/var/tmp/php/');
 
 $petId = 10005; // ID of pet that needs to be fetched
 try {
     // get pet by id
-    //$pet_api = new SwaggerClient\PetAPI($api_client);
+    //$api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+    //$api_client->getConfig()->addDefaultHeader("test1", "value1");
+    //$pet_api = new Swagger\Client\PetAPI($api_client);
     $pet_api = new Swagger\Client\Api\PetAPI();
+    $pet_api->getApiClient()->getConfig()->setTempFolderPath('/var/tmp/php/');
     // test default header
-    $pet_api->getApiClient()->addDefaultHeader("TEST_API_KEY", "09182sdkanafndsl903");
+    //$pet_api->getApiClient()->addDefaultHeader("TEST_API_KEY", "09182sdkanafndsl903");
     // return Pet (model)
     $response = $pet_api->getPetById($petId);
     // to test __toString()
@@ -28,28 +33,28 @@ try {
     // add pet (post json)
     $new_pet_id = 10005;
     $new_pet = new Swagger\Client\Model\Pet;
-    $new_pet->id = $new_pet_id;
-    $new_pet->name = "PHP Unit Test";
+    $new_pet->setId($new_pet_id);
+    $new_pet->setName("PHP Unit Test");
     // new tag
     $tag= new Swagger\Client\Model\Tag;
-    $tag->id = $new_pet_id; // use the same id as pet
+    $tag->setId($new_pet_id); // use the same id as pet
     //$tag->name = "test php tag";
     // new category
     $category = new Swagger\Client\Model\Category;
-    $category->id = 0; // use the same id as pet
+    $category->setId(10005); // use the same id as pet
     //$category->name = "test php category";
 
-    $new_pet->tags = array($tag);
-    $new_pet->category = $category;
+    $new_pet->setTags(array($tag));
+    $new_pet->setCategory($category);
 
     $pet_api = new Swagger\Client\Api\PetAPI();
     // add a new pet (model)
     $add_response = $pet_api->addPet($new_pet);
 
-    // test upload file (exception)
+    // test upload file (should return exception)
     $upload_response = $pet_api->uploadFile($petId, "test meta", NULL);
 
-} catch (Swagger\Client\Exception $e) {
+} 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";