From fe55e7dc975e677cc9f41e6d50a88c5954c2ae3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Simon=20Maria=20M=C3=B6llers?= Date: Sun, 9 Jul 2017 11:31:57 +0200 Subject: [PATCH] Use File.separator instead of "/" in PHP/Symfony #5985 --- .../codegen/languages/AbstractPhpCodegen.java | 24 ++++++------ .../languages/SymfonyServerCodegen.java | 37 ++++++++++--------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractPhpCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractPhpCodegen.java index f38e692c6bf8..28a6d4fb9968 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractPhpCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractPhpCodegen.java @@ -45,8 +45,8 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg protected String apiDirName = "Api"; protected String modelDirName = "Model"; protected String variableNamingConvention= "snake_case"; - protected String apiDocPath = docsBasePath + "/" + apiDirName; - protected String modelDocPath = docsBasePath + "/" + modelDirName; + protected String apiDocPath = docsBasePath + File.separator + apiDirName; + protected String modelDocPath = docsBasePath + File.separator + modelDirName; public AbstractPhpCodegen() { super(); @@ -198,10 +198,10 @@ public void processOpts() { 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); + additionalProperties.put("apiSrcPath", "." + File.separator + toSrcPath(apiPackage, srcBasePath)); + additionalProperties.put("modelSrcPath", "." + File.separator + toSrcPath(modelPackage, srcBasePath)); + additionalProperties.put("apiTestPath", "." + File.separator + testBasePath + File.separator + apiDirName); + additionalProperties.put("modelTestPath", "." + File.separator + testBasePath + File.separator + modelDirName); // make api and model doc path available in mustache template additionalProperties.put("apiDocPath", apiDocPath); @@ -261,32 +261,32 @@ public String escapeReservedWord(String name) { @Override public String apiFileFolder() { - return (outputFolder + "/" + toPackagePath(apiPackage, srcBasePath)); + return (outputFolder + File.separator + toPackagePath(apiPackage, srcBasePath)); } @Override public String modelFileFolder() { - return (outputFolder + "/" + toPackagePath(modelPackage, srcBasePath)); + return (outputFolder + File.separator + toPackagePath(modelPackage, srcBasePath)); } @Override public String apiTestFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + testBasePath + "/" + apiDirName); + return (outputFolder + File.separator + getPackagePath() + File.separator + testBasePath + File.separator + apiDirName); } @Override public String modelTestFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + testBasePath + "/" + modelDirName); + return (outputFolder + File.separator + getPackagePath() + File.separator + testBasePath + File.separator + modelDirName); } @Override public String apiDocFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + apiDocPath); + return (outputFolder + File.separator + getPackagePath() + File.separator + apiDocPath); } @Override public String modelDocFileFolder() { - return (outputFolder + "/" + getPackagePath() + "/" + modelDocPath); + return (outputFolder + File.separator + getPackagePath() + File.separator + modelDocPath); } @Override diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SymfonyServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SymfonyServerCodegen.java index dd9349296706..a0cb1dc8b21c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SymfonyServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SymfonyServerCodegen.java @@ -66,9 +66,9 @@ public SymfonyServerCodegen() { setBundleName("SwaggerServer"); packagePath = "SymfonyBundle-php"; modelDirName = "Model"; - docsBasePath = "Resources/docs"; - apiDocPath = docsBasePath + "/" + apiDirName; - modelDocPath = docsBasePath + "/" + modelDirName; + docsBasePath = "Resources" + File.separator + "docs"; + apiDocPath = docsBasePath + File.separator + apiDirName; + modelDocPath = docsBasePath + File.separator + modelDirName; outputFolder = "generated-code" + File.separator + "php"; apiTemplateFiles.put("api_controller.mustache", ".php"); modelTestTemplateFiles.put("model_test.mustache", ".php"); @@ -153,7 +153,7 @@ public void setBundleName(String bundleName) { public String controllerFileFolder() { - return (outputFolder + "/" + toPackagePath(controllerPackage, srcBasePath)); + return (outputFolder + File.separator + toPackagePath(controllerPackage, srcBasePath)); } @Override @@ -241,13 +241,13 @@ public void processOpts() { additionalProperties.put("bundleAlias", bundleAlias); // make api and model src path available in mustache template - additionalProperties.put("apiSrcPath", "./" + toSrcPath(apiPackage, srcBasePath)); - additionalProperties.put("modelSrcPath", "./" + toSrcPath(modelPackage, srcBasePath)); - additionalProperties.put("testsSrcPath", "./" + toSrcPath(testsPackage, srcBasePath)); - additionalProperties.put("apiTestsSrcPath", "./" + toSrcPath(apiTestsPackage, srcBasePath)); - additionalProperties.put("modelTestsSrcPath", "./" + toSrcPath(modelTestsPackage, srcBasePath)); - additionalProperties.put("apiTestPath", "./" + testsDirName + "/" + apiDirName); - additionalProperties.put("modelTestPath", "./" + testsDirName + "/" + modelDirName); + additionalProperties.put("apiSrcPath", "." + File.separator + toSrcPath(apiPackage, srcBasePath)); + additionalProperties.put("modelSrcPath", "." + File.separator + toSrcPath(modelPackage, srcBasePath)); + additionalProperties.put("testsSrcPath", "." + File.separator + toSrcPath(testsPackage, srcBasePath)); + additionalProperties.put("apiTestsSrcPath", "." + File.separator + toSrcPath(apiTestsPackage, srcBasePath)); + additionalProperties.put("modelTestsSrcPath", "." + File.separator + toSrcPath(modelTestsPackage, srcBasePath)); + additionalProperties.put("apiTestPath", "." + File.separator + testsDirName + File.separator + apiDirName); + additionalProperties.put("modelTestPath", "." + File.separator + testsDirName + File.separator + modelDirName); // make api and model doc path available in mustache template additionalProperties.put("apiDocPath", apiDocPath); @@ -256,15 +256,18 @@ public void processOpts() { // make test path available in mustache template additionalProperties.put("testsDirName", testsDirName); + final String configDir = getPackagePath() + File.separator + "Resources" + File.separator + "config"; + final String dependencyInjectionDir = getPackagePath() + File.separator + "DependencyInjection"; + supportingFiles.add(new SupportingFile("Controller.mustache", toPackagePath(controllerPackage, srcBasePath), "Controller.php")); supportingFiles.add(new SupportingFile("Bundle.mustache", getPackagePath(), bundleClassName + ".php")); - supportingFiles.add(new SupportingFile("Extension.mustache", getPackagePath() + "/DependencyInjection", bundleExtensionName + ".php")); - supportingFiles.add(new SupportingFile("ApiPass.mustache", getPackagePath() + "/DependencyInjection/Compiler", bundleName + "ApiPass.php")); + supportingFiles.add(new SupportingFile("Extension.mustache", dependencyInjectionDir, bundleExtensionName + ".php")); + supportingFiles.add(new SupportingFile("ApiPass.mustache", dependencyInjectionDir + File.separator + "Compiler", bundleName + "ApiPass.php")); supportingFiles.add(new SupportingFile("ApiServer.mustache", toPackagePath(apiPackage, srcBasePath), "ApiServer.php")); supportingFiles.add(new SupportingFile("ModelSerializer.mustache", toPackagePath(modelPackage, srcBasePath), "ModelSerializer.php")); supportingFiles.add(new SupportingFile("ModelInterface.mustache", toPackagePath(modelPackage, srcBasePath), "ModelInterface.php")); - supportingFiles.add(new SupportingFile("routing.mustache", getPackagePath() + "/Resources/config", "routing.yml")); - supportingFiles.add(new SupportingFile("services.mustache", getPackagePath() + "/Resources/config", "services.yml")); + supportingFiles.add(new SupportingFile("routing.mustache", configDir, "routing.yml")); + supportingFiles.add(new SupportingFile("services.mustache", configDir, "services.yml")); supportingFiles.add(new SupportingFile("composer.mustache", getPackagePath(), "composer.json")); supportingFiles.add(new SupportingFile("autoload.mustache", getPackagePath(), "autoload.php")); supportingFiles.add(new SupportingFile("README.mustache", getPackagePath(), "README.md")); @@ -367,12 +370,12 @@ public String escapeReservedWord(String name) { @Override public String apiTestFileFolder() { - return (outputFolder + "/" + toPackagePath(apiTestsPackage, srcBasePath)); + return (outputFolder + File.separator + toPackagePath(apiTestsPackage, srcBasePath)); } @Override public String modelTestFileFolder() { - return (outputFolder + "/" + toPackagePath(modelTestsPackage, srcBasePath)); + return (outputFolder + File.separator + toPackagePath(modelTestsPackage, srcBasePath)); } public void setComposerVendorName(String composerVendorName) {