[PHP] Fully support referenced enums

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java

@@ -58,6 +58,7 @@ public class CodegenProperty implements Cloneable {
             isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject;
     public boolean isListContainer, isMapContainer;
     public boolean isEnum;
+    public String referencedEnumType;
     public boolean isReadOnly;
     public boolean isWriteOnly;
     public boolean isNullable;
@@ -435,6 +436,7 @@ public int hashCode() {
             hasMoreNonReadOnly,
             isContainer,
             isEnum,
+            referencedEnumType,
             isPrimitiveType,
             isModel,
             isReadOnly,
@@ -533,6 +535,7 @@ public boolean equals(Object obj) {
             Objects.equals(isModel, other.isModel) &&
             Objects.equals(isContainer, other.isContainer) &&
             Objects.equals(isEnum, other.isEnum) &&
+            Objects.equals(referencedEnumType, other.referencedEnumType) &&
             Objects.equals(isReadOnly, other.isReadOnly) &&
             Objects.equals(isWriteOnly, other.isWriteOnly) &&
             Objects.equals(isNullable, other.isNullable) &&
@@ -657,6 +660,7 @@ public java.lang.String toString() {
                 ", isListContainer=" + isListContainer +
                 ", isMapContainer=" + isMapContainer +
                 ", isEnum=" + isEnum +
+                ", referencedEnumType=" + referencedEnumType +
                 ", isReadOnly=" + isReadOnly +
                 ", isWriteOnly=" + isWriteOnly +
                 ", isNullable=" + isNullable +

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -368,7 +368,7 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
                             enumName = value.toString();
                         }
                     }
-                    enumVar.put("name", toEnumVarName(enumName, cm.dataType));
+                    enumVar.put("name", toEnumVarName(enumName, cm.dataType, true));
                     enumVar.put("value", toEnumValue(value.toString(), cm.dataType));
                     enumVar.put("isString", isDataTypeString(cm.dataType));
                     enumVars.add(enumVar);
@@ -466,15 +466,16 @@ public String toEnumValue(String value, String datatype) {
      *
      * @param value    enum variable name
      * @param datatype data type
+     * @param isModel  true if this enum is on a dedicated/referenced model
      * @return the sanitized variable name for enum
      */
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "EMPTY";
         }
 
         String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
-        if (var.matches("\\d.*")) {
+        if (var.matches("^\\d")) {
             return "_" + var;
         } else {
             return var;
@@ -2233,19 +2234,23 @@ public CodegenProperty fromProperty(String name, Schema p) {
 
         Schema referencedSchema = ModelUtils.getReferencedSchema(this.openAPI, p);
 
-        //Referenced enum case:
-        if (referencedSchema.getEnum() != null && !referencedSchema.getEnum().isEmpty()) {
-            List<Object> _enum = referencedSchema.getEnum();
+        if (referencedSchema != p) {
+            //Referenced enum case:
+            if (referencedSchema.getEnum() != null && !referencedSchema.getEnum().isEmpty()) {
+                List<Object> _enum = referencedSchema.getEnum();
 
-            Map<String, Object> allowableValues = new HashMap<String, Object>();
-            allowableValues.put("values", _enum);
-            if (allowableValues.size() > 0) {
-                property.allowableValues = allowableValues;
+                property.referencedEnumType = getTypeDeclaration(referencedSchema);
+
+                Map<String, Object> allowableValues = new HashMap<String, Object>();
+                allowableValues.put("values", _enum);
+                if (allowableValues.size() > 0) {
+                    property.allowableValues = allowableValues;
+                }
             }
-        }
 
-        if (referencedSchema.getNullable() != null) {
-            property.isNullable = referencedSchema.getNullable();
+            if (referencedSchema.getNullable() != null) {
+                property.isNullable = referencedSchema.getNullable();
+            }
         }
 
         property.dataType = getTypeDeclaration(p);
@@ -4322,7 +4327,7 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
                 }
             }
 
-            enumVar.put("name", toEnumVarName(enumName, dataType));
+            enumVar.put("name", toEnumVarName(enumName, dataType, false));
             enumVar.put("value", toEnumValue(value.toString(), dataType));
             enumVar.put("isString", isDataTypeString(dataType));
             enumVars.add(enumVar);

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java

@@ -517,7 +517,7 @@ public String toEnumName(CodegenProperty property) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java

@@ -1025,7 +1025,7 @@ public String toEnumValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "Empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java

@@ -1013,7 +1013,7 @@ public String toEnumValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "Empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java

@@ -582,7 +582,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java

@@ -363,7 +363,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -1103,7 +1103,7 @@ public String toEnumName(CodegenProperty property) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java

@@ -538,7 +538,7 @@ public void setNeedsDataClassBody(boolean needsDataClassBody) {
      * @return the sanitized variable name for enum
      */
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         String modified;
         if (value.length() == 0) {
             modified = "EMPTY";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java

@@ -613,7 +613,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "EMPTY";
         }
@@ -629,6 +629,9 @@ public String toEnumVarName(String name, String datatype) {
             varName = varName.replaceAll("-", "MINUS_");
             varName = varName.replaceAll("\\+", "PLUS_");
             varName = varName.replaceAll("\\.", "_DOT_");
+            if (isModel && varName.matches("^\\d")) {
+                varName = "_" + varName;
+            }
             return varName;
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

@@ -519,7 +519,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "Empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java

@@ -300,7 +300,7 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
         super.updateCodegenPropertyEnum(var);
         if (var.isEnum && var.example != null) {
             String example = var.example.replace("'", "");
-            example = toEnumVarName(example, var.dataType);
+            example = toEnumVarName(example, var.dataType, false);
             var.example = toEnumDefaultValue(example, var.datatypeWithEnum);
         }
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java

@@ -435,7 +435,7 @@ public String toEnumValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java

@@ -731,7 +731,7 @@ private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenMode
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "Empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java

@@ -297,7 +297,7 @@ public void postProcessModelProperty(final CodegenModel model, final CodegenProp
     }
 
     @Override
-    public String toEnumVarName(final String name, final String datatype) {
+    public String toEnumVarName(final String name, final String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "Empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java

@@ -674,7 +674,7 @@ public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveRespo
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "Empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

@@ -454,7 +454,7 @@ private boolean buildEnumFromValues(CodegenModel cm) {
                     enumName = value.toString();
                 }
             }
-            enumVar.put("name", toEnumVarName(enumName, cm.dataType));
+            enumVar.put("name", toEnumVarName(enumName, cm.dataType, true));
             enumVar.put("value", toEnumValue(value.toString(), cm.dataType));
             enumVars.add(enumVar);
         }
@@ -497,7 +497,7 @@ private boolean buildEnumFromVendorExtension(CodegenModel cm) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java

@@ -112,7 +112,7 @@ public String escapeReservedWord(String name) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java

@@ -175,7 +175,7 @@ public String toEnumName(CodegenProperty property) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

@@ -263,7 +263,7 @@ public String toVarName(String name) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         String camelized = camelize(value.replace(" ", "_").replace("(", "_").replace(")", "")); // TODO FIXME escape properly
 
         if (camelized.length() == 0) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java

@@ -1344,8 +1344,8 @@ private void updateAllowableValuesNames(String paramNameType, Map<String, Object
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
-        if (!genEnums) return super.toEnumVarName(value, datatype);
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
+        if (!genEnums) return super.toEnumVarName(value, datatype, isModel);
 
         List<String> num = new ArrayList<>(Arrays.asList("integer", "int", "double", "long", "float"));
         if (value.length() == 0) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java

@@ -1133,7 +1133,7 @@ public String toEnumName(CodegenProperty property) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java

@@ -498,7 +498,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java

@@ -318,7 +318,7 @@ public String toEnumName(CodegenProperty property) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         name = name.replace(" ", "_");
         name = StringUtils.camelize(name, false);
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

@@ -360,7 +360,7 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
                 }
             }
 
-            enumVar.put("name", toEnumVarName(enumName, dataType));
+            enumVar.put("name", toEnumVarName(enumName, dataType, false));
             enumVar.put("value", toEnumValue(value.toString(), dataType));
             enumVar.put("isString", isDataTypeString(dataType));
             enumVars.add(enumVar);
@@ -527,7 +527,7 @@ public void handleMethodResponse(Operation operation,
      * @param datatype data type
      * @return the sanitized variable name for enum
      */
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         // our enum var names are keys in a python dict, so change spaces to underscores
         if (value.length() == 0) {
             return "EMPTY";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java

@@ -470,7 +470,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java

@@ -420,7 +420,7 @@ public String toEnumValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java

@@ -530,7 +530,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "Empty";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java

@@ -403,7 +403,7 @@ public String toEnumName(CodegenProperty property) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         String var = null;
         if (value.isEmpty()) {
             var = "EMPTY";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java

@@ -368,7 +368,7 @@ public String camelizeStripReservedEscape(String str) {
     }
 
     @Override
-    public String toEnumVarName(String value, String datatype) {
+    public String toEnumVarName(String value, String datatype, boolean isModel) {
         if (value.length() == 0) {
             return "EMPTY";
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java

@@ -585,7 +585,7 @@ public String toEnumDefaultValue(String value, String datatype) {
     }
 
     @Override
-    public String toEnumVarName(String name, String datatype) {
+    public String toEnumVarName(String name, String datatype, boolean isModel) {
         if (name.length() == 0) {
             return "empty";
         }