Merge pull request #3217 from wing328/php_enum_class

[PHP] add enum class support, merge test cases

Author: wing328

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java

@@ -45,6 +45,7 @@ public class CodegenProperty implements Cloneable {
     public Map<String, Object> vendorExtensions;
     public Boolean hasValidation; // true if pattern, maximum, etc are set (only used in the mustache template)
     public Boolean isInherited;
+    public String nameInCamelCase; // property name in camel case
 
     @Override
     public String toString() {
@@ -108,6 +109,7 @@ public int hashCode()
         result = prime * result + ((isMapContainer == null) ? 0 : isMapContainer.hashCode());
         result = prime * result + ((isListContainer == null) ? 0 : isListContainer.hashCode());
         result = prime * result + Objects.hashCode(isInherited);
+        result = prime * result + Objects.hashCode(nameInCamelCase);
         return result;
     }
 
@@ -262,6 +264,9 @@ public boolean equals(Object obj) {
         if (!Objects.equals(this.isInherited, other.isInherited)) {
             return false;
         }
+        if (!Objects.equals(this.nameInCamelCase, other.nameInCamelCase)) {
+            return false;
+        }
         return true;
     }
 

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -1296,6 +1296,7 @@ public CodegenProperty fromProperty(String name, Property p) {
 
         property.name = toVarName(name);
         property.baseName = name;
+        property.nameInCamelCase = camelize(name, false);
         property.description = escapeText(p.getDescription());
         property.unescapedDescription = p.getDescription();
         property.getter = "get" + getterAndSetterCapitalize(name);

modules/swagger-codegen/src/main/resources/php/api_test.mustache

@@ -17,7 +17,7 @@
  * Please update the test case below to test the endpoint.
  */
 
-namespace {{apiPackage}};
+namespace {{invokerPackage}};
 
 use \{{invokerPackage}}\Configuration;
 use \{{invokerPackage}}\ApiClient;
@@ -37,16 +37,32 @@ use \{{invokerPackage}}\ObjectSerializer;
 {
 
     /**
-     * Setup before running each test case
+     * Setup before running any test cases
      */
     public static function setUpBeforeClass()
     {
 
     }
 
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+
+    }
+
     /**
      * Clean up after running each test case
      */
+    public function tearDown()
+    {
+
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
     public static function tearDownAfterClass()
     {
 
@@ -63,6 +79,7 @@ use \{{invokerPackage}}\ObjectSerializer;
     {
 
     }
+
     {{/operation}}
 }
 {{/operations}}