From 42829ffb132f71aa55a4244cf54cfb495d51db39 Mon Sep 17 00:00:00 2001
From: who <andybird@gmail.com>
Date: Mon, 13 Apr 2015 13:14:10 -0700
Subject: [PATCH 1/3] A proposed fix for Issue #628

---
 .../swagger-codegen/src/main/resources/php/api.mustache   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index 1267f76d358d..a434699f90ad 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -73,14 +73,14 @@ class {{classname}} {
         $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->toFormValue(${{paramName}});
       }{{/formParams}}
       {{#bodyParams}}// body params
-      $body = null;
+      $_tempBody = null;
       if (isset(${{paramName}})) {
-        $body = ${{paramName}};
+        $_tempBody = ${{paramName}};
       }{{/bodyParams}}
 
       // for model (json/xml)
-      if (isset($body)) {
-        $httpBody = $body; // $body is the method argument, if present
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
       }
       
       // for HTTP post (form)

From de25d63838c11f57cf0319a7f8f3a0b800428052 Mon Sep 17 00:00:00 2001
From: who <andybird@gmail.com>
Date: Mon, 13 Apr 2015 16:27:30 -0700
Subject: [PATCH 2/3] Making the default PHP package name more generic instead
 of being specific to Petstore

---
 .../wordnik/swagger/codegen/languages/PhpClientCodegen.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
index 734e16128498..ae907423d787 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
@@ -28,8 +28,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
   public PhpClientCodegen() {
     super();
 
-    //TODO determine hte package name from host name
-    invokerPackage = camelize("SwaggerPetstore"); 
+    invokerPackage = camelize("SwaggerClient"); 
 
     String packagePath = invokerPackage + "-php";
 

From f4a2eff4b70ea2fa20a4a1262783e386bfeeaa7e Mon Sep 17 00:00:00 2001
From: who <andybird@gmail.com>
Date: Tue, 14 Apr 2015 12:24:59 -0700
Subject: [PATCH 3/3] Fixing nested model deserialization - Issue #635

---
 .../swagger-codegen/src/main/resources/php/APIClient.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
index b12921d776d9..3620e6719522 100644
--- a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
@@ -289,8 +289,8 @@ class APIClient {
       $class = "{{invokerPackage}}\\models\\".$class;
       $instance = new $class();
       foreach ($instance::$swaggerTypes as $property => $type) {
-        if (isset($data->$property)) {
-          $original_property_name = $instance::$attributeMap[$property];
+        $original_property_name = $instance::$attributeMap[$property];
+        if (isset($original_property_name)) {
           $instance->$property = self::deserialize($data->$original_property_name, $type);
         }
       }