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 5bf8400577d..e2ddba4bf34 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
@@ -1,5 +1,6 @@
 package io.swagger.codegen.languages;
 
+import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -18,7 +19,9 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "Swagger\\Client";
     protected String groupId = "swagger";
     protected String artifactId = "swagger-client";
+    protected String packagePath = "SwaggerClient-php";
     protected String artifactVersion = null;
+    protected String srcBasePath = "lib";
 
     public PhpClientCodegen() {
         super();
@@ -38,6 +41,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         additionalProperties.put("invokerPackage", invokerPackage);
         additionalProperties.put("modelPackage", modelPackage);
         additionalProperties.put("apiPackage", apiPackage);
+        additionalProperties.put("srcBasePath", srcBasePath);
         additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\"));
         additionalProperties.put("groupId", groupId);
         additionalProperties.put("artifactId", artifactId);
@@ -81,16 +85,13 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("list", "array");
         typeMapping.put("object", "object");
         typeMapping.put("DateTime", "\\DateTime");
-
-        supportingFiles.add(new SupportingFile("composer.mustache", getPackagePath(), "composer.json"));
-        supportingFiles.add(new SupportingFile("configuration.mustache", toPackagePath(invokerPackage, "lib"), "Configuration.php"));
-        supportingFiles.add(new SupportingFile("ApiClient.mustache", toPackagePath(invokerPackage, "lib"), "ApiClient.php"));
-        supportingFiles.add(new SupportingFile("ApiException.mustache", toPackagePath(invokerPackage, "lib"), "ApiException.php"));
-        supportingFiles.add(new SupportingFile("autoload.mustache", getPackagePath(), "autoload.php"));
+        
+        cliOptions.add(new CliOption("packagePath", "main package name for classes"));
+        cliOptions.add(new CliOption("srcBasePath", "directory directory under packagePath to serve as source root"));
     }
 
     public String getPackagePath() {
-        return "SwaggerClient-php";
+        return packagePath;
     }
 
     public String toPackagePath(String packageName, String basePath) {
@@ -134,6 +135,39 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         return "Generates a PHP client library.";
     }
 
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("packagePath")) {
+            this.setPackagePath((String) additionalProperties.get("packagePath"));
+        }
+
+        if (additionalProperties.containsKey("srcBasePath")) {
+            this.setSrcBasePath((String) additionalProperties.get("srcBasePath"));
+        }
+
+        if (additionalProperties.containsKey("modelPackage")) {
+            this.setModelPackage((String) additionalProperties.get("modelPackage"));
+        }
+
+        if (additionalProperties.containsKey("apiPackage")) {
+            this.setApiPackage((String) additionalProperties.get("apiPackage"));
+        }
+
+        additionalProperties.put("srcBasePath", srcBasePath);
+        additionalProperties.put("modelPackage", modelPackage);
+        additionalProperties.put("apiPackage", apiPackage);
+        additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\"));
+
+        supportingFiles.add(new SupportingFile("configuration.mustache", toPackagePath(invokerPackage, srcBasePath), "Configuration.php"));
+        supportingFiles.add(new SupportingFile("ApiClient.mustache", toPackagePath(invokerPackage, srcBasePath), "ApiClient.php"));
+        supportingFiles.add(new SupportingFile("ApiException.mustache", toPackagePath(invokerPackage, srcBasePath), "ApiException.php"));
+        supportingFiles.add(new SupportingFile("ObjectSerializer.mustache", toPackagePath(invokerPackage, srcBasePath), "ObjectSerializer.php"));
+        supportingFiles.add(new SupportingFile("composer.mustache", getPackagePath(), "composer.json"));
+        supportingFiles.add(new SupportingFile("autoload.mustache", getPackagePath(), "autoload.php"));
+    }
+
     @Override
     public String escapeReservedWord(String name) {
         return "_" + name;
@@ -141,11 +175,11 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + File.separator + toPackagePath(apiPackage(), "lib"));
+        return (outputFolder + "/" + toPackagePath(apiPackage(), srcBasePath));
     }
 
     public String modelFileFolder() {
-        return (outputFolder + File.separator + toPackagePath(modelPackage(), "lib"));
+        return (outputFolder + "/" + toPackagePath(modelPackage(), srcBasePath));
     }
 
     @Override
@@ -198,6 +232,17 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         return "null";
     }
 
+    public void setInvokerPackage(String invokerPackage) {
+        this.invokerPackage = invokerPackage;
+    }
+
+    public void setPackagePath(String packagePath) {
+        this.packagePath = packagePath;
+    }
+
+    public void setSrcBasePath(String srcBasePath) {
+        this.srcBasePath = srcBasePath;
+    }
 
     @Override
     public String toVarName(String name) {
@@ -235,5 +280,4 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         // should be the same as the model name
         return toModelName(name);
     }
-
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
index 9badb4dbb37..2862a0e0538 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
@@ -25,141 +25,60 @@ class ApiClient {
   public static $PUT = "PUT";
   public static $DELETE = "DELETE";
 
-  /** @var string[] Array of default headers where the key is the header name and the value is the header value */
-  private $default_header = array();
+  /** @var Configuration */
+  protected $config;
 
-  /** @var string timeout (second) of the HTTP request, by default set to 0, no timeout */
-  protected $curl_timeout = 0;
-
-  /** @var string user agent of the HTTP request, set to "PHP-Swagger" by default */
-  protected $user_agent = "PHP-Swagger";
+  /** @var ObjectSerializer */
+  protected $serializer;
 
   /**
-   * @param string $host Base url of the API server (optional)
+   * @param Configuration $config config for this ApiClient
    */
-  function __construct($host = null) {
-    if ($host === null) {
-      $this->host = '{{basePath}}';
-    } else {
-      $this->host = $host;
+  function __construct(Configuration $config = null) {
+    if ($config == null) {
+      $config = Configuration::getDefaultConfiguration();
     }
+    
+    $this->config = $config;
+    $this->serializer = new ObjectSerializer();
   }
 
   /**
-   * add default header 
-   *
-   * @param string $header_name header name (e.g. Token)
-   * @param string $header_value header value (e.g. 1z8wp3)
+   * get the config
+   * @return Configuration
    */
-  public function addDefaultHeader($header_name, $header_value) {
-    if (!is_string($header_name)) 
-      throw new \InvalidArgumentException('Header name must be a string.');
-
-    $this->default_header[$header_name] =  $header_value;
+  public function getConfig() {
+    return $this->config;
   }
 
   /**
-   * get the default header 
-   *
-   * @return array default header
+   * get the serializer
+   * @return ObjectSerializer
    */
-  public function getDefaultHeader() {
-    return $this->default_header;
+  public function getSerializer() {
+    return $this->serializer;
   }
 
-  /**
-   * delete the default header based on header name
-   *
-   * @param string $header_name header name (e.g. Token)
-   */
-  public function deleteDefaultHeader($header_name) {
-    unset($this->default_header[$header_name]);
-  }
-
-  /**
-   * set the user agent of the api client
-   *
-   *  @param string $user_agent the user agent of the api client
-   */
-  public function setUserAgent($user_agent) {
-    if (!is_string($user_agent))
-      throw new \InvalidArgumentException('User-agent must be a string.');
-
-    $this->user_agent= $user_agent;
-  }
-
-  /**
-   * get the user agent of the api client
-   * 
-   * @return string user agent
-   */
-  public function getUserAgent($user_agent) {
-    return $this->user_agent;
-  }
-
-  /**
-   * set the HTTP timeout value
-   *
-   * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
-   */
-  public function setTimeout($seconds) {
-    if (!is_numeric($seconds) || $seconds < 0)
-      throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
-
-    $this->curl_timeout = $seconds;
-  }
-
-  /**
-   * get the HTTP timeout value
-   *
-   * @return string HTTP timeout value
-   */
-  public function getTimeout() {
-    return $this->curl_timeout;
-  }
-
-
   /**
    * Get API key (with prefix if set)
-   * @param string key name
+   * @param string $apiKey name of apikey
    * @return string API key with the prefix
    */
   public function getApiKeyWithPrefix($apiKey) {
-    if (isset(Configuration::$apiKeyPrefix[$apiKey])) {
-      return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey];
-    } else if (isset(Configuration::$apiKey[$apiKey])) {
-      return Configuration::$apiKey[$apiKey];
+    $prefix = $this->config->getApiKeyPrefix($apiKey);
+    $apiKey = $this->config->getApiKey($apiKey);
+
+    if (!isset($apiKey)) {
+      return null;
+    }
+
+    if (isset($prefix)) {
+      $keyWithPrefix = $prefix." ".$apiKey;
     } else {
-      return;
+      $keyWithPrefix = $apiKey;
     }
-  }
 
-  /**
-   * update hearder and query param based on authentication setting
-   * 
-   * @param array $headerParams header parameters (by ref)
-   * @param array $queryParams query parameters (by ref)
-   * @param array $authSettings array of authentication scheme (e.g ['api_key'])
-   */
-  public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings)
-  {
-    if (count($authSettings) == 0)
-      return;
-
-    // one endpoint can have more than 1 auth settings
-    foreach($authSettings as $auth) {
-      // determine which one to use
-      switch($auth) {
-        {{#authMethods}}
-        case '{{name}}':
-          {{#isApiKey}}{{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode(Configuration::$username.":".Configuration::$password);{{/isBasic}}
-          {{#isOAuth}}//TODO support oauth{{/isOAuth}}
-          break;
-        {{/authMethods}}
-        default:
-          //TODO show warning about security definition not found
-      }
-    }
+    return $keyWithPrefix;
   }
   
   /**
@@ -168,18 +87,15 @@ class ApiClient {
    * @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, $authSettings) {
+  public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams) {
 
     $headers = array();
 
-    # determine authentication setting
-    $this->updateParamsForAuth($headerParams, $queryParams, $authSettings);
-
     # construct the http header
-    $headerParams = array_merge((array)$this->default_header, (array)$headerParams);
+    $headerParams = array_merge((array)$this->config->getDefaultHeaders(), (array)$headerParams);
 
     foreach ($headerParams as $key => $val) {
       $headers[] = "$key: $val";
@@ -190,15 +106,15 @@ class ApiClient {
       $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->sanitizeForSerialization($postData));
+      $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
     }
 
-    $url = $this->host . $resourcePath;
+    $url = $this->config->getHost() . $resourcePath;
 
     $curl = curl_init();
     // set timeout, if needed
-    if ($this->curl_timeout != 0) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
+    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);
@@ -227,14 +143,14 @@ class ApiClient {
     curl_setopt($curl, CURLOPT_URL, $url);
 
     // Set user agent
-    curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
+    curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
 
     // debugging for curl
-    if (Configuration::$debug) {
-      error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file);
+    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(Configuration::$debug_file, 'a'));
+      curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
     } else {
       curl_setopt($curl, CURLOPT_VERBOSE, 0);
     }
@@ -250,8 +166,8 @@ class ApiClient {
     $response_info = curl_getinfo($curl);
 
     // debug HTTP response body
-    if (Configuration::$debug) {
-        error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file);
+    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
@@ -269,153 +185,13 @@ class ApiClient {
     return $data;
   }
 
-  /**
-   * Build a JSON POST object
-   */
-  protected 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) {
-        if ($data->$property !== null) {
-          $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property);
-        }
-      }
-      $sanitized = $values;
-    } else {
-      $sanitized = (string)$data;
-    }
-
-    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));
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * 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);
-        }
-  }
-
-  /**
-   * 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);
-  }
-
-  /**
-   * 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);
-  }
-
-  /**
-   * 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;
-    }
-   }
-
-  /**
-   * Deserialize a JSON string into an object
-   *
-   * @param object $object object or primitive to be deserialized
-   * @param string $class class name is passed as a string
-   * @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);
-        }        
-      }
-    } 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) {
-        $original_property_name = $instance::$attributeMap[$property];
-        if (isset($original_property_name) && isset($data->$original_property_name)) {
-          $instance->$property = $this->deserialize($data->$original_property_name, $type);
-        }
-      }
-      $deserialized = $instance;
-    }
-
-    return $deserialized;
-  }
-
   /*
    * return the header 'Accept' based on an array of Accept provided
    *
-   * @param array[string] $accept Array of header
+   * @param string[] $accept Array of header
    * @return string Accept (e.g. application/json)
    */
-  public function selectHeaderAccept($accept) {
+  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)) {
@@ -428,10 +204,10 @@ class ApiClient {
   /*
    * return the content type based on an array of content-type provided
    *
-   * @param array[string] content_type_array Array fo content-type
+   * @param string[] content_type_array Array fo content-type
    * @return string Content-Type (e.g. application/json)
    */
-  public function selectHeaderContentType($content_type) {
+  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)) {
@@ -440,6 +216,4 @@ class ApiClient {
       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 a835d579d32..6d5415f798d 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
@@ -22,15 +22,20 @@ use \Exception;
 class ApiException extends Exception {
 
   /** @var string The HTTP body of the server response. */
-  protected $response_body;
+  protected $responseBody;
 
   /** @var string[] The HTTP header of the server response. */
-  protected $response_headers;
+  protected $responseHeaders;
+
+  /**
+   * The deserialized response object
+   */
+  protected $responseObject;
 
   public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null) {
     parent::__construct($message, $code);
-    $this->response_headers = $responseHeaders;
-    $this->response_body = $responseBody;
+    $this->responseHeaders = $responseHeaders;
+    $this->responseBody = $responseBody;
   }
 
   /**
@@ -39,7 +44,7 @@ class ApiException extends Exception {
    * @return string HTTP response header
    */
   public function getResponseHeaders() {
-    return $this->response_headers;
+    return $this->responseHeaders;
   }
 
   /**
@@ -48,7 +53,18 @@ class ApiException extends Exception {
    * @return string HTTP response body
    */
   public function getResponseBody() {
-    return $this->response_body;
+    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;
+  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
new file mode 100644
index 00000000000..56a61e97c91
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
@@ -0,0 +1,151 @@
+<?php
+namespace {{invokerPackage}};
+
+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);
+        }
+        $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;
+    }
+
+    /**
+     * 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));
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * 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);
+      }
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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;
+      }
+    }
+
+    /**
+     * 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
+     * @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);
+          }
+        }
+      } 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;
+    }
+}
\ 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 3ed7f18c579..cd483ffa881 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -22,31 +22,29 @@
 
 namespace {{apiPackage}};
 
-use \{{invokerPackage}}\ApiClient;
 use \{{invokerPackage}}\Configuration;
+use \{{invokerPackage}}\ApiClient;
+use \{{invokerPackage}}\ApiException;
+use \{{invokerPackage}}\ObjectSerializer;
 
 {{#operations}}
 class {{classname}} {
 
-  /**
-   * @param \{{invokerPackage}}\ApiClient|null $apiClient The api client to use. Defaults to getting it from Configuration
-   */
-  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
-    }
-  }
-
   /** @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
    */
@@ -55,10 +53,12 @@ class {{classname}} {
   }
 
   /**
-   * @param \{{invokerPackage}} $apiClient set the API client
+   * @param \{{invokerPackage}}\ApiClient $apiClient set the API client
+   * @return {{classname}}
    */
-  public function setApiClient($apiClient) {
+  public function setApiClient(ApiClient $apiClient) {
     $this->apiClient = $apiClient;
+    return $this;
   }
 
   {{#operation}}
@@ -69,6 +69,7 @@ class {{classname}} {
    *
 {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+   * @throws \{{invokerPackage}}\ApiException on non-2xx response
    */
    public function {{nickname}}({{#allParams}}${{paramName}}{{#optional}}=null{{/optional}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
       {{#allParams}}{{#required}}
@@ -86,28 +87,29 @@ class {{classname}} {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}));
+      $_header_accept = ApiClient::selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}));
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}));
 
       {{#queryParams}}// query params
       if(${{paramName}} !== null) {
-        $queryParams['{{baseName}}'] = $this->apiClient->toQueryValue(${{paramName}});
+        $queryParams['{{baseName}}'] = $this->apiClient->getSerializer()->toQueryValue(${{paramName}});
       }{{/queryParams}}
       {{#headerParams}}// header params
       if(${{paramName}} !== null) {
-        $headerParams['{{baseName}}'] = $this->apiClient->toHeaderValue(${{paramName}});
+        $headerParams['{{baseName}}'] = $this->apiClient->getSerializer()->toHeaderValue(${{paramName}});
       }{{/headerParams}}
       {{#pathParams}}// path params
       if(${{paramName}} !== null) {
         $resourcePath = str_replace("{" . "{{baseName}}" . "}",
-                                    $this->apiClient->toPathValue(${{paramName}}), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue(${{paramName}}),
+                                    $resourcePath);
       }{{/pathParams}}
       {{#formParams}}// form params
       if (${{paramName}} !== null) {
-        $formParams['{{baseName}}'] = {{#isFile}}'@'.{{/isFile}}$this->apiClient->toFormValue(${{paramName}});
+        $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->getSerializer()->toFormValue(${{paramName}});
       }{{/formParams}}
       {{#bodyParams}}// body params
       $_tempBody = null;
@@ -122,22 +124,38 @@ class {{classname}} {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array({{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}});
-
+      {{#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
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-      {{#returnType}}if(! $response) {
+      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}}
+        }
+
+        throw $e;
+      }
+      {{#returnType}}
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'{{returnType}}');
-      return $responseObject;{{/returnType}}
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'{{returnType}}');
+      return $responseObject;
+      {{/returnType}}
   }
   {{/operation}}
-{{newline}}
-{{/operations}}
 }
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/php/autoload.mustache b/modules/swagger-codegen/src/main/resources/php/autoload.mustache
index 4f56a6e20c0..04be6e11992 100644
--- a/modules/swagger-codegen/src/main/resources/php/autoload.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/autoload.mustache
@@ -4,7 +4,7 @@
  * 
  * After registering this autoload function with SPL, the following line
  * would cause the function to attempt to load the \{{invokerPackage}}\Baz\Qux class
- * from /path/to/project/lib/Baz/Qux.php:
+ * from /path/to/project/{{srcBasePath}}/Baz/Qux.php:
  * 
  *      new \{{invokerPackage}}\Baz\Qux;
  *      
@@ -17,7 +17,7 @@ spl_autoload_register(function ($class) {
     $prefix = '{{escapedInvokerPackage}}\\';
 
     // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/lib/';
+    $base_dir = __DIR__ . '/{{srcBasePath}}/';
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index f4e38c84f73..d36267617c4 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -28,6 +28,6 @@
     "squizlabs/php_codesniffer": "~2.0"
   },
   "autoload": {
-    "psr-4": { "{{escapedInvokerPackage}}\\" : "lib/" }
+    "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 030910ffca7..b85ad289418 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -17,37 +17,250 @@
 
 namespace {{invokerPackage}};
 
-use \{{invokerPackage}}\ApiClient;
-
 class Configuration {
 
+  private static $defaultConfiguration = null;
+
   /** @var string[] Associate array to store API key(s) */
-  public static $apiKey = array();
+  protected $apiKeys = array();
 
   /** string[] Associate array to store API prefix (e.g. Bearer) */
-  public static $apiKeyPrefix = array();
+  protected $apiKeyPrefixes = array();
 
   /** @var string Username for HTTP basic authentication */
-  public static $username = '';
+  protected $username = '';
 
   /** @var string Password for HTTP basic authentication */
-  public static $password = '';
+  protected $password = '';
 
   /** @var \{{invokerPackage}}\ApiClient The default instance of ApiClient */
-  public static $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) */
-  public static $debug = false;
+  protected $debug = false;
 
   /** @var string Debug file location (log to STDOUT by default) */
-  public static $debug_file = 'php://output';
+  protected $debugFile = 'php://output';
 
-  /*
-   *  manually initalize  ApiClient
+  /**
+   * @param string $key
+   * @param string $value
+   * @return Configuration
    */
-  public static function init() {
-    if (self::$apiClient === null)
-      self::$apiClient = new ApiClient();
+  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.');
+    }
+
+    $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.');
+    }
+
+    $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.');
+    }
+
+    $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();
+    }
+
+    return self::$defaultConfiguration;
+  }
+
+  public static function setDefaultConfiguration(Configuration $config) {
+    self::$defaultConfiguration = $config;
+  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index cc2d57197ab..35795bf8c0b 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -40,18 +40,48 @@ class {{classname}} implements ArrayAccess {
       {{#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}}*/
-  public ${{name}};
+  protected ${{name}};
   {{/vars}}
-  /**
-   * @param mixed[] Array of parameters to initialize the object with
-   */
   public function __construct(array $data = null) {
-    {{#vars}}$this->{{name}} = @$data["{{name}}"];{{#hasMore}}
-    {{/hasMore}}{{/vars}}
+    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);
   }
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 7fe7b70312e..e6d8fcd2c8c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -22,30 +22,28 @@
 
 namespace Swagger\Client\Api;
 
-use \Swagger\Client\ApiClient;
 use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
 
 class PetApi {
 
-  /**
-   * @param \Swagger\Client\ApiClient|null $apiClient The api client to use. Defaults to getting it from Configuration
-   */
-  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
-    }
-  }
-
   /** @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');
+    }
+
+    $this->apiClient = $apiClient;
+  }
+
   /**
    * @return \Swagger\Client\ApiClient get the API client
    */
@@ -54,10 +52,12 @@ class PetApi {
   }
 
   /**
-   * @param \Swagger\Client $apiClient set the API client
+   * @param \Swagger\Client\ApiClient $apiClient set the API client
+   * @return PetApi
    */
-  public function setApiClient($apiClient) {
+  public function setApiClient(ApiClient $apiClient) {
     $this->apiClient = $apiClient;
+    return $this;
   }
 
   
@@ -68,6 +68,7 @@ class PetApi {
    *
    * @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) {
       
@@ -80,11 +81,11 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = 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'));
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
 
       
       
@@ -103,14 +104,21 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -121,6 +129,7 @@ class PetApi {
    *
    * @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) {
       
@@ -133,11 +142,11 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = 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'));
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
 
       
       
@@ -156,14 +165,21 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -174,6 +190,7 @@ class PetApi {
    *
    * @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) {
       
@@ -186,15 +203,15 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       // query params
       if($status !== null) {
-        $queryParams['status'] = $this->apiClient->toQueryValue($status);
+        $queryParams['status'] = $this->apiClient->getSerializer()->toQueryValue($status);
       }
       
       
@@ -208,20 +225,33 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-      if(! $response) {
+      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;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'\Swagger\Client\Model\Pet[]');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Pet[]');
       return $responseObject;
+      
   }
   
   /**
@@ -231,6 +261,7 @@ class PetApi {
    *
    * @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) {
       
@@ -243,15 +274,15 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       // query params
       if($tags !== null) {
-        $queryParams['tags'] = $this->apiClient->toQueryValue($tags);
+        $queryParams['tags'] = $this->apiClient->getSerializer()->toQueryValue($tags);
       }
       
       
@@ -265,20 +296,33 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-      if(! $response) {
+      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;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'\Swagger\Client\Model\Pet[]');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Pet[]');
       return $responseObject;
+      
   }
   
   /**
@@ -288,6 +332,7 @@ class PetApi {
    *
    * @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) {
       
@@ -305,18 +350,19 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
       // path params
       if($pet_id !== null) {
         $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
+                                    $resourcePath);
       }
       
       
@@ -328,20 +374,40 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('api_key', 'petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
+      $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+      if (isset($apiKey)) {
+        $headerParams['api_key'] = $apiKey;
+      }
+      
+      
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-      if(! $response) {
+      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;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'\Swagger\Client\Model\Pet');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Pet');
       return $responseObject;
+      
   }
   
   /**
@@ -353,6 +419,7 @@ class PetApi {
    * @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) {
       
@@ -370,25 +437,26 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = 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'));
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/x-www-form-urlencoded'));
 
       
       
       // path params
       if($pet_id !== null) {
         $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
+                                    $resourcePath);
       }
       // form params
       if ($name !== null) {
-        $formParams['name'] = $this->apiClient->toFormValue($name);
+        $formParams['name'] = $this->apiClient->getSerializer()->toFormValue($name);
       }// form params
       if ($status !== null) {
-        $formParams['status'] = $this->apiClient->toFormValue($status);
+        $formParams['status'] = $this->apiClient->getSerializer()->toFormValue($status);
       }
       
 
@@ -399,14 +467,21 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -418,6 +493,7 @@ class PetApi {
    * @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) {
       
@@ -435,21 +511,22 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       // header params
       if($api_key !== null) {
-        $headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key);
+        $headerParams['api_key'] = $this->apiClient->getSerializer()->toHeaderValue($api_key);
       }
       // path params
       if($pet_id !== null) {
         $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
+                                    $resourcePath);
       }
       
       
@@ -461,14 +538,21 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -481,6 +565,7 @@ class PetApi {
    * @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) {
       
@@ -498,25 +583,26 @@ class PetApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = 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'));
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('multipart/form-data'));
 
       
       
       // path params
       if($pet_id !== null) {
         $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($pet_id),
+                                    $resourcePath);
       }
       // form params
       if ($additional_metadata !== null) {
-        $formParams['additionalMetadata'] = $this->apiClient->toFormValue($additional_metadata);
+        $formParams['additionalMetadata'] = $this->apiClient->getSerializer()->toFormValue($additional_metadata);
       }// form params
       if ($file !== null) {
-        $formParams['file'] = '@'.$this->apiClient->toFormValue($file);
+        $formParams['file'] = '@' . $this->apiClient->getSerializer()->toFormValue($file);
       }
       
 
@@ -527,16 +613,22 @@ class PetApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
+      
+      
+      //TODO support oauth
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
+      try {
+        $response = $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 07a922aab0a..237ba3f1acf 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -22,30 +22,28 @@
 
 namespace Swagger\Client\Api;
 
-use \Swagger\Client\ApiClient;
 use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
 
 class StoreApi {
 
-  /**
-   * @param \Swagger\Client\ApiClient|null $apiClient The api client to use. Defaults to getting it from Configuration
-   */
-  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
-    }
-  }
-
   /** @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');
+    }
+
+    $this->apiClient = $apiClient;
+  }
+
   /**
    * @return \Swagger\Client\ApiClient get the API client
    */
@@ -54,10 +52,12 @@ class StoreApi {
   }
 
   /**
-   * @param \Swagger\Client $apiClient set the API client
+   * @param \Swagger\Client\ApiClient $apiClient set the API client
+   * @return StoreApi
    */
-  public function setApiClient($apiClient) {
+  public function setApiClient(ApiClient $apiClient) {
     $this->apiClient = $apiClient;
+    return $this;
   }
 
   
@@ -67,6 +67,7 @@ class StoreApi {
    * Returns pet inventories by status
    *
    * @return map[string,int]
+   * @throws \Swagger\Client\ApiException on non-2xx response
    */
    public function getInventory() {
       
@@ -79,11 +80,11 @@ class StoreApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
@@ -98,20 +99,37 @@ class StoreApi {
         // for HTTP post (form)
         $httpBody = $formParams;
       }
-
-      // authentication setting, if any
-      $authSettings = array('api_key');
-
+      
+      $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+      if (isset($apiKey)) {
+        $headerParams['api_key'] = $apiKey;
+      }
+      
+      
+      
       // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-      if(! $response) {
+      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;
+        }
+
+        throw $e;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'map[string,int]');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'map[string,int]');
       return $responseObject;
+      
   }
   
   /**
@@ -121,6 +139,7 @@ class StoreApi {
    *
    * @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) {
       
@@ -133,11 +152,11 @@ class StoreApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
@@ -156,20 +175,30 @@ class StoreApi {
         // 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) {
+      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;
+        }
+
+        throw $e;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'\Swagger\Client\Model\Order');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Order');
       return $responseObject;
+      
   }
   
   /**
@@ -179,6 +208,7 @@ class StoreApi {
    *
    * @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) {
       
@@ -196,18 +226,19 @@ class StoreApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
       // path params
       if($order_id !== null) {
         $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->toPathValue($order_id), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($order_id),
+                                    $resourcePath);
       }
       
       
@@ -219,20 +250,30 @@ class StoreApi {
         // 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) {
+      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;
+        }
+
+        throw $e;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'\Swagger\Client\Model\Order');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\Order');
       return $responseObject;
+      
   }
   
   /**
@@ -242,6 +283,7 @@ class StoreApi {
    *
    * @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) {
       
@@ -259,18 +301,19 @@ class StoreApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
       // path params
       if($order_id !== null) {
         $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->toPathValue($order_id), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($order_id),
+                                    $resourcePath);
       }
       
       
@@ -282,16 +325,19 @@ class StoreApi {
         // 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);
+      try {
+        $response = $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 f4d35a3a7a0..1d0765bbb81 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -22,30 +22,28 @@
 
 namespace Swagger\Client\Api;
 
-use \Swagger\Client\ApiClient;
 use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
 
 class UserApi {
 
-  /**
-   * @param \Swagger\Client\ApiClient|null $apiClient The api client to use. Defaults to getting it from Configuration
-   */
-  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
-    }
-  }
-
   /** @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');
+    }
+
+    $this->apiClient = $apiClient;
+  }
+
   /**
    * @return \Swagger\Client\ApiClient get the API client
    */
@@ -54,10 +52,12 @@ class UserApi {
   }
 
   /**
-   * @param \Swagger\Client $apiClient set the API client
+   * @param \Swagger\Client\ApiClient $apiClient set the API client
+   * @return UserApi
    */
-  public function setApiClient($apiClient) {
+  public function setApiClient(ApiClient $apiClient) {
     $this->apiClient = $apiClient;
+    return $this;
   }
 
   
@@ -68,6 +68,7 @@ class UserApi {
    *
    * @param \Swagger\Client\Model\User $body Created user object (required)
    * @return void
+   * @throws \Swagger\Client\ApiException on non-2xx response
    */
    public function createUser($body) {
       
@@ -80,11 +81,11 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
@@ -103,14 +104,18 @@ class UserApi {
         // 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);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -121,6 +126,7 @@ class UserApi {
    *
    * @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) {
       
@@ -133,11 +139,11 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
@@ -156,14 +162,18 @@ class UserApi {
         // 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);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -174,6 +184,7 @@ class UserApi {
    *
    * @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) {
       
@@ -186,11 +197,11 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
@@ -209,14 +220,18 @@ class UserApi {
         // 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);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -228,6 +243,7 @@ class UserApi {
    * @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) {
       
@@ -240,18 +256,18 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       // query params
       if($username !== null) {
-        $queryParams['username'] = $this->apiClient->toQueryValue($username);
+        $queryParams['username'] = $this->apiClient->getSerializer()->toQueryValue($username);
       }// query params
       if($password !== null) {
-        $queryParams['password'] = $this->apiClient->toQueryValue($password);
+        $queryParams['password'] = $this->apiClient->getSerializer()->toQueryValue($password);
       }
       
       
@@ -265,20 +281,30 @@ class UserApi {
         // 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) {
+      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;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'string');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'string');
       return $responseObject;
+      
   }
   
   /**
@@ -287,6 +313,7 @@ class UserApi {
    * Logs out current logged in user session
    *
    * @return void
+   * @throws \Swagger\Client\ApiException on non-2xx response
    */
    public function logoutUser() {
       
@@ -299,11 +326,11 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
@@ -318,14 +345,18 @@ class UserApi {
         // 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);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -336,6 +367,7 @@ class UserApi {
    *
    * @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) {
       
@@ -353,18 +385,19 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
       // path params
       if($username !== null) {
         $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($username),
+                                    $resourcePath);
       }
       
       
@@ -376,20 +409,30 @@ class UserApi {
         // 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) {
+      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;
+        }
+
+        throw $e;
+      }
+      
+      if (!$response) {
         return null;
       }
 
-      $responseObject = $this->apiClient->deserialize($response,'\Swagger\Client\Model\User');
+      $responseObject = $this->apiClient->getSerializer()->deserialize($response,'\Swagger\Client\Model\User');
       return $responseObject;
+      
   }
   
   /**
@@ -400,6 +443,7 @@ class UserApi {
    * @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) {
       
@@ -417,18 +461,19 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
       // path params
       if($username !== null) {
         $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($username),
+                                    $resourcePath);
       }
       
       // body params
@@ -444,14 +489,18 @@ class UserApi {
         // 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);
+      try {
+        $response = $this->apiClient->callAPI($resourcePath, $method,
+                                              $queryParams, $httpBody,
+                                              $headerParams);
+      } catch (ApiException $e) {
+        switch ($e->getCode()) { 
+        }
+
+        throw $e;
+      }
       
   }
   
@@ -462,6 +511,7 @@ class UserApi {
    *
    * @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) {
       
@@ -479,18 +529,19 @@ class UserApi {
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+      $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
       if (!is_null($_header_accept)) {
         $headerParams['Accept'] = $_header_accept;
       }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
+      $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
 
       
       
       // path params
       if($username !== null) {
         $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
+                                    $this->apiClient->getSerializer()->toPathValue($username),
+                                    $resourcePath);
       }
       
       
@@ -502,16 +553,19 @@ class UserApi {
         // 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);
+      try {
+        $response = $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 bb5229fb170..66204f0c4f3 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
@@ -25,146 +25,60 @@ class ApiClient {
   public static $PUT = "PUT";
   public static $DELETE = "DELETE";
 
-  /** @var string[] Array of default headers where the key is the header name and the value is the header value */
-  private $default_header = array();
+  /** @var Configuration */
+  protected $config;
 
-  /** @var string timeout (second) of the HTTP request, by default set to 0, no timeout */
-  protected $curl_timeout = 0;
-
-  /** @var string user agent of the HTTP request, set to "PHP-Swagger" by default */
-  protected $user_agent = "PHP-Swagger";
+  /** @var ObjectSerializer */
+  protected $serializer;
 
   /**
-   * @param string $host Base url of the API server (optional)
+   * @param Configuration $config config for this ApiClient
    */
-  function __construct($host = null) {
-    if ($host === null) {
-      $this->host = 'http://petstore.swagger.io/v2';
-    } else {
-      $this->host = $host;
+  function __construct(Configuration $config = null) {
+    if ($config == null) {
+      $config = Configuration::getDefaultConfiguration();
     }
+    
+    $this->config = $config;
+    $this->serializer = new ObjectSerializer();
   }
 
   /**
-   * add default header 
-   *
-   * @param string $header_name header name (e.g. Token)
-   * @param string $header_value header value (e.g. 1z8wp3)
+   * get the config
+   * @return Configuration
    */
-  public function addDefaultHeader($header_name, $header_value) {
-    if (!is_string($header_name)) 
-      throw new \InvalidArgumentException('Header name must be a string.');
-
-    $this->default_header[$header_name] =  $header_value;
+  public function getConfig() {
+    return $this->config;
   }
 
   /**
-   * get the default header 
-   *
-   * @return array default header
+   * get the serializer
+   * @return ObjectSerializer
    */
-  public function getDefaultHeader() {
-    return $this->default_header;
+  public function getSerializer() {
+    return $this->serializer;
   }
 
-  /**
-   * delete the default header based on header name
-   *
-   * @param string $header_name header name (e.g. Token)
-   */
-  public function deleteDefaultHeader($header_name) {
-    unset($this->default_header[$header_name]);
-  }
-
-  /**
-   * set the user agent of the api client
-   *
-   *  @param string $user_agent the user agent of the api client
-   */
-  public function setUserAgent($user_agent) {
-    if (!is_string($user_agent))
-      throw new \InvalidArgumentException('User-agent must be a string.');
-
-    $this->user_agent= $user_agent;
-  }
-
-  /**
-   * get the user agent of the api client
-   * 
-   * @return string user agent
-   */
-  public function getUserAgent($user_agent) {
-    return $this->user_agent;
-  }
-
-  /**
-   * set the HTTP timeout value
-   *
-   * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
-   */
-  public function setTimeout($seconds) {
-    if (!is_numeric($seconds) || $seconds < 0)
-      throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
-
-    $this->curl_timeout = $seconds;
-  }
-
-  /**
-   * get the HTTP timeout value
-   *
-   * @return string HTTP timeout value
-   */
-  public function getTimeout() {
-    return $this->curl_timeout;
-  }
-
-
   /**
    * Get API key (with prefix if set)
-   * @param string key name
+   * @param string $apiKey name of apikey
    * @return string API key with the prefix
    */
   public function getApiKeyWithPrefix($apiKey) {
-    if (isset(Configuration::$apiKeyPrefix[$apiKey])) {
-      return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey];
-    } else if (isset(Configuration::$apiKey[$apiKey])) {
-      return Configuration::$apiKey[$apiKey];
+    $prefix = $this->config->getApiKeyPrefix($apiKey);
+    $apiKey = $this->config->getApiKey($apiKey);
+
+    if (!isset($apiKey)) {
+      return null;
+    }
+
+    if (isset($prefix)) {
+      $keyWithPrefix = $prefix." ".$apiKey;
     } else {
-      return;
+      $keyWithPrefix = $apiKey;
     }
-  }
 
-  /**
-   * update hearder and query param based on authentication setting
-   * 
-   * @param array $headerParams header parameters (by ref)
-   * @param array $queryParams query parameters (by ref)
-   * @param array $authSettings array of authentication scheme (e.g ['api_key'])
-   */
-  public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings)
-  {
-    if (count($authSettings) == 0)
-      return;
-
-    // one endpoint can have more than 1 auth settings
-    foreach($authSettings as $auth) {
-      // determine which one to use
-      switch($auth) {
-        
-        case 'api_key':
-          $headerParams['api_key'] = $this->getApiKeyWithPrefix('api_key');
-          
-          break;
-        
-        case 'petstore_auth':
-          
-          //TODO support oauth
-          break;
-        
-        default:
-          //TODO show warning about security definition not found
-      }
-    }
+    return $keyWithPrefix;
   }
   
   /**
@@ -173,18 +87,15 @@ class ApiClient {
    * @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, $authSettings) {
+  public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams) {
 
     $headers = array();
 
-    # determine authentication setting
-    $this->updateParamsForAuth($headerParams, $queryParams, $authSettings);
-
     # construct the http header
-    $headerParams = array_merge((array)$this->default_header, (array)$headerParams);
+    $headerParams = array_merge((array)$this->config->getDefaultHeaders(), (array)$headerParams);
 
     foreach ($headerParams as $key => $val) {
       $headers[] = "$key: $val";
@@ -195,15 +106,15 @@ class ApiClient {
       $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->sanitizeForSerialization($postData));
+      $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
     }
 
-    $url = $this->host . $resourcePath;
+    $url = $this->config->getHost() . $resourcePath;
 
     $curl = curl_init();
     // set timeout, if needed
-    if ($this->curl_timeout != 0) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
+    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);
@@ -232,14 +143,14 @@ class ApiClient {
     curl_setopt($curl, CURLOPT_URL, $url);
 
     // Set user agent
-    curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
+    curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
 
     // debugging for curl
-    if (Configuration::$debug) {
-      error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file);
+    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(Configuration::$debug_file, 'a'));
+      curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
     } else {
       curl_setopt($curl, CURLOPT_VERBOSE, 0);
     }
@@ -255,8 +166,8 @@ class ApiClient {
     $response_info = curl_getinfo($curl);
 
     // debug HTTP response body
-    if (Configuration::$debug) {
-        error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file);
+    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
@@ -274,153 +185,13 @@ class ApiClient {
     return $data;
   }
 
-  /**
-   * Build a JSON POST object
-   */
-  protected 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) {
-        if ($data->$property !== null) {
-          $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property);
-        }
-      }
-      $sanitized = $values;
-    } else {
-      $sanitized = (string)$data;
-    }
-
-    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));
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * 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);
-        }
-  }
-
-  /**
-   * 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);
-  }
-
-  /**
-   * 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);
-  }
-
-  /**
-   * 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;
-    }
-   }
-
-  /**
-   * Deserialize a JSON string into an object
-   *
-   * @param object $object object or primitive to be deserialized
-   * @param string $class class name is passed as a string
-   * @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);
-        }        
-      }
-    } 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) {
-        $original_property_name = $instance::$attributeMap[$property];
-        if (isset($original_property_name) && isset($data->$original_property_name)) {
-          $instance->$property = $this->deserialize($data->$original_property_name, $type);
-        }
-      }
-      $deserialized = $instance;
-    }
-
-    return $deserialized;
-  }
-
   /*
    * return the header 'Accept' based on an array of Accept provided
    *
-   * @param array[string] $accept Array of header
+   * @param string[] $accept Array of header
    * @return string Accept (e.g. application/json)
    */
-  public function selectHeaderAccept($accept) {
+  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)) {
@@ -433,10 +204,10 @@ class ApiClient {
   /*
    * return the content type based on an array of content-type provided
    *
-   * @param array[string] content_type_array Array fo content-type
+   * @param string[] content_type_array Array fo content-type
    * @return string Content-Type (e.g. application/json)
    */
-  public function selectHeaderContentType($content_type) {
+  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)) {
@@ -445,6 +216,4 @@ class ApiClient {
       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 5f3b1812261..51774137aed 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
@@ -22,15 +22,20 @@ use \Exception;
 class ApiException extends Exception {
 
   /** @var string The HTTP body of the server response. */
-  protected $response_body;
+  protected $responseBody;
 
   /** @var string[] The HTTP header of the server response. */
-  protected $response_headers;
+  protected $responseHeaders;
+
+  /**
+   * The deserialized response object
+   */
+  protected $responseObject;
 
   public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null) {
     parent::__construct($message, $code);
-    $this->response_headers = $responseHeaders;
-    $this->response_body = $responseBody;
+    $this->responseHeaders = $responseHeaders;
+    $this->responseBody = $responseBody;
   }
 
   /**
@@ -39,7 +44,7 @@ class ApiException extends Exception {
    * @return string HTTP response header
    */
   public function getResponseHeaders() {
-    return $this->response_headers;
+    return $this->responseHeaders;
   }
 
   /**
@@ -48,7 +53,18 @@ class ApiException extends Exception {
    * @return string HTTP response body
    */
   public function getResponseBody() {
-    return $this->response_body;
+    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;
+  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
index e6381781bb0..a407fe4dd49 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
@@ -17,37 +17,250 @@
 
 namespace Swagger\Client;
 
-use \Swagger\Client\ApiClient;
-
 class Configuration {
 
+  private static $defaultConfiguration = null;
+
   /** @var string[] Associate array to store API key(s) */
-  public static $apiKey = array();
+  protected $apiKeys = array();
 
   /** string[] Associate array to store API prefix (e.g. Bearer) */
-  public static $apiKeyPrefix = array();
+  protected $apiKeyPrefixes = array();
 
   /** @var string Username for HTTP basic authentication */
-  public static $username = '';
+  protected $username = '';
 
   /** @var string Password for HTTP basic authentication */
-  public static $password = '';
+  protected $password = '';
 
   /** @var \Swagger\Client\ApiClient The default instance of ApiClient */
-  public static $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) */
-  public static $debug = false;
+  protected $debug = false;
 
   /** @var string Debug file location (log to STDOUT by default) */
-  public static $debug_file = 'php://output';
+  protected $debugFile = 'php://output';
 
-  /*
-   *  manually initalize  ApiClient
+  /**
+   * @param string $key
+   * @param string $value
+   * @return Configuration
    */
-  public static function init() {
-    if (self::$apiClient === null)
-      self::$apiClient = new ApiClient();
+  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.');
+    }
+
+    $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.');
+    }
+
+    $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.');
+    }
+
+    $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();
+    }
+
+    return self::$defaultConfiguration;
+  }
+
+  public static function setDefaultConfiguration(Configuration $config) {
+    self::$defaultConfiguration = $config;
+  }
 }
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 750a8fee5df..75aaf2eeead 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -38,21 +38,69 @@ class Category implements ArrayAccess {
       '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'
+  );
+
   
   /** @var int $id */
-  public $id;
+  protected $id;
   
   /** @var string $name */
-  public $name;
+  protected $name;
+  
+  public function __construct(array $data = null) {
+    if ($data != null) {
+      $this->id = $data["id"];
+      $this->name = $data["name"];
+    }
+  }
   
   /**
-   * @param mixed[] Array of parameters to initialize the object with
+   * get id
+   * @return int
    */
-  public function __construct(array $data = null) {
-    $this->id = @$data["id"];
-    $this->name = @$data["name"];
+  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);
   }
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 64552afb763..c7a433c3d8c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -46,37 +46,165 @@ class Order implements ArrayAccess {
       '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 */
-  public $id;
+  protected $id;
   
   /** @var int $pet_id */
-  public $pet_id;
+  protected $pet_id;
   
   /** @var int $quantity */
-  public $quantity;
+  protected $quantity;
   
   /** @var \DateTime $ship_date */
-  public $ship_date;
+  protected $ship_date;
   
   /** @var string $status Order Status */
-  public $status;
+  protected $status;
   
   /** @var bool $complete */
-  public $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"];
+    }
+  }
   
   /**
-   * @param mixed[] Array of parameters to initialize the object with
+   * get id
+   * @return int
    */
-  public function __construct(array $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"];
+  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);
   }
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 ef2a4c76a0d..cbe27e1fce9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -46,37 +46,165 @@ class Pet implements ArrayAccess {
       '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 */
-  public $id;
+  protected $id;
   
   /** @var \Swagger\Client\Model\Category $category */
-  public $category;
+  protected $category;
   
   /** @var string $name */
-  public $name;
+  protected $name;
   
   /** @var string[] $photo_urls */
-  public $photo_urls;
+  protected $photo_urls;
   
   /** @var \Swagger\Client\Model\Tag[] $tags */
-  public $tags;
+  protected $tags;
   
   /** @var string $status pet status in the store */
-  public $status;
+  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"];
+    }
+  }
   
   /**
-   * @param mixed[] Array of parameters to initialize the object with
+   * get id
+   * @return int
    */
-  public function __construct(array $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"];
+  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);
   }
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 5959cb20a6a..3fd785f001b 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -38,21 +38,69 @@ class Tag implements ArrayAccess {
       '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'
+  );
+
   
   /** @var int $id */
-  public $id;
+  protected $id;
   
   /** @var string $name */
-  public $name;
+  protected $name;
+  
+  public function __construct(array $data = null) {
+    if ($data != null) {
+      $this->id = $data["id"];
+      $this->name = $data["name"];
+    }
+  }
   
   /**
-   * @param mixed[] Array of parameters to initialize the object with
+   * get id
+   * @return int
    */
-  public function __construct(array $data = null) {
-    $this->id = @$data["id"];
-    $this->name = @$data["name"];
+  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);
   }
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 1bfb7f332db..2bb31056bde 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -50,45 +50,213 @@ class User implements ArrayAccess {
       '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 */
-  public $id;
+  protected $id;
   
   /** @var string $username */
-  public $username;
+  protected $username;
   
   /** @var string $first_name */
-  public $first_name;
+  protected $first_name;
   
   /** @var string $last_name */
-  public $last_name;
+  protected $last_name;
   
   /** @var string $email */
-  public $email;
+  protected $email;
   
   /** @var string $password */
-  public $password;
+  protected $password;
   
   /** @var string $phone */
-  public $phone;
+  protected $phone;
   
   /** @var int $user_status User Status */
-  public $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"];
+    }
+  }
   
   /**
-   * @param mixed[] Array of parameters to initialize the object with
+   * get id
+   * @return int
    */
-  public function __construct(array $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"];
+  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);
   }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
new file mode 100644
index 00000000000..802a49bc01a
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
@@ -0,0 +1,151 @@
+<?php
+namespace Swagger\Client;
+
+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);
+        }
+        $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;
+    }
+
+    /**
+     * 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));
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * 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);
+      }
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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;
+      }
+    }
+
+    /**
+     * 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
+     * @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);
+          }
+        }
+      } 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;
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
index 131a79dba92..3ac28772291 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
@@ -22,19 +22,19 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
     // new pet
     $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->name = "test php 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->id = $new_pet_id; // use the same id as pet
-    $category->name = "test php category";
+    $category->setId($new_pet_id); // use the same id as pet
+    $category->setName("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)
@@ -56,65 +56,53 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
     $this->assertSame('application/yaml,application/xml', $api_client->selectHeaderContentType(array('application/yaml','application/xml')));
 
     // test addDefaultHeader and getDefaultHeader
-    $api_client->addDefaultHeader('test1', 'value1');
-    $api_client->addDefaultHeader('test2', 200);
-    $defaultHeader = $api_client->getDefaultHeader();
+    $api_client->getConfig()->addDefaultHeader('test1', 'value1');
+    $api_client->getConfig()->addDefaultHeader('test2', 200);
+    $defaultHeader = $api_client->getConfig()->getDefaultHeaders();
     $this->assertSame('value1', $defaultHeader['test1']);
     $this->assertSame(200, $defaultHeader['test2']);
 
     // test deleteDefaultHeader
-    $api_client->deleteDefaultHeader('test2');
-    $defaultHeader = $api_client->getDefaultHeader();
+    $api_client->getConfig()->deleteDefaultHeader('test2');
+    $defaultHeader = $api_client->getConfig()->getDefaultHeaders();
     $this->assertFalse(isset($defaultHeader['test2']));
 
-    $pet_api = new Swagger\Client\Api\PetAPI();
     $pet_api2 = new Swagger\Client\Api\PetAPI();
     $apiClient3 = new Swagger\Client\ApiClient();
-    $apiClient3->setUserAgent = 'api client 3';
+    $apiClient3->getConfig()->setUserAgent('api client 3');
     $apiClient4 = new Swagger\Client\ApiClient();
-    $apiClient4->setUserAgent = 'api client 4';
+    $apiClient4->getConfig()->setUserAgent('api client 4');
     $pet_api3 = new Swagger\Client\Api\PetAPI($apiClient3);
 
-    // same default api client
-    $this->assertSame($pet_api->getApiClient(), $pet_api2->getApiClient());
-    // confirm using the default api client in the Configuration
-    $this->assertSame($pet_api->getApiClient(), Swagger\Client\Configuration::$apiClient);
     // 2 different api clients are not the same 
     $this->assertNotEquals($apiClient3, $apiClient4);
-    // customized pet api not using the default (configuration) api client
-    $this->assertNotEquals($pet_api3->getApiClient(), Swagger\Client\Configuration::$apiClient);
     // customied pet api not using the old pet api's api client
     $this->assertNotEquals($pet_api2->getApiClient(), $pet_api3->getApiClient());
-
-    // both pet api and pet api2 share the same api client and confirm using timeout value
-    $pet_api->getApiClient()->setTimeout(999);
-    $this->assertSame(999, $pet_api2->getApiClient()->getTimeout());
-
   }
 
   // test getPetById with a Pet object (id 10005)
   public function testGetPetById()
   {
     // initialize the API client without host
-    $api_client = new Swagger\Client\ApiClient();
-    Swagger\Client\Configuration::$apiKey['api_key'] = '111222333444555';
     $pet_id = 10005;  // ID of pet that needs to be fetched
-    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
+    $pet_api = new Swagger\Client\Api\PetAPI();
+    $pet_api->getApiClient()->getConfig()->setApiKey('api_key', '111222333444555');
     // return Pet (model)
     $response = $pet_api->getPetById($pet_id);
-    $this->assertSame($response->id, $pet_id);
-    $this->assertSame($response->name, 'PHP Unit Test');
-    $this->assertSame($response->category->id, $pet_id);
-    $this->assertSame($response->category->name, 'test php category');
-    $this->assertSame($response->tags[0]->id, $pet_id);
-    $this->assertSame($response->tags[0]->name, 'test php tag');
+    $this->assertSame($response->getId(), $pet_id);
+    $this->assertSame($response->getName(), 'PHP Unit Test');
+    $this->assertSame($response->getCategory()->getId(), $pet_id);
+    $this->assertSame($response->getCategory()->getName(), 'test php category');
+    $this->assertSame($response->getTags()[0]->getId(), $pet_id);
+    $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
   }
 
   // test getPetByStatus and verify by the "id" of the response
   public function testFindPetByStatus()
   {
     // initialize the API client
-    $api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
     $pet_api = new Swagger\Client\Api\PetAPI($api_client);
     // return Pet (model)
     $response = $pet_api->findPetsByStatus("available");
@@ -133,30 +121,32 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
   public function testUpdatePet()
   {
     // initialize the API client
-    $api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
     $pet_id = 10001;  // ID of pet that needs to be fetched
     $pet_api = new Swagger\Client\Api\PetAPI($api_client);
     // create updated pet object
     $updated_pet = new Swagger\Client\Model\Pet;
-    $updated_pet->id = $pet_id;
-    $updated_pet->name = 'updatePet'; // new name
-    $updated_pet->status = 'pending'; // new status
+    $updated_pet->setId($pet_id);
+    $updated_pet->setName('updatePet'); // new name
+    $updated_pet->setStatus('pending'); // new status
     // update Pet (model/json)
     $update_response = $pet_api->updatePet($updated_pet);
     // return nothing (void)
     $this->assertSame($update_response, NULL);
     // verify updated Pet
     $response = $pet_api->getPetById($pet_id);
-    $this->assertSame($response->id, $pet_id);
-    $this->assertSame($response->status, 'pending');
-    $this->assertSame($response->name, 'updatePet');
+    $this->assertSame($response->getId(), $pet_id);
+    $this->assertSame($response->getStatus(), 'pending');
+    $this->assertSame($response->getName(), 'updatePet');
   }
 
   // test updatePet and verify by the "id" of the response
   public function testUpdatePetWithForm()
   {
     // initialize the API client
-    $api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
     $pet_id = 10001;  // ID of pet that needs to be fetched
     $pet_api = new Swagger\Client\Api\PetAPI($api_client);
     // update Pet (form)
@@ -164,20 +154,21 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
     // return nothing (void)
     $this->assertSame($update_response, NULL);
     $response = $pet_api->getPetById($pet_id);
-    $this->assertSame($response->id, $pet_id);
-    $this->assertSame($response->name, 'update pet with form');
-    $this->assertSame($response->status, 'sold');
+    $this->assertSame($response->getId(), $pet_id);
+    $this->assertSame($response->getName(), 'update pet with form');
+    $this->assertSame($response->getStatus(), 'sold');
   }
 
   // test addPet and verify by the "id" and "name" of the response
   public function testAddPet()
   {
     // initialize the API client
-    $api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
     $new_pet_id = 10001;
     $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");
     $pet_api = new Swagger\Client\Api\PetAPI($api_client);
     // add a new pet (model)
     $add_response = $pet_api->addPet($new_pet);
@@ -185,15 +176,16 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
     $this->assertSame($add_response, NULL);
     // verify added Pet
     $response = $pet_api->getPetById($new_pet_id);
-    $this->assertSame($response->id, $new_pet_id);
-    $this->assertSame($response->name, 'PHP Unit Test');
+    $this->assertSame($response->getId(), $new_pet_id);
+    $this->assertSame($response->getName(), 'PHP Unit Test');
   }
 
   // test upload file
   public function testUploadFile()
   {
     // initialize the API client
-    $api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
     $pet_api = new Swagger\Client\Api\PetAPI($api_client);
     // upload file
     $pet_id = 10001;
@@ -206,7 +198,9 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
   public function testGetInventory()
   {
     // initialize the API client
-    $api_client = new Swagger\Client\APIClient('http://petstore.swagger.io/v2');
+    $config = new Swagger\Client\Configuration();
+    $config->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\APIClient($config);
     $store_api = new Swagger\Client\Api\StoreAPI($api_client);
     // get inventory
     $get_response = $store_api->getInventory();
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
index a92149fbaf3..05bd873c993 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('SwaggerClient.php');
+require_once('autoload.php');
 
 class StoreApiTest extends \PHPUnit_Framework_TestCase
 {
@@ -16,8 +16,9 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
   public function testGetInventory()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\APIClient('http://petstore.swagger.io/v2');
-    $store_api = new SwaggerClient\StoreAPI($api_client);
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
+    $store_api = new Swagger\Client\Api\StoreAPI($api_client);
     // get inventory
     $get_response = $store_api->getInventory();
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/UserApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/UserApiTest.php
index 181e8a1249e..3efce8b08ba 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/UserApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/UserApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('SwaggerClient.php');
+require_once('autoload.php');
 
 class UserApiTest extends \PHPUnit_Framework_TestCase
 {
@@ -16,8 +16,9 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
   public function testLoginUser()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\APIClient('http://petstore.swagger.io/v2');
-    $user_api = new SwaggerClient\UserAPI($api_client);
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
+    $user_api = new Swagger\Client\Api\UserApi($api_client);
     // login
     $response = $user_api->loginUser("xxxxx", "yyyyyyyy");