Merge processOpts() into AbstractPhpCodegen

refs: * 296e6d3#diff-f1801ef05a7926bf394c90f44ae4ab3dL139 * 296e6d3#diff-f1801ef05a7926bf394c90f44ae4ab3dL147 * 296e6d3#diff-f1801ef05a7926bf394c90f44ae4ab3dL153
OpenAPITools · Jul 8, 2018 · 4e7b7af · 4e7b7af
1 parent 0356486
commit 4e7b7af
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/...penapi-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)) {