diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
index 945388b258..ccea2ee070 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
@@ -20,7 +20,7 @@ public class CodegenModel {
     public List<CodegenProperty> requiredVars = new ArrayList<CodegenProperty>(); // a list of required properties
     public List<CodegenProperty> optionalVars = new ArrayList<CodegenProperty>(); // a list of optional properties
     public List<CodegenProperty> allVars;
-    public List<String> allowableValues;
+    public Map<String, Object> allowableValues;
 
     // Sorted sets of required parameters.
     public Set<String> mandatory = new TreeSet<String>();
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 9949834d24..877bf74436 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -145,6 +145,33 @@ public class DefaultCodegen {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
 
+            // for enum model
+            if (Boolean.TRUE.equals(cm.isEnum) && cm.allowableValues != null) {
+                Map<String, Object> allowableValues = cm.allowableValues;
+
+                List<String> values = (List<String>) allowableValues.get("values");
+                List<Map<String, String>> enumVars = new ArrayList<Map<String, String>>();
+                String commonPrefix = findCommonPrefixOfVars(values);
+                int truncateIdx = commonPrefix.length();
+                for (String value : values) {
+                    Map<String, String> enumVar = new HashMap<String, String>();
+                    String enumName;
+                    if (truncateIdx == 0) {
+                        enumName = value;
+                    } else {
+                        enumName = value.substring(truncateIdx);
+                        if ("".equals(enumName)) {
+                            enumName = value;
+                        }
+                    }
+                    enumVar.put("name", toEnumVarName(enumName));
+                    enumVar.put("value", toEnumValue(value, cm.dataType));
+                    enumVars.add(enumVar);
+                }
+                cm.allowableValues.put("enumVars", enumVars);
+            }
+
+            // for enum model's properties
             for (CodegenProperty var : cm.vars) {
                 Map<String, Object> allowableValues = var.allowableValues;
 
@@ -177,7 +204,7 @@ public class DefaultCodegen {
                         }
                     }
                     enumVar.put("name", toEnumVarName(enumName));
-                    enumVar.put("value", value);
+                    enumVar.put("value", toEnumValue(value, var.datatype));
                     enumVars.add(enumVar);
                 }
                 allowableValues.put("enumVars", enumVars);
@@ -212,6 +239,21 @@ public class DefaultCodegen {
         return prefix.replaceAll("[a-zA-Z0-9]+\\z", "");
     }
 
+    /**
+     * Return the value in the language specifed format
+     * e.g. status => "status"
+     * 
+     * @param value enum variable name
+     * @return the sanitized variable name for enum
+     */
+    public String toEnumValue(String value, String datatype) {
+        if ("number".equalsIgnoreCase(datatype)) {
+            return value;
+        } else {
+            return "\"" + escapeText(value) + "\"";
+        }
+    }
+    
     /**
      * Return the sanitized variable name for enum
      * 
@@ -549,7 +591,7 @@ public class DefaultCodegen {
     /**
      * Return the Enum name (e.g. StatusEnum given 'status')
      *
-     * @param property Codegen property object
+     * @param property Codegen property
      * @return the Enum name
      */
     @SuppressWarnings("static-method")
@@ -1105,7 +1147,9 @@ public class DefaultCodegen {
             ModelImpl impl = (ModelImpl) model;
             if(impl.getEnum() != null && impl.getEnum().size() > 0) {
                 m.isEnum = true;
-                m.allowableValues = impl.getEnum();
+                // comment out below as allowableValues is not set in post processing model enum
+                m.allowableValues = new HashMap<String, Object>();
+                m.allowableValues.put("values", impl.getEnum());
                 Property p = PropertyBuilder.build(impl.getType(), impl.getFormat(), null);
                 m.dataType = getSwaggerType(p);
             }
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 6bf5a2568b..83e6495399 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
@@ -569,10 +569,29 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         p.example = example;
     }
 
+    @Override
+    public String toEnumVarName(String name) {
+        String enumName = sanitizeName(underscore(name).toUpperCase());
+
+        enumName = enumName.replaceFirst("^_", "");
+        enumName = enumName.replaceFirst("_$", "");
+
+        if (enumName.matches("\\d.*")) { // starts with number
+            return "_" + enumName;
+        } else {
+            return enumName;
+        }
+    }
+
     @Override
     public String toEnumName(CodegenProperty property) {
-        LOGGER.info("php toEnumName:" + underscore(property.name).toUpperCase());
-        return underscore(property.name).toUpperCase();
+        String enumName = toModelName(property.name) + "Enum";
+
+        if (enumName.matches("\\d.*")) { // starts with number
+            return "_" + enumName;
+        } else {
+            return enumName;
+        }
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
index 5f5156bbfe..e31d560460 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
@@ -1376,6 +1376,10 @@
         }
       }
     },
+    "EnumClass" : {
+      "type": "string",
+      "enum": ["_abc", "-efg", "(xyz)"]
+    },
     "Enum_Test" : {
       "type" : "object",
       "properties" : {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
index 8fede11408..d2bcf57f99 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
index 5d1cf18a00..0b7cad9f8a 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
index 05f7d31ae5..a6144d7081 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
index 5e872f5bdc..8da35dc644 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
index 1aaaa92d13..5c0338370a 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class PetApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
index e38b4831f5..b7ad7afc2d 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class StoreApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
index b2ecae1e67..d247fb4358 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class UserApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 0fc49a435f..01322f38b2 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 76af4a37c6..35bc9c1d94 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 import java.io.UnsupportedEncodingException;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
index 6ce226b5de..46da5bd364 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
index 5fb583a8eb..13be49047e 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Category   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
index 89b6fc7611..18740d47fb 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
index 48aaeeec36..78f04885a0 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class ModelReturn   {
   
   private Integer _return = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
index d851de25cb..3b459f7ffc 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Name   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
index 02adc174d7..4d3412483f 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Order   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
index 1899cf69d9..b339acc50f 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
@@ -14,7 +14,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
index 3f44bcc50e..ee6d158057 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
index aa94e125d8..a23e8b8894 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
index be60c56a23..9cb8783e8b 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class User   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
index 4eb4016563..c60909b93b 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T17:10:39.649+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-02T22:36:41.205+08:00")
 public class InlineResponse200   {
   
   private List<Tag> tags = new ArrayList<Tag>();
diff --git a/samples/client/petstore/php/SwaggerClient-php/README.md b/samples/client/petstore/php/SwaggerClient-php/README.md
index ff8c9322ed..1eaa868a05 100644
--- a/samples/client/petstore/php/SwaggerClient-php/README.md
+++ b/samples/client/petstore/php/SwaggerClient-php/README.md
@@ -5,7 +5,7 @@ This PHP package is automatically generated by the [Swagger Codegen](https://git
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-04-02T19:17:12.338+08:00
+- Build date: 2016-04-03T00:07:22.143+08:00
 - Build package: class io.swagger.codegen.languages.PhpClientCodegen
 
 ## Requirements
@@ -112,6 +112,7 @@ Class | Method | HTTP request | Description
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
  - [Dog](docs/Dog.md)
+ - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
  - [InlineResponse200](docs/InlineResponse200.md)
  - [Model200Response](docs/Model200Response.md)
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
index 4826f8dbbe..e41c38c535 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
@@ -119,7 +119,7 @@ class Animal implements ArrayAccess
     }
     
     /**
-     * Gets class_name
+     * Gets class_name.
      * @return string
      */
     public function getClassName()
@@ -128,7 +128,7 @@ class Animal implements ArrayAccess
     }
 
     /**
-     * Sets class_name
+     * Sets class_name.
      * @param string $class_name 
      * @return $this
      */
@@ -181,7 +181,7 @@ class Animal implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -193,3 +193,5 @@ class Animal implements ArrayAccess
         }
     }
 }
+
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
index 272f79ab02..078b57049e 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
@@ -119,7 +119,7 @@ class Cat extends Animal implements ArrayAccess
     }
     
     /**
-     * Gets declawed
+     * Gets declawed.
      * @return bool
      */
     public function getDeclawed()
@@ -128,7 +128,7 @@ class Cat extends Animal implements ArrayAccess
     }
 
     /**
-     * Sets declawed
+     * Sets declawed.
      * @param bool $declawed 
      * @return $this
      */
@@ -181,7 +181,7 @@ class Cat extends Animal implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -193,3 +193,5 @@ class Cat extends Animal implements ArrayAccess
         }
     }
 }
+
+?>
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 f6dfe3d5d7..b2fd2c3c3d 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -130,7 +130,7 @@ class Category implements ArrayAccess
     }
     
     /**
-     * Gets id
+     * Gets id.
      * @return int
      */
     public function getId()
@@ -139,7 +139,7 @@ class Category implements ArrayAccess
     }
 
     /**
-     * Sets id
+     * Sets id.
      * @param int $id 
      * @return $this
      */
@@ -151,7 +151,7 @@ class Category implements ArrayAccess
     }
     
     /**
-     * Gets name
+     * Gets name.
      * @return string
      */
     public function getName()
@@ -160,7 +160,7 @@ class Category implements ArrayAccess
     }
 
     /**
-     * Sets name
+     * Sets name.
      * @param string $name 
      * @return $this
      */
@@ -213,7 +213,7 @@ class Category implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -225,3 +225,5 @@ class Category implements ArrayAccess
         }
     }
 }
+
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
index 289bee51b2..c854b06a93 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
@@ -119,7 +119,7 @@ class Dog extends Animal implements ArrayAccess
     }
     
     /**
-     * Gets breed
+     * Gets breed.
      * @return string
      */
     public function getBreed()
@@ -128,7 +128,7 @@ class Dog extends Animal implements ArrayAccess
     }
 
     /**
-     * Sets breed
+     * Sets breed.
      * @param string $breed 
      * @return $this
      */
@@ -181,7 +181,7 @@ class Dog extends Animal implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -193,3 +193,5 @@ class Dog extends Animal implements ArrayAccess
         }
     }
 }
+
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
index b2bc6d5273..85e140a5eb 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
@@ -114,9 +114,9 @@ class InlineResponse200 implements ArrayAccess
         return self::$getters;
     }
 
-    const STATUS_AVAILABLE = "available";
-    const STATUS_PENDING = "pending";
-    const STATUS_SOLD = "sold";
+    const STATUS_AVAILABLE = ""available"";
+    const STATUS_PENDING = ""pending"";
+    const STATUS_SOLD = ""sold"";
     
 
     
@@ -189,7 +189,7 @@ class InlineResponse200 implements ArrayAccess
     }
     
     /**
-     * Gets tags
+     * Gets tags.
      * @return \Swagger\Client\Model\Tag[]
      */
     public function getTags()
@@ -198,7 +198,7 @@ class InlineResponse200 implements ArrayAccess
     }
 
     /**
-     * Sets tags
+     * Sets tags.
      * @param \Swagger\Client\Model\Tag[] $tags 
      * @return $this
      */
@@ -210,7 +210,7 @@ class InlineResponse200 implements ArrayAccess
     }
     
     /**
-     * Gets id
+     * Gets id.
      * @return int
      */
     public function getId()
@@ -219,7 +219,7 @@ class InlineResponse200 implements ArrayAccess
     }
 
     /**
-     * Sets id
+     * Sets id.
      * @param int $id 
      * @return $this
      */
@@ -231,7 +231,7 @@ class InlineResponse200 implements ArrayAccess
     }
     
     /**
-     * Gets category
+     * Gets category.
      * @return object
      */
     public function getCategory()
@@ -240,7 +240,7 @@ class InlineResponse200 implements ArrayAccess
     }
 
     /**
-     * Sets category
+     * Sets category.
      * @param object $category 
      * @return $this
      */
@@ -252,7 +252,7 @@ class InlineResponse200 implements ArrayAccess
     }
     
     /**
-     * Gets status
+     * Gets status.
      * @return string
      */
     public function getStatus()
@@ -261,7 +261,7 @@ class InlineResponse200 implements ArrayAccess
     }
 
     /**
-     * Sets status
+     * Sets status.
      * @param string $status pet status in the store
      * @return $this
      */
@@ -276,7 +276,7 @@ class InlineResponse200 implements ArrayAccess
     }
     
     /**
-     * Gets name
+     * Gets name.
      * @return string
      */
     public function getName()
@@ -285,7 +285,7 @@ class InlineResponse200 implements ArrayAccess
     }
 
     /**
-     * Sets name
+     * Sets name.
      * @param string $name 
      * @return $this
      */
@@ -297,7 +297,7 @@ class InlineResponse200 implements ArrayAccess
     }
     
     /**
-     * Gets photo_urls
+     * Gets photo_urls.
      * @return string[]
      */
     public function getPhotoUrls()
@@ -306,7 +306,7 @@ class InlineResponse200 implements ArrayAccess
     }
 
     /**
-     * Sets photo_urls
+     * Sets photo_urls.
      * @param string[] $photo_urls 
      * @return $this
      */
@@ -359,7 +359,7 @@ class InlineResponse200 implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -371,3 +371,5 @@ class InlineResponse200 implements ArrayAccess
         }
     }
 }
+
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
index a08f17478e..8ea916fcc1 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
@@ -119,7 +119,7 @@ class Model200Response implements ArrayAccess
     }
     
     /**
-     * Gets name
+     * Gets name.
      * @return int
      */
     public function getName()
@@ -128,7 +128,7 @@ class Model200Response implements ArrayAccess
     }
 
     /**
-     * Sets name
+     * Sets name.
      * @param int $name 
      * @return $this
      */
@@ -181,7 +181,7 @@ class Model200Response implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -193,3 +193,5 @@ class Model200Response implements ArrayAccess
         }
     }
 }
+
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
index e696b4085c..1453c1a947 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
@@ -119,7 +119,7 @@ class ModelReturn implements ArrayAccess
     }
     
     /**
-     * Gets return
+     * Gets return.
      * @return int
      */
     public function getReturn()
@@ -128,7 +128,7 @@ class ModelReturn implements ArrayAccess
     }
 
     /**
-     * Sets return
+     * Sets return.
      * @param int $return 
      * @return $this
      */
@@ -181,7 +181,7 @@ class ModelReturn implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -193,3 +193,5 @@ class ModelReturn implements ArrayAccess
         }
     }
 }
+
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
index 52dcfc4abd..a9a5b42831 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
@@ -130,7 +130,7 @@ class Name implements ArrayAccess
     }
     
     /**
-     * Gets name
+     * Gets name.
      * @return int
      */
     public function getName()
@@ -139,7 +139,7 @@ class Name implements ArrayAccess
     }
 
     /**
-     * Sets name
+     * Sets name.
      * @param int $name 
      * @return $this
      */
@@ -151,7 +151,7 @@ class Name implements ArrayAccess
     }
     
     /**
-     * Gets snake_case
+     * Gets snake_case.
      * @return int
      */
     public function getSnakeCase()
@@ -160,7 +160,7 @@ class Name implements ArrayAccess
     }
 
     /**
-     * Sets snake_case
+     * Sets snake_case.
      * @param int $snake_case 
      * @return $this
      */
@@ -213,7 +213,7 @@ class Name implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -225,3 +225,5 @@ class Name implements ArrayAccess
         }
     }
 }
+
+?>
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 7566c22776..0be579b8c5 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -114,9 +114,9 @@ class Order implements ArrayAccess
         return self::$getters;
     }
 
-    const STATUS_PLACED = "placed";
-    const STATUS_APPROVED = "approved";
-    const STATUS_DELIVERED = "delivered";
+    const STATUS_PLACED = ""placed"";
+    const STATUS_APPROVED = ""approved"";
+    const STATUS_DELIVERED = ""delivered"";
     
 
     
@@ -189,7 +189,7 @@ class Order implements ArrayAccess
     }
     
     /**
-     * Gets id
+     * Gets id.
      * @return int
      */
     public function getId()
@@ -198,7 +198,7 @@ class Order implements ArrayAccess
     }
 
     /**
-     * Sets id
+     * Sets id.
      * @param int $id 
      * @return $this
      */
@@ -210,7 +210,7 @@ class Order implements ArrayAccess
     }
     
     /**
-     * Gets pet_id
+     * Gets pet_id.
      * @return int
      */
     public function getPetId()
@@ -219,7 +219,7 @@ class Order implements ArrayAccess
     }
 
     /**
-     * Sets pet_id
+     * Sets pet_id.
      * @param int $pet_id 
      * @return $this
      */
@@ -231,7 +231,7 @@ class Order implements ArrayAccess
     }
     
     /**
-     * Gets quantity
+     * Gets quantity.
      * @return int
      */
     public function getQuantity()
@@ -240,7 +240,7 @@ class Order implements ArrayAccess
     }
 
     /**
-     * Sets quantity
+     * Sets quantity.
      * @param int $quantity 
      * @return $this
      */
@@ -252,7 +252,7 @@ class Order implements ArrayAccess
     }
     
     /**
-     * Gets ship_date
+     * Gets ship_date.
      * @return \DateTime
      */
     public function getShipDate()
@@ -261,7 +261,7 @@ class Order implements ArrayAccess
     }
 
     /**
-     * Sets ship_date
+     * Sets ship_date.
      * @param \DateTime $ship_date 
      * @return $this
      */
@@ -273,7 +273,7 @@ class Order implements ArrayAccess
     }
     
     /**
-     * Gets status
+     * Gets status.
      * @return string
      */
     public function getStatus()
@@ -282,7 +282,7 @@ class Order implements ArrayAccess
     }
 
     /**
-     * Sets status
+     * Sets status.
      * @param string $status Order Status
      * @return $this
      */
@@ -297,7 +297,7 @@ class Order implements ArrayAccess
     }
     
     /**
-     * Gets complete
+     * Gets complete.
      * @return bool
      */
     public function getComplete()
@@ -306,7 +306,7 @@ class Order implements ArrayAccess
     }
 
     /**
-     * Sets complete
+     * Sets complete.
      * @param bool $complete 
      * @return $this
      */
@@ -359,7 +359,7 @@ class Order implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -371,3 +371,5 @@ class Order implements ArrayAccess
         }
     }
 }
+
+?>
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 36a0c9dcc9..6154dc36fe 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -114,9 +114,9 @@ class Pet implements ArrayAccess
         return self::$getters;
     }
 
-    const STATUS_AVAILABLE = "available";
-    const STATUS_PENDING = "pending";
-    const STATUS_SOLD = "sold";
+    const STATUS_AVAILABLE = ""available"";
+    const STATUS_PENDING = ""pending"";
+    const STATUS_SOLD = ""sold"";
     
 
     
@@ -189,7 +189,7 @@ class Pet implements ArrayAccess
     }
     
     /**
-     * Gets id
+     * Gets id.
      * @return int
      */
     public function getId()
@@ -198,7 +198,7 @@ class Pet implements ArrayAccess
     }
 
     /**
-     * Sets id
+     * Sets id.
      * @param int $id 
      * @return $this
      */
@@ -210,7 +210,7 @@ class Pet implements ArrayAccess
     }
     
     /**
-     * Gets category
+     * Gets category.
      * @return \Swagger\Client\Model\Category
      */
     public function getCategory()
@@ -219,7 +219,7 @@ class Pet implements ArrayAccess
     }
 
     /**
-     * Sets category
+     * Sets category.
      * @param \Swagger\Client\Model\Category $category 
      * @return $this
      */
@@ -231,7 +231,7 @@ class Pet implements ArrayAccess
     }
     
     /**
-     * Gets name
+     * Gets name.
      * @return string
      */
     public function getName()
@@ -240,7 +240,7 @@ class Pet implements ArrayAccess
     }
 
     /**
-     * Sets name
+     * Sets name.
      * @param string $name 
      * @return $this
      */
@@ -252,7 +252,7 @@ class Pet implements ArrayAccess
     }
     
     /**
-     * Gets photo_urls
+     * Gets photo_urls.
      * @return string[]
      */
     public function getPhotoUrls()
@@ -261,7 +261,7 @@ class Pet implements ArrayAccess
     }
 
     /**
-     * Sets photo_urls
+     * Sets photo_urls.
      * @param string[] $photo_urls 
      * @return $this
      */
@@ -273,7 +273,7 @@ class Pet implements ArrayAccess
     }
     
     /**
-     * Gets tags
+     * Gets tags.
      * @return \Swagger\Client\Model\Tag[]
      */
     public function getTags()
@@ -282,7 +282,7 @@ class Pet implements ArrayAccess
     }
 
     /**
-     * Sets tags
+     * Sets tags.
      * @param \Swagger\Client\Model\Tag[] $tags 
      * @return $this
      */
@@ -294,7 +294,7 @@ class Pet implements ArrayAccess
     }
     
     /**
-     * Gets status
+     * Gets status.
      * @return string
      */
     public function getStatus()
@@ -303,7 +303,7 @@ class Pet implements ArrayAccess
     }
 
     /**
-     * Sets status
+     * Sets status.
      * @param string $status pet status in the store
      * @return $this
      */
@@ -359,7 +359,7 @@ class Pet implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -371,3 +371,5 @@ class Pet implements ArrayAccess
         }
     }
 }
+
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
index 891796ff78..daaa6f9262 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
@@ -119,7 +119,7 @@ class SpecialModelName implements ArrayAccess
     }
     
     /**
-     * Gets special_property_name
+     * Gets special_property_name.
      * @return int
      */
     public function getSpecialPropertyName()
@@ -128,7 +128,7 @@ class SpecialModelName implements ArrayAccess
     }
 
     /**
-     * Sets special_property_name
+     * Sets special_property_name.
      * @param int $special_property_name 
      * @return $this
      */
@@ -181,7 +181,7 @@ class SpecialModelName implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -193,3 +193,5 @@ class SpecialModelName implements ArrayAccess
         }
     }
 }
+
+?>
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 90bf901355..d0b5da095c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -130,7 +130,7 @@ class Tag implements ArrayAccess
     }
     
     /**
-     * Gets id
+     * Gets id.
      * @return int
      */
     public function getId()
@@ -139,7 +139,7 @@ class Tag implements ArrayAccess
     }
 
     /**
-     * Sets id
+     * Sets id.
      * @param int $id 
      * @return $this
      */
@@ -151,7 +151,7 @@ class Tag implements ArrayAccess
     }
     
     /**
-     * Gets name
+     * Gets name.
      * @return string
      */
     public function getName()
@@ -160,7 +160,7 @@ class Tag implements ArrayAccess
     }
 
     /**
-     * Sets name
+     * Sets name.
      * @param string $name 
      * @return $this
      */
@@ -213,7 +213,7 @@ class Tag implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -225,3 +225,5 @@ class Tag implements ArrayAccess
         }
     }
 }
+
+?>
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 10580a05eb..0d934a7351 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -196,7 +196,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets id
+     * Gets id.
      * @return int
      */
     public function getId()
@@ -205,7 +205,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets id
+     * Sets id.
      * @param int $id 
      * @return $this
      */
@@ -217,7 +217,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets username
+     * Gets username.
      * @return string
      */
     public function getUsername()
@@ -226,7 +226,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets username
+     * Sets username.
      * @param string $username 
      * @return $this
      */
@@ -238,7 +238,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets first_name
+     * Gets first_name.
      * @return string
      */
     public function getFirstName()
@@ -247,7 +247,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets first_name
+     * Sets first_name.
      * @param string $first_name 
      * @return $this
      */
@@ -259,7 +259,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets last_name
+     * Gets last_name.
      * @return string
      */
     public function getLastName()
@@ -268,7 +268,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets last_name
+     * Sets last_name.
      * @param string $last_name 
      * @return $this
      */
@@ -280,7 +280,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets email
+     * Gets email.
      * @return string
      */
     public function getEmail()
@@ -289,7 +289,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets email
+     * Sets email.
      * @param string $email 
      * @return $this
      */
@@ -301,7 +301,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets password
+     * Gets password.
      * @return string
      */
     public function getPassword()
@@ -310,7 +310,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets password
+     * Sets password.
      * @param string $password 
      * @return $this
      */
@@ -322,7 +322,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets phone
+     * Gets phone.
      * @return string
      */
     public function getPhone()
@@ -331,7 +331,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets phone
+     * Sets phone.
      * @param string $phone 
      * @return $this
      */
@@ -343,7 +343,7 @@ class User implements ArrayAccess
     }
     
     /**
-     * Gets user_status
+     * Gets user_status.
      * @return int
      */
     public function getUserStatus()
@@ -352,7 +352,7 @@ class User implements ArrayAccess
     }
 
     /**
-     * Sets user_status
+     * Sets user_status.
      * @param int $user_status User Status
      * @return $this
      */
@@ -405,7 +405,7 @@ class User implements ArrayAccess
     }
  
     /**
-     * Gets the string presentation of the object
+     * Gets the string presentation of the object.
      * @return string
      */
     public function __toString()
@@ -417,3 +417,5 @@ class User implements ArrayAccess
         }
     }
 }
+
+?>