Merge pull request #3251 from wing328/fix_slim_path

[PHP][Slim] fix slim path in Windows

Author: wing328

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java

@@ -14,23 +14,28 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.regex.Matcher;
 
 public class SlimFrameworkServerCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage;
+    protected String srcBasePath = "lib";
     protected String groupId = "io.swagger";
     protected String artifactId = "swagger-server";
     protected String artifactVersion = "1.0.0";
+    protected String packagePath = ""; // empty packagePath (top folder)
+
+
     private String variableNamingConvention = "camelCase";
 
     public SlimFrameworkServerCodegen() {
         super();
 
         invokerPackage = camelize("SwaggerServer");
 
-        String packagePath = "SwaggerServer";
+        //String packagePath = "SwaggerServer";
 
-        modelPackage = packagePath + "\\lib\\Models";
-        apiPackage = packagePath + "\\lib";
+        modelPackage = packagePath + "\\Models";
+        apiPackage = packagePath;
         outputFolder = "generated-code" + File.separator + "slim";
         modelTemplateFiles.put("model.mustache", ".php");
 
@@ -115,12 +120,12 @@ public String escapeReservedWord(String name) {
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + "/" + apiPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/" + toPackagePath(apiPackage, srcBasePath));
     }
 
     @Override
     public String modelFileFolder() {
-        return (outputFolder + "/" + modelPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/" + toPackagePath(modelPackage, srcBasePath));
     }
 
     @Override
@@ -225,6 +230,39 @@ public String toModelFilename(String name) {
         return toModelName(name);
     }
 
+    public String toPackagePath(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 (getPackagePath() + File.separatorChar + 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+ "$", "");
+    }
+
+    public String getPackagePath() {
+        return packagePath;
+    }
+
     @Override
     public String escapeQuotationMark(String input) {
         // remove ' to avoid code injection

samples/server/petstore-security-test/slim/SwaggerServer/.htaccess renamed to samples/server/petstore-security-test/slim/.htaccess

@@ -2,7 +2,7 @@
 /*
  * Return
  */
-namespace SwaggerServer\lib\Models;
+namespace \Models;
 
 /*
  * Return

samples/server/petstore-security-test/slim/SwaggerServer/README.md renamed to samples/server/petstore-security-test/slim/README.md

@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInita7ca9e6d69dc1fe934d8e0e81434a295::getLoader();