From d83036ccdfacd31aa7c2eefab66333b4bbf79c73 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 23 Jun 2015 22:36:57 +0800 Subject: [PATCH] fix regular expression --- .../swagger/codegen/languages/PhpClientCodegen.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 7f92a06fe764..5bf8400577d2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -103,7 +103,14 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { if ("/".equals(File.separator)) { // for mac, linux regFirstPathSeparator = "^/"; } else { // for windows - regFirstPathSeparator = "^\\"; + regFirstPathSeparator = "^\\\\"; + } + + String regLastPathSeparator; + if ("/".equals(File.separator)) { // for mac, linux + regLastPathSeparator = "/$"; + } else { // for windows + regLastPathSeparator = "\\\\$"; } return (getPackagePath() + File.separatorChar + basePath @@ -112,7 +119,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { // Trim prefix file separators from package path .replaceAll(regFirstPathSeparator, "")) // Trim trailing file separators from the overall path - .replaceAll(File.separator + "$", ""); + .replaceAll(regLastPathSeparator+ "$", ""); } public CodegenType getTag() {