From ff00b1924741da5a7de1743bb2e3a25c0d47dd20 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 12:31:53 +0900 Subject: [PATCH 01/28] Extends AbstractPhpCodegen instead of DefaultCodegen --- .../org/openapitools/codegen/languages/PhpClientCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index db5b2abdb046..9f34357064a2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -47,7 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { +public class PhpClientCodegen extends AbstractPhpCodegen implements CodegenConfig { @SuppressWarnings("hiding") private static final Logger LOGGER = LoggerFactory.getLogger(PhpClientCodegen.class); From ad58695323956f09a519d4da1de567fdb8b73872 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 12:47:25 +0900 Subject: [PATCH 02/28] Remove fully duplicated methods with AbstractPhpCodegen --- .../codegen/languages/PhpClientCodegen.java | 122 ------------------ 1 file changed, 122 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 9f34357064a2..20c08ff42c22 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -177,35 +177,6 @@ public String toPackagePath(String packageName, String basePath) { return (getPackagePath() + File.separatorChar + toSrcPath(packageName, basePath)); } - public String toSrcPath(String packageName, String basePath) { - packageName = packageName.replace(invokerPackage, ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. - if (basePath != null && basePath.length() > 0) { - basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar; // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. - } - - String regFirstPathSeparator; - if ("/".equals(File.separator)) { // for mac, linux - regFirstPathSeparator = "^/"; - } else { // for windows - regFirstPathSeparator = "^\\\\"; - } - - String regLastPathSeparator; - if ("/".equals(File.separator)) { // for mac, linux - regLastPathSeparator = "/$"; - } else { // for windows - regLastPathSeparator = "\\\\$"; - } - - return (basePath - // Replace period, backslash, forward slash with file separator in package name - + packageName.replaceAll("[\\.\\\\/]", Matcher.quoteReplacement(File.separator)) - // Trim prefix file separators from package path - .replaceAll(regFirstPathSeparator, "")) - // Trim trailing file separators from the overall path - .replaceAll(regLastPathSeparator + "$", ""); - } - @Override public String escapeText(String input) { if (input != null) { @@ -403,27 +374,6 @@ public String getTypeDeclaration(String name) { return super.getTypeDeclaration(name); } - @Override - public String getSchemaType(Schema p) { - String openAPIType = super.getSchemaType(p); - - String type = null; - if (typeMapping.containsKey(openAPIType)) { - type = typeMapping.get(openAPIType); - if (languageSpecificPrimitives.contains(type)) { - return type; - } else if (instantiationTypes.containsKey(type)) { - return type; - } - } else { - type = openAPIType; - } - if (type == null) { - return null; - } - return toModelName(type); - } - public String getInvokerPackage() { return invokerPackage; } @@ -486,45 +436,6 @@ public String toParamName(String name) { return toVarName(name); } - @Override - public String toModelName(String name) { - // remove [ - name = name.replaceAll("\\]", ""); - - // Note: backslash ("\\") is allowed for e.g. "\\DateTime" - name = name.replaceAll("[^\\w\\\\]+", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. - - // remove dollar sign - name = name.replaceAll("$", ""); - - // model name cannot use reserved keyword - if (isReservedWord(name)) { - LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name)); - name = "model_" + name; // e.g. return => ModelReturn (after camelize) - } - - // model name starts with number - if (name.matches("^\\d.*")) { - LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name)); - name = "model_" + name; // e.g. 200Response => Model200Response (after camelize) - } - - // add prefix and/or suffic only if name does not start wth \ (e.g. \DateTime) - if (!name.matches("^\\\\.*")) { - if (!StringUtils.isEmpty(modelNamePrefix)) { - name = modelNamePrefix + "_" + name; - } - - if (!StringUtils.isEmpty(modelNameSuffix)) { - name = name + "_" + modelNameSuffix; - } - } - - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); - } - @Override public String toModelFilename(String name) { // should be the same as the model name @@ -553,39 +464,6 @@ public String toOperationId(String operationId) { return camelize(sanitizeName(operationId), true); } - /** - * Return the default value of the property - * - * @param p property schema - * @return string presentation of the default value of the property - */ - @Override - public String toDefaultValue(Schema p) { - if (ModelUtils.isBooleanSchema(p)) { - if (p.getDefault() != null) { - return p.getDefault().toString(); - } - } else if (ModelUtils.isDateSchema(p)) { - // TODO - } else if (ModelUtils.isDateTimeSchema(p)) { - // TODO - } else if (ModelUtils.isNumberSchema(p)) { - if (p.getDefault() != null) { - return p.getDefault().toString(); - } - } else if (ModelUtils.isIntegerSchema(p)) { - if (p.getDefault() != null) { - return p.getDefault().toString(); - } - } else if (ModelUtils.isStringSchema(p)) { - if (p.getDefault() != null) { - return "'" + p.getDefault() + "'"; - } - } - - return null; - } - @Override public void setParameterExampleValue(CodegenParameter p) { String example; From d841d955c32d2f32ef4b633263c6041e0091e08a Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 12:54:15 +0900 Subject: [PATCH 03/28] Remove duplicated properties with AbstractPhpCodegen --- .../codegen/languages/PhpClientCodegen.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 20c08ff42c22..1c40723d77bd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -51,24 +51,12 @@ public class PhpClientCodegen extends AbstractPhpCodegen implements CodegenConfi @SuppressWarnings("hiding") private static final Logger LOGGER = LoggerFactory.getLogger(PhpClientCodegen.class); - public static final String VARIABLE_NAMING_CONVENTION = "variableNamingConvention"; - public static final String PACKAGE_PATH = "packagePath"; - public static final String SRC_BASE_PATH = "srcBasePath"; public static final String COMPOSER_VENDOR_NAME = "composerVendorName"; public static final String COMPOSER_PROJECT_NAME = "composerProjectName"; protected String invokerPackage = "OpenAPI\\Client"; protected String composerVendorName = null; protected String composerProjectName = null; protected String packagePath = "OpenAPIClient-php"; - protected String artifactVersion = null; - protected String srcBasePath = "lib"; - protected String testBasePath = "test"; - protected String docsBasePath = "docs"; - protected String apiDirName = "Api"; - protected String modelDirName = "Model"; - protected String variableNamingConvention = "snake_case"; - protected String apiDocPath = docsBasePath + "/" + apiDirName; - protected String modelDocPath = docsBasePath + "/" + modelDirName; public PhpClientCodegen() { super(); From 3c34c0b3773f62d4c2143a14d343827cfa2e0aba Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 13:13:32 +0900 Subject: [PATCH 04/28] Remove duplicated codes in constructor with AbstractPhpCodegen --- .../codegen/languages/PhpClientCodegen.java | 72 ------------------- 1 file changed, 72 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 1c40723d77bd..fc4cce21287b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -67,92 +67,20 @@ public PhpClientCodegen() { supportsInheritance = true; outputFolder = "generated-code" + File.separator + "php"; - modelTemplateFiles.put("model.mustache", ".php"); - apiTemplateFiles.put("api.mustache", ".php"); modelTestTemplateFiles.put("model_test.mustache", ".php"); - apiTestTemplateFiles.put("api_test.mustache", ".php"); embeddedTemplateDir = templateDir = "php"; - apiPackage = invokerPackage + "\\" + apiDirName; - modelPackage = invokerPackage + "\\" + modelDirName; - - modelDocTemplateFiles.put("model_doc.mustache", ".md"); - apiDocTemplateFiles.put("api_doc.mustache", ".md"); // default HIDE_GENERATION_TIMESTAMP to true hideGenerationTimestamp = Boolean.TRUE; - setReservedWordsLowerCase( - Arrays.asList( - // local variables used in api methods (endpoints) - "resourcePath", "httpBody", "queryParams", "headerParams", - "formParams", "_header_accept", "_tempBody", - - // PHP reserved words - "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor") - ); - - // ref: http://php.net/manual/en/language.types.intro.php - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "bool", - "boolean", - "int", - "integer", - "double", - "float", - "string", - "object", - "DateTime", - "mixed", - "number", - "void", - "byte") - ); - - instantiationTypes.put("array", "array"); - instantiationTypes.put("map", "map"); - - // provide primitives to mustache template List sortedLanguageSpecificPrimitives = new ArrayList(languageSpecificPrimitives); Collections.sort(sortedLanguageSpecificPrimitives); String primitives = "'" + StringUtils.join(sortedLanguageSpecificPrimitives, "', '") + "'"; additionalProperties.put("primitives", primitives); - // ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types - typeMapping = new HashMap(); - typeMapping.put("integer", "int"); - typeMapping.put("long", "int"); - typeMapping.put("number", "float"); - typeMapping.put("float", "float"); - typeMapping.put("double", "double"); - typeMapping.put("string", "string"); - typeMapping.put("byte", "int"); - typeMapping.put("boolean", "bool"); - typeMapping.put("date", "\\DateTime"); - typeMapping.put("Date", "\\DateTime"); - typeMapping.put("DateTime", "\\DateTime"); - typeMapping.put("file", "\\SplFileObject"); - typeMapping.put("map", "map"); - typeMapping.put("array", "array"); - typeMapping.put("list", "array"); - typeMapping.put("object", "object"); - typeMapping.put("binary", "\\SplFileObject"); - typeMapping.put("ByteArray", "string"); - typeMapping.put("UUID", "string"); - - cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); - cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); - cliOptions.add(new CliOption(VARIABLE_NAMING_CONVENTION, "naming convention of variable name, e.g. camelCase.") - .defaultValue("snake_case")); - cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets")); - cliOptions.add(new CliOption(PACKAGE_PATH, "The main package name for classes. e.g. GeneratedPetstore")); - cliOptions.add(new CliOption(SRC_BASE_PATH, "The directory under packagePath to serve as source root.")); cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next openapi-generator release")); - cliOptions.add(new CliOption(CodegenConstants.GIT_USER_ID, CodegenConstants.GIT_USER_ID_DESC)); cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next openapi-generator release")); - cliOptions.add(new CliOption(CodegenConstants.GIT_REPO_ID, CodegenConstants.GIT_REPO_ID_DESC)); - cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "The version to use in the composer package version field. e.g. 1.2.3")); cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.ALLOW_UNICODE_IDENTIFIERS_DESC) .defaultValue(Boolean.TRUE.toString())); } From c731696eda869c8e2ff8bca8e8c79122283342bc Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 13:22:56 +0900 Subject: [PATCH 05/28] Add typeMapping "date". Moved from PhpClientCodegen refs: https://github.com/OpenAPITools/openapi-generator/pull/504/commits/3c34c0b3773f62d4c2143a14d343827cfa2e0aba#diff-f1801ef05a7926bf394c90f44ae4ab3dL132 --- .../org/openapitools/codegen/languages/AbstractPhpCodegen.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 38b670dd9912..2724d29928ed 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -127,6 +127,7 @@ public AbstractPhpCodegen() { typeMapping.put("string", "string"); typeMapping.put("byte", "int"); typeMapping.put("boolean", "bool"); + typeMapping.put("date", "\\DateTime"); typeMapping.put("Date", "\\DateTime"); typeMapping.put("DateTime", "\\DateTime"); typeMapping.put("file", "\\SplFileObject"); From 296e6d3db47e19ad2d4327697c1e7d7a2e7c6b5d Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 16:26:51 +0900 Subject: [PATCH 06/28] Remove duplicated codes in processOpts() --- .../codegen/languages/PhpClientCodegen.java | 71 ------------------- 1 file changed, 71 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index fc4cce21287b..0fc36e1519e0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -121,89 +121,18 @@ public String getHelp() { public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey(PACKAGE_PATH)) { - this.setPackagePath((String) additionalProperties.get(PACKAGE_PATH)); - } else { - additionalProperties.put(PACKAGE_PATH, packagePath); - } - - if (additionalProperties.containsKey(SRC_BASE_PATH)) { - this.setSrcBasePath((String) additionalProperties.get(SRC_BASE_PATH)); - } else { - additionalProperties.put(SRC_BASE_PATH, srcBasePath); - } - - if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { - this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE)); - - // Update the invokerPackage for the default apiPackage and modelPackage - apiPackage = invokerPackage + "\\" + apiDirName; - modelPackage = invokerPackage + "\\" + modelDirName; - } else { - additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); - } - - if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { - // Update model package to contain the specified model package name and the invoker package - modelPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE); - } - additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); - - if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { - // Update model package to contain the specified model package name and the invoker package - apiPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.API_PACKAGE); - } - additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); - if (additionalProperties.containsKey(COMPOSER_PROJECT_NAME)) { this.setComposerProjectName((String) additionalProperties.get(COMPOSER_PROJECT_NAME)); } else { additionalProperties.put(COMPOSER_PROJECT_NAME, composerProjectName); } - if (additionalProperties.containsKey(CodegenConstants.GIT_USER_ID)) { - this.setGitUserId((String) additionalProperties.get(CodegenConstants.GIT_USER_ID)); - } else { - additionalProperties.put(CodegenConstants.GIT_USER_ID, gitUserId); - } - if (additionalProperties.containsKey(COMPOSER_VENDOR_NAME)) { this.setComposerVendorName((String) additionalProperties.get(COMPOSER_VENDOR_NAME)); } else { additionalProperties.put(COMPOSER_VENDOR_NAME, composerVendorName); } - if (additionalProperties.containsKey(CodegenConstants.GIT_REPO_ID)) { - this.setGitRepoId((String) additionalProperties.get(CodegenConstants.GIT_REPO_ID)); - } else { - additionalProperties.put(CodegenConstants.GIT_REPO_ID, gitRepoId); - } - - if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) { - this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION)); - } else { - additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); - } - - if (additionalProperties.containsKey(VARIABLE_NAMING_CONVENTION)) { - this.setParameterNamingConvention((String) additionalProperties.get(VARIABLE_NAMING_CONVENTION)); - } - - additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\")); - - // make api and model src path available in mustache template - additionalProperties.put("apiSrcPath", "./" + toSrcPath(apiPackage, srcBasePath)); - additionalProperties.put("modelSrcPath", "./" + toSrcPath(modelPackage, srcBasePath)); - additionalProperties.put("apiTestPath", "./" + testBasePath + "/" + apiDirName); - additionalProperties.put("modelTestPath", "./" + testBasePath + "/" + modelDirName); - - // make api and model doc path available in mustache template - additionalProperties.put("apiDocPath", apiDocPath); - additionalProperties.put("modelDocPath", modelDocPath); - - // make test path available in mustache template - additionalProperties.put("testBasePath", testBasePath); - supportingFiles.add(new SupportingFile("ApiException.mustache", toPackagePath(invokerPackage, srcBasePath), "ApiException.php")); supportingFiles.add(new SupportingFile("Configuration.mustache", toPackagePath(invokerPackage, srcBasePath), "Configuration.php")); supportingFiles.add(new SupportingFile("ObjectSerializer.mustache", toPackagePath(invokerPackage, srcBasePath), "ObjectSerializer.php")); From 2059ba32d45b44784e446ec53bfecacdedf04a05 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 16:27:47 +0900 Subject: [PATCH 07/28] Remove unnecessary 'implements' --- .../org/openapitools/codegen/languages/PhpClientCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 0fc36e1519e0..ca4d50a8c2fb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -47,7 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PhpClientCodegen extends AbstractPhpCodegen implements CodegenConfig { +public class PhpClientCodegen extends AbstractPhpCodegen { @SuppressWarnings("hiding") private static final Logger LOGGER = LoggerFactory.getLogger(PhpClientCodegen.class); From 7c0659cf02de219afd6e46cadae4496ffb65b9de Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 16:42:17 +0900 Subject: [PATCH 08/28] Remove unnecessary method override --- .../codegen/languages/PhpClientCodegen.java | 164 ------------------ 1 file changed, 164 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index ca4d50a8c2fb..434e6c5acaa7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -85,14 +85,6 @@ public PhpClientCodegen() { .defaultValue(Boolean.TRUE.toString())); } - public String getPackagePath() { - return packagePath; - } - - public String toPackagePath(String packageName, String basePath) { - return (getPackagePath() + File.separatorChar + toSrcPath(packageName, basePath)); - } - @Override public String escapeText(String input) { if (input != null) { @@ -154,46 +146,6 @@ public String escapeReservedWord(String name) { return "_" + name; } - @Override - public String apiFileFolder() { - return (outputFolder + "/" + toPackagePath(apiPackage, srcBasePath)); - } - - @Override - public String modelFileFolder() { - return (outputFolder + "/" + toPackagePath(modelPackage, srcBasePath)); - } - - @Override - public String apiTestFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + testBasePath + "/" + apiDirName); - } - - @Override - public String modelTestFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + testBasePath + "/" + modelDirName); - } - - @Override - public String apiDocFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + apiDocPath); - } - - @Override - public String modelDocFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + modelDocPath); - } - - @Override - public String toModelDocFilename(String name) { - return toModelName(name); - } - - @Override - public String toApiDocFilename(String name) { - return toApiName(name); - } - @Override public String getTypeDeclaration(Schema p) { if (ModelUtils.isArraySchema(p)) { @@ -211,38 +163,6 @@ public String getTypeDeclaration(Schema p) { return super.getTypeDeclaration(p); } - @Override - public String getTypeDeclaration(String name) { - if (!languageSpecificPrimitives.contains(name)) { - return "\\" + modelPackage + "\\" + name; - } - return super.getTypeDeclaration(name); - } - - public String getInvokerPackage() { - return invokerPackage; - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public void setPackagePath(String packagePath) { - this.packagePath = packagePath; - } - - public void setSrcBasePath(String srcBasePath) { - this.srcBasePath = srcBasePath; - } - - public void setParameterNamingConvention(String variableNamingConvention) { - this.variableNamingConvention = variableNamingConvention; - } - public void setComposerVendorName(String composerVendorName) { this.composerVendorName = composerVendorName; } @@ -251,64 +171,6 @@ public void setComposerProjectName(String composerProjectName) { this.composerProjectName = composerProjectName; } - @Override - public String toVarName(String name) { - // sanitize name - name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. - - if ("camelCase".equals(variableNamingConvention)) { - // return the name in camelCase style - // phone_number => phoneNumber - name = camelize(name, true); - } else { // default to snake case - // return the name in underscore style - // PhoneNumber => phone_number - name = underscore(name); - } - - // parameter name starting with number won't compile - // need to escape it by appending _ at the beginning - if (name.matches("^\\d.*")) { - name = "_" + name; - } - - return name; - } - - @Override - public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - @Override - public String toModelTestFilename(String name) { - // should be the same as the model name - return toModelName(name) + "Test"; - } - - @Override - public String toOperationId(String operationId) { - // throw exception if method name is empty - if (StringUtils.isEmpty(operationId)) { - throw new RuntimeException("Empty method name (operationId) not allowed"); - } - - // method name cannot use reserved keyword, e.g. return - if (isReservedWord(operationId)) { - LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true)); - operationId = "call_" + operationId; - } - - return camelize(sanitizeName(operationId), true); - } - @Override public void setParameterExampleValue(CodegenParameter p) { String example; @@ -376,20 +238,6 @@ public void setParameterExampleValue(CodegenParameter p) { p.example = example; } - @Override - public String toEnumValue(String value, String datatype) { - if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) { - return value; - } else { - return "\'" + escapeText(value) + "\'"; - } - } - - @Override - public String toEnumDefaultValue(String value, String datatype) { - return datatype + "_" + value; - } - @Override public String toEnumVarName(String name, String datatype) { if (name.length() == 0) { @@ -436,12 +284,6 @@ public String toEnumName(CodegenProperty property) { } } - @Override - public Map postProcessModels(Map objs) { - // process enum in models - return postProcessModelsEnum(objs); - } - @Override public Map postProcessOperationsWithModels(Map objs, List allModels) { Map operations = (Map) objs.get("operations"); @@ -454,12 +296,6 @@ public Map postProcessOperationsWithModels(Map o return objs; } - @Override - public String escapeQuotationMark(String input) { - // remove ' to avoid code injection - return input.replace("'", ""); - } - @Override public String escapeUnsafeCharacters(String input) { return input.replace("*/", "*_/").replace("/*", "/_*"); From 46be8c8030f8902f41890ad7ae994db1c8ccfdf5 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:29:59 +0900 Subject: [PATCH 09/28] Use setter --- .../openapitools/codegen/languages/PhpClientCodegen.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 434e6c5acaa7..126bc76f97ab 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -53,10 +53,8 @@ public class PhpClientCodegen extends AbstractPhpCodegen { public static final String COMPOSER_VENDOR_NAME = "composerVendorName"; public static final String COMPOSER_PROJECT_NAME = "composerProjectName"; - protected String invokerPackage = "OpenAPI\\Client"; protected String composerVendorName = null; protected String composerProjectName = null; - protected String packagePath = "OpenAPIClient-php"; public PhpClientCodegen() { super(); @@ -65,8 +63,12 @@ public PhpClientCodegen() { // at the moment importMapping.clear(); + setInvokerPackage("OpenAPI\\Client"); + setApiPackage(getInvokerPackage() + "\\" + apiDirName); + setModelPackage(getInvokerPackage() + "\\" + modelDirName); + setPackagePath("OpenAPIClient-php"); supportsInheritance = true; - outputFolder = "generated-code" + File.separator + "php"; + setOutputDir("generated-code" + File.separator + "php"); modelTestTemplateFiles.put("model_test.mustache", ".php"); embeddedTemplateDir = templateDir = "php"; From 035648654453632494f971cbd7b12c5518c68263 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:34:24 +0900 Subject: [PATCH 10/28] Merge getTypeDeclaration() into AbstractPhpCodegen --- .../codegen/languages/AbstractPhpCodegen.java | 2 +- .../codegen/languages/PhpClientCodegen.java | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 2724d29928ed..e34adb6f77c3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -330,7 +330,7 @@ public String getTypeDeclaration(Schema p) { } else if (ModelUtils.isMapSchema(p)) { Schema inner = (Schema) p.getAdditionalProperties(); return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]"; - } else if (!StringUtils.isEmpty(p.get$ref())) { // model + } else if (StringUtils.isNotBlank(p.get$ref())) { // model String type = super.getTypeDeclaration(p); return (!languageSpecificPrimitives.contains(type)) ? "\\" + modelPackage + "\\" + type : type; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 126bc76f97ab..b9780d737bb6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -148,23 +148,6 @@ public String escapeReservedWord(String name) { return "_" + name; } - @Override - public String getTypeDeclaration(Schema p) { - if (ModelUtils.isArraySchema(p)) { - ArraySchema ap = (ArraySchema) p; - Schema inner = ap.getItems(); - return getTypeDeclaration(inner) + "[]"; - } else if (ModelUtils.isMapSchema(p)) { - Schema inner = (Schema) p.getAdditionalProperties(); - return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]"; - } else if (StringUtils.isNotBlank(p.get$ref())) { - String type = super.getTypeDeclaration(p); - return (!languageSpecificPrimitives.contains(type)) - ? "\\" + modelPackage + "\\" + type : type; - } - return super.getTypeDeclaration(p); - } - public void setComposerVendorName(String composerVendorName) { this.composerVendorName = composerVendorName; } From 4e7b7afc1a895ce6ffc191eabb73eb846c12306f Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:41:35 +0900 Subject: [PATCH 11/28] Merge processOpts() into AbstractPhpCodegen refs: * https://github.com/OpenAPITools/openapi-generator/pull/504/commits/296e6d3db47e19ad2d4327697c1e7d7a2e7c6b5d#diff-f1801ef05a7926bf394c90f44ae4ab3dL139 * https://github.com/OpenAPITools/openapi-generator/pull/504/commits/296e6d3db47e19ad2d4327697c1e7d7a2e7c6b5d#diff-f1801ef05a7926bf394c90f44ae4ab3dL147 * https://github.com/OpenAPITools/openapi-generator/pull/504/commits/296e6d3db47e19ad2d4327697c1e7d7a2e7c6b5d#diff-f1801ef05a7926bf394c90f44ae4ab3dL153 --- .../codegen/languages/AbstractPhpCodegen.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index e34adb6f77c3..75b07adee232 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -171,16 +171,28 @@ public void processOpts() { if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE)); + + // Update the invokerPackage for the default apiPackage and modelPackage + apiPackage = invokerPackage + "\\" + apiDirName; + modelPackage = invokerPackage + "\\" + modelDirName; } else { additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); } if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); + } else { + // Update model package to contain the specified model package name and the invoker package + modelPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE); + additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); } if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); + } else { + // Update api package to contain the specified api package name and the invoker package + apiPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.API_PACKAGE); + additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); } // if (additionalProperties.containsKey(COMPOSER_PROJECT_NAME)) { From 36d1e17624b7e0e204989b7eac07421a57868f97 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:45:20 +0900 Subject: [PATCH 12/28] tweak --- .../openapitools/codegen/languages/AbstractPhpCodegen.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 75b07adee232..54fbe23ea839 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -180,20 +180,18 @@ public void processOpts() { } if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { - additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); } else { // Update model package to contain the specified model package name and the invoker package modelPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE); - additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); } + additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { - additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); } else { // Update api package to contain the specified api package name and the invoker package apiPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.API_PACKAGE); - additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); } + additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); // if (additionalProperties.containsKey(COMPOSER_PROJECT_NAME)) { // this.setComposerProjectName((String) additionalProperties.get(COMPOSER_PROJECT_NAME)); From f84896d72c2fc8061a190cc56e739e8a24967efe Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:47:12 +0900 Subject: [PATCH 13/28] Optimize IF statement --- .../openapitools/codegen/languages/AbstractPhpCodegen.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 54fbe23ea839..facb97a382d2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -179,15 +179,13 @@ public void processOpts() { additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); } - if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { - } else { + if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { // Update model package to contain the specified model package name and the invoker package modelPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE); } additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); - if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { - } else { + if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { // Update api package to contain the specified api package name and the invoker package apiPackage = invokerPackage + "\\" + (String) additionalProperties.get(CodegenConstants.API_PACKAGE); } From 2ad0f6f7d44792ac7613735d38a160f48a0defd2 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:52:10 +0900 Subject: [PATCH 14/28] Remove duplicated methods --- .../codegen/languages/PhpClientCodegen.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index b9780d737bb6..c4cac8723936 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -87,15 +87,6 @@ public PhpClientCodegen() { .defaultValue(Boolean.TRUE.toString())); } - @Override - public String escapeText(String input) { - if (input != null) { - // Trim the string to avoid leading and trailing spaces. - return super.escapeText(input).trim(); - } - return input; - } - @Override public CodegenType getTag() { return CodegenType.CLIENT; @@ -140,14 +131,6 @@ public void processOpts() { supportingFiles.add(new SupportingFile("git_push.sh.mustache", getPackagePath(), "git_push.sh")); } - @Override - public String escapeReservedWord(String name) { - if (this.reservedWordsMappings().containsKey(name)) { - return this.reservedWordsMappings().get(name); - } - return "_" + name; - } - public void setComposerVendorName(String composerVendorName) { this.composerVendorName = composerVendorName; } From 9272d6514d210851b52c9516580e918a0b0c7ea3 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:56:46 +0900 Subject: [PATCH 15/28] Merge setParameterExampleValue() into AbstractPhpCodegen --- .../codegen/languages/AbstractPhpCodegen.java | 8 +-- .../codegen/languages/PhpClientCodegen.java | 67 ------------------- 2 files changed, 4 insertions(+), 71 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index facb97a382d2..098492b01291 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -551,7 +551,7 @@ public void setParameterExampleValue(CodegenParameter p) { type = p.dataType; } - if ("String".equalsIgnoreCase(type)) { + if ("String".equalsIgnoreCase(type) || p.isString) { if (example == null) { example = p.paramName + "_example"; } @@ -568,12 +568,12 @@ public void setParameterExampleValue(CodegenParameter p) { if (example == null) { example = "True"; } - } else if ("\\SplFileObject".equalsIgnoreCase(type)) { + } else if ("\\SplFileObject".equalsIgnoreCase(type) || p.isFile) { if (example == null) { - example = "/path/to/file"; + example = "/path/to/file.txt"; } example = "\"" + escapeText(example) + "\""; - } else if ("Date".equalsIgnoreCase(type)) { + } else if ("\\Date".equalsIgnoreCase(type)) { if (example == null) { example = "2013-10-20"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index c4cac8723936..87930afa4b51 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -139,73 +139,6 @@ public void setComposerProjectName(String composerProjectName) { this.composerProjectName = composerProjectName; } - @Override - public void setParameterExampleValue(CodegenParameter p) { - String example; - - if (p.defaultValue == null) { - example = p.example; - } else { - example = p.defaultValue; - } - - String type = p.baseType; - if (type == null) { - type = p.dataType; - } - - if ("String".equalsIgnoreCase(type) || p.isString) { - if (example == null) { - example = "'" + p.paramName + "_example'"; - } - example = escapeText(example); - } else if ("Integer".equals(type) || "int".equals(type)) { - if (example == null) { - example = "56"; - } - } else if ("Float".equalsIgnoreCase(type) || "Double".equalsIgnoreCase(type)) { - if (example == null) { - example = "3.4"; - } - } else if ("BOOLEAN".equalsIgnoreCase(type) || "bool".equalsIgnoreCase(type)) { - if (example == null) { - example = "True"; - } - } else if ("\\SplFileObject".equalsIgnoreCase(type) || p.isFile) { - if (example == null) { - example = "/path/to/file.txt"; - } - example = "\"" + escapeText(example) + "\""; - } else if ("\\Date".equalsIgnoreCase(type)) { - if (example == null) { - example = "2013-10-20"; - } - example = "new \\DateTime(\"" + escapeText(example) + "\")"; - } else if ("\\DateTime".equalsIgnoreCase(type)) { - if (example == null) { - example = "2013-10-20T19:20:30+01:00"; - } - example = "new \\DateTime(\"" + escapeText(example) + "\")"; - } else if ("object".equals(type)) { - example = "new \\stdClass"; - } else if (!languageSpecificPrimitives.contains(type)) { - // type is a model class, e.g. User - example = "new " + getTypeDeclaration(type) + "()"; - } else { - LOGGER.warn("Type " + type + " not handled properly in setParameterExampleValue"); - } - - if (example == null) { - example = "NULL"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { - example = "array(" + example + ")"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { - example = "array('key' => " + example + ")"; - } - - p.example = example; - } - @Override public String toEnumVarName(String name, String datatype) { if (name.length() == 0) { From 3dff45cfc8656bb7e4aa79cc46c414bd895b1c85 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 17:59:14 +0900 Subject: [PATCH 16/28] Merge toEnumVarName() into AbstractPhpCodegen --- .../codegen/languages/AbstractPhpCodegen.java | 4 +-- .../codegen/languages/PhpClientCodegen.java | 32 ------------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 098492b01291..2b1a0ce4f30c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -640,8 +640,8 @@ public String toEnumVarName(String name, String datatype) { enumName = enumName.replaceFirst("^_", ""); enumName = enumName.replaceFirst("_$", ""); - if (enumName.matches("\\d.*")) { // starts with number - return "_" + enumName; + if (isReservedWord(enumName) || enumName.matches("\\d.*")) { // reserved word or starts with number + return escapeReservedWord(enumName); } else { return enumName; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 87930afa4b51..50200b5eaa58 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -139,38 +139,6 @@ public void setComposerProjectName(String composerProjectName) { this.composerProjectName = composerProjectName; } - @Override - public String toEnumVarName(String name, String datatype) { - if (name.length() == 0) { - return "EMPTY"; - } - - // number - if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) { - String varName = name; - varName = varName.replaceAll("-", "MINUS_"); - varName = varName.replaceAll("\\+", "PLUS_"); - varName = varName.replaceAll("\\.", "_DOT_"); - return varName; - } - - // for symbol, e.g. $, # - if (getSymbolName(name) != null) { - return getSymbolName(name).toUpperCase(); - } - - // string - String enumName = sanitizeName(underscore(name).toUpperCase()); - enumName = enumName.replaceFirst("^_", ""); - enumName = enumName.replaceFirst("_$", ""); - - if (isReservedWord(enumName) || enumName.matches("\\d.*")) { // reserved word or starts with number - return escapeReservedWord(enumName); - } else { - return enumName; - } - } - @Override public String toEnumName(CodegenProperty property) { String enumName = underscore(toModelName(property.name)).toUpperCase(); From 73d36f4fc42d04cb02481a883d5fd63d32871518 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 18:00:20 +0900 Subject: [PATCH 17/28] Merge toEnumName() into AbstractPhpCodegen --- .../codegen/languages/AbstractPhpCodegen.java | 3 +++ .../codegen/languages/PhpClientCodegen.java | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 2b1a0ce4f30c..d6f4fd9b4d58 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -651,6 +651,9 @@ public String toEnumVarName(String name, String datatype) { public String toEnumName(CodegenProperty property) { String enumName = underscore(toModelName(property.name)).toUpperCase(); + // remove [] for array or map of enum + enumName = enumName.replace("[]", ""); + if (enumName.matches("\\d.*")) { // starts with number return "_" + enumName; } else { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 50200b5eaa58..90b89578e222 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -139,20 +139,6 @@ public void setComposerProjectName(String composerProjectName) { this.composerProjectName = composerProjectName; } - @Override - public String toEnumName(CodegenProperty property) { - String enumName = underscore(toModelName(property.name)).toUpperCase(); - - // remove [] for array or map of enum - enumName = enumName.replace("[]", ""); - - if (enumName.matches("\\d.*")) { // starts with number - return "_" + enumName; - } else { - return enumName; - } - } - @Override public Map postProcessOperationsWithModels(Map objs, List allModels) { Map operations = (Map) objs.get("operations"); From 38e5f2946654afc7c68389e04407e6be2a71108f Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 18:01:32 +0900 Subject: [PATCH 18/28] Merge escapeUnsafeCharacters() into AbstractPhpCodegen --- .../openapitools/codegen/languages/AbstractPhpCodegen.java | 2 +- .../openapitools/codegen/languages/PhpClientCodegen.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index d6f4fd9b4d58..8737749544e8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -685,7 +685,7 @@ public String escapeQuotationMark(String input) { @Override public String escapeUnsafeCharacters(String input) { - return input.replace("*/", ""); + return input.replace("*/", "*_/").replace("/*", "/_*"); } protected String extractSimpleName(String phpClassName) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 90b89578e222..94ec541bca99 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -150,10 +150,4 @@ public Map postProcessOperationsWithModels(Map o } return objs; } - - @Override - public String escapeUnsafeCharacters(String input) { - return input.replace("*/", "*_/").replace("/*", "/_*"); - } - } From 0d1fac89a63a9b5553f8465bb3a9447802ac2945 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 18:03:04 +0900 Subject: [PATCH 19/28] Merge postProcessOperationsWithModels() into AbstractPhpCodegen --- .../codegen/languages/AbstractPhpCodegen.java | 2 ++ .../codegen/languages/PhpClientCodegen.java | 12 ------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 8737749544e8..1fb37eedef4e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -672,6 +672,8 @@ public Map postProcessOperationsWithModels(Map o Map operations = (Map) objs.get("operations"); List operationList = (List) operations.get("operation"); for (CodegenOperation op : operationList) { + // for API test method name + // e.g. public function test{{vendorExtensions.x-testOperationId}}() op.vendorExtensions.put("x-testOperationId", camelize(op.operationId)); } return objs; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 94ec541bca99..a8a152fa6926 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -138,16 +138,4 @@ public void setComposerVendorName(String composerVendorName) { public void setComposerProjectName(String composerProjectName) { this.composerProjectName = composerProjectName; } - - @Override - public Map postProcessOperationsWithModels(Map objs, List allModels) { - Map operations = (Map) objs.get("operations"); - List operationList = (List) operations.get("operation"); - for (CodegenOperation op : operationList) { - // for API test method name - // e.g. public function test{{vendorExtensions.x-testOperationId}}() - op.vendorExtensions.put("x-testOperationId", camelize(op.operationId)); - } - return objs; - } } From 3dc32155cdf4594a887ecec0948b8d0180b057e7 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 18:18:15 +0900 Subject: [PATCH 20/28] tweak --- .../codegen/languages/AbstractPhpCodegen.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 1fb37eedef4e..401edecb8089 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -553,9 +553,9 @@ public void setParameterExampleValue(CodegenParameter p) { if ("String".equalsIgnoreCase(type) || p.isString) { if (example == null) { - example = p.paramName + "_example"; + example = "'" + p.paramName + "_example'"; } - example = "\"" + escapeText(example) + "\""; + example = escapeText(example); } else if ("Integer".equals(type) || "int".equals(type)) { if (example == null) { example = "56"; @@ -578,11 +578,13 @@ public void setParameterExampleValue(CodegenParameter p) { example = "2013-10-20"; } example = "new \\DateTime(\"" + escapeText(example) + "\")"; - } else if ("DateTime".equalsIgnoreCase(type)) { + } else if ("\\DateTime".equalsIgnoreCase(type)) { if (example == null) { example = "2013-10-20T19:20:30+01:00"; } example = "new \\DateTime(\"" + escapeText(example) + "\")"; + } else if ("object".equals(type)) { + example = "new \\stdClass"; } else if (!languageSpecificPrimitives.contains(type)) { // type is a model class, e.g. User example = "new " + getTypeDeclaration(type) + "()"; From 7feec3d8cd8fad87ba7882995aa83cb4284c8da6 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 8 Jul 2018 18:24:14 +0900 Subject: [PATCH 21/28] Recover missing method refs: https://github.com/OpenAPITools/openapi-generator/pull/504/commits/2ad0f6f7d44792ac7613735d38a160f48a0defd2#diff-f1801ef05a7926bf394c90f44ae4ab3dL91 --- .../codegen/languages/AbstractPhpCodegen.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 401edecb8089..a782f23f42da 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -692,6 +692,16 @@ public String escapeUnsafeCharacters(String input) { return input.replace("*/", "*_/").replace("/*", "/_*"); } + @Override + public String escapeText(String input) { + if (input == null) { + return input; + } + + // Trim the string to avoid leading and trailing spaces. + return super.escapeText(input).trim(); + } + protected String extractSimpleName(String phpClassName) { if (phpClassName == null) { return null; From c6fbe8b889c434aa91a195f057c89a9148c55a05 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Mon, 9 Jul 2018 22:54:51 +0900 Subject: [PATCH 22/28] Tweak test case refs: https://github.com/OpenAPITools/openapi-generator/pull/504/commits/4e7b7afc1a895ce6ffc191eabb73eb846c12306f --- .../openapitools/codegen/php/AbstractPhpCodegenTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java index 62151e6c5100..3aa56146ae3c 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java @@ -71,10 +71,10 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception { Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); - Assert.assertEquals(codegen.modelPackage(), "PHPmodel"); - Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "PHPmodel"); - Assert.assertEquals(codegen.apiPackage(), "PHPapi"); - Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "PHPapi"); + Assert.assertEquals(codegen.modelPackage(), "PHPinvoker\\PHPmodel"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "PHPinvoker\\PHPmodel"); + Assert.assertEquals(codegen.apiPackage(), "PHPinvoker\\PHPapi"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "PHPinvoker\\PHPapi"); Assert.assertEquals(codegen.getInvokerPackage(), "PHPinvoker"); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "PHPinvoker"); } From be8f9fe8b09c5600b3ce9b62290b280192b6c5d7 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Mon, 9 Jul 2018 22:57:08 +0900 Subject: [PATCH 23/28] Remove unnecessary 'import' --- .../codegen/languages/PhpClientCodegen.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index a8a152fa6926..5d17ba457b3a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -18,32 +18,17 @@ package org.openapitools.codegen.languages; import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.CodegenParameter; -import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.CodegenType; -import org.openapitools.codegen.DefaultCodegen; import org.openapitools.codegen.SupportingFile; -import org.openapitools.codegen.utils.ModelUtils; import java.io.File; -import java.util.Arrays; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.HashSet; -import java.util.regex.Matcher; import org.apache.commons.lang3.StringUtils; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.*; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 9672fa6f8a417146e0c13a377a5f780cfdcd6a7a Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Mon, 9 Jul 2018 22:59:41 +0900 Subject: [PATCH 24/28] Update lumen and ze-ph samples - ./bin/php-lumen-petstore-server.sh > /dev/null 2>&1 - ./bin/php-ze-ph-petstore-server.sh > /dev/null 2>&1 --- .../petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php | 2 +- samples/server/petstore/php-lumen/lib/app/Http/routes.php | 4 ++-- .../server/petstore/php-ze-ph/src/App/DTO/Capitalization.php | 2 +- samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php index fbdacd637641..b1fa33f8ddd4 100644 --- a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php +++ b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php @@ -53,7 +53,7 @@ public function testClientModel() /** * Operation testEndpointParameters * - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 . + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트. * * * @return Http response diff --git a/samples/server/petstore/php-lumen/lib/app/Http/routes.php b/samples/server/petstore/php-lumen/lib/app/Http/routes.php index b97308c40022..52945b138f07 100644 --- a/samples/server/petstore/php-lumen/lib/app/Http/routes.php +++ b/samples/server/petstore/php-lumen/lib/app/Http/routes.php @@ -37,8 +37,8 @@ $app->patch('/v2/fake', 'FakeApi@testClientModel'); /** * post testEndpointParameters - * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 */ $app->post('/v2/fake', 'FakeApi@testEndpointParameters'); diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Capitalization.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Capitalization.php index d09f67081de9..8256c08e2cfe 100644 --- a/samples/server/petstore/php-ze-ph/src/App/DTO/Capitalization.php +++ b/samples/server/petstore/php-ze-ph/src/App/DTO/Capitalization.php @@ -39,7 +39,7 @@ class Capitalization */ public $sca_eth_flow_points; /** - * Name of the pet + * Name of the pet * @DTA\Data(field="ATT_NAME", nullable=true) * @DTA\Validator(name="Type", options={"type":"string"}) * @var string diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php index cd32e554567a..1f2587eca03c 100644 --- a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php +++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php @@ -36,7 +36,7 @@ public function handlePatch(ServerRequestInterface $request) throw new PHException\HttpCode(500, "Not implemented"); } /** - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 * @param ServerRequestInterface $request * * @throws PHException\HttpCode 500 if the method is not implemented From 2702c904f8338fd13da8b7f7f4ae4d13862b3cc2 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Mon, 9 Jul 2018 23:04:26 +0900 Subject: [PATCH 25/28] Update slim samples --- .../php-slim/.openapi-generator/VERSION | 2 +- .../petstore/php-slim/lib/Api/FakeApi.php | 19 +++++++++++++++++-- .../php-slim/lib/Model/Capitalization.php | 2 +- .../petstore/php-slim/lib/Model/File.php | 15 +++++++++++++++ .../lib/Model/FileSchemaTestClass.php | 18 ++++++++++++++++++ .../petstore/php-slim/lib/SlimRouter.php | 1 + 6 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 samples/server/petstore/php-slim/lib/Model/File.php create mode 100644 samples/server/petstore/php-slim/lib/Model/FileSchemaTestClass.php diff --git a/samples/server/petstore/php-slim/.openapi-generator/VERSION b/samples/server/petstore/php-slim/.openapi-generator/VERSION index 0628777500bd..dde25ef08e8c 100644 --- a/samples/server/petstore/php-slim/.openapi-generator/VERSION +++ b/samples/server/petstore/php-slim/.openapi-generator/VERSION @@ -1 +1 @@ -3.1.0-SNAPSHOT \ No newline at end of file +3.1.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-slim/lib/Api/FakeApi.php b/samples/server/petstore/php-slim/lib/Api/FakeApi.php index 8baa4619a763..2f8fee134980 100644 --- a/samples/server/petstore/php-slim/lib/Api/FakeApi.php +++ b/samples/server/petstore/php-slim/lib/Api/FakeApi.php @@ -103,6 +103,21 @@ public function fakeOuterStringSerialize($request, $response, $args) { return $response; } + /** + * PUT testBodyWithFileSchema + * Summary: + * Notes: For this test, the body for this request much reference a schema named `File`. + * + * @param \Psr\Http\Message\ServerRequestInterface $request Request + * @param \Psr\Http\Message\ResponseInterface $response Response + * @param array|null $args Path arguments + */ + public function testBodyWithFileSchema($request, $response, $args) { + $body = $request->getParsedBody(); + $response->write('How about implementing testBodyWithFileSchema as a PUT method ?'); + return $response; + } + /** * PUT testBodyWithQueryParams * Summary: @@ -138,8 +153,8 @@ public function testClientModel($request, $response, $args) { /** * POST testEndpointParameters - * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 * * @param \Psr\Http\Message\ServerRequestInterface $request Request * @param \Psr\Http\Message\ResponseInterface $response Response diff --git a/samples/server/petstore/php-slim/lib/Model/Capitalization.php b/samples/server/petstore/php-slim/lib/Model/Capitalization.php index c85a6506cc97..8ea348becef8 100644 --- a/samples/server/petstore/php-slim/lib/Model/Capitalization.php +++ b/samples/server/petstore/php-slim/lib/Model/Capitalization.php @@ -24,7 +24,7 @@ class Capitalization { /** @var string $sCAETHFlowPoints */ private $sCAETHFlowPoints; - /** @var string $aTTNAME Name of the pet */ + /** @var string $aTTNAME Name of the pet*/ private $aTTNAME; } diff --git a/samples/server/petstore/php-slim/lib/Model/File.php b/samples/server/petstore/php-slim/lib/Model/File.php new file mode 100644 index 000000000000..8ad71447f849 --- /dev/null +++ b/samples/server/petstore/php-slim/lib/Model/File.php @@ -0,0 +1,15 @@ +POST('/v2/fake/outer/composite', FakeApi::class . ':fakeOuterCompositeSerialize'); $app->POST('/v2/fake/outer/number', FakeApi::class . ':fakeOuterNumberSerialize'); $app->POST('/v2/fake/outer/string', FakeApi::class . ':fakeOuterStringSerialize'); + $app->PUT('/v2/fake/body-with-file-schema', FakeApi::class . ':testBodyWithFileSchema'); $app->PUT('/v2/fake/body-with-query-params', FakeApi::class . ':testBodyWithQueryParams'); $app->PATCH('/v2/fake', FakeApi::class . ':testClientModel'); $app->POST('/v2/fake', FakeApi::class . ':testEndpointParameters'); From 4e432afa490b0ca8f93583784612933abe6c0da9 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Mon, 9 Jul 2018 23:06:00 +0900 Subject: [PATCH 26/28] Fix script name --- bin/utils/ensure-up-to-date | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date index a777346ef6d8..34e6f480f8f3 100755 --- a/bin/utils/ensure-up-to-date +++ b/bin/utils/ensure-up-to-date @@ -22,7 +22,7 @@ sleep 5 ./bin/php-silex-petstore-server.sh > /dev/null 2>&1 ./bin/php-symfony-petstore.sh > /dev/null 2>&1 ./bin/php-lumen-petstore-server.sh > /dev/null 2>&1 -./bin/php-slim-petstore-server.sh > /dev/null 2>&1 +./bin/php-slim-server-petstore.sh > /dev/null 2>&1 ./bin/php-ze-ph-petstore-server.sh > /dev/null 2>&1 ./bin/openapi3/php-petstore.sh > /dev/null 2>&1 ./bin/typescript-angular-petstore-all.sh > /dev/null 2>&1 From 3846ba276d9a1e948a7d7943cd873ab46da124a2 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Mon, 9 Jul 2018 23:15:31 +0900 Subject: [PATCH 27/28] Update silex samples --- samples/server/petstore/php-silex/.openapi-generator/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/server/petstore/php-silex/.openapi-generator/VERSION b/samples/server/petstore/php-silex/.openapi-generator/VERSION index 1c00c5181548..dde25ef08e8c 100644 --- a/samples/server/petstore/php-silex/.openapi-generator/VERSION +++ b/samples/server/petstore/php-silex/.openapi-generator/VERSION @@ -1 +1 @@ -3.0.2-SNAPSHOT \ No newline at end of file +3.1.1-SNAPSHOT \ No newline at end of file From 939ada4c2d2053ca02a19e9db390ef38912eb059 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Mon, 9 Jul 2018 23:16:05 +0900 Subject: [PATCH 28/28] Update kotlin-server --- .../petstore/kotlin-server/ktor/.openapi-generator/VERSION | 2 +- samples/server/petstore/kotlin-server/ktor/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION index 0628777500bd..dde25ef08e8c 100644 --- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION @@ -1 +1 @@ -3.1.0-SNAPSHOT \ No newline at end of file +3.1.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md index 82c3596aa35a..99dcb190b959 100644 --- a/samples/server/petstore/kotlin-server/ktor/README.md +++ b/samples/server/petstore/kotlin-server/ktor/README.md @@ -2,7 +2,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -Generated by OpenAPI Generator 3.1.0-SNAPSHOT. +Generated by OpenAPI Generator 3.1.1-SNAPSHOT. ## Requires