Merge pull request #11270 from swagger-api/swos149_2

allow full url in option

Author: gracekarina

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -103,7 +103,7 @@ public class DefaultCodegen {
     protected Boolean sortParamsByRequiredFlag = true;
     protected Boolean ensureUniqueParams = true;
     protected Boolean allowUnicodeIdentifiers = false;
-    protected String gitUserId, gitRepoId, releaseNote, gitRepoBaseURL /*= "github"*/;
+    protected String gitUserId, gitRepoId, releaseNote, gitRepoBaseURL;
     protected String httpUserAgent;
     protected Boolean hideGenerationTimestamp = true;
     protected Boolean skipAliasGeneration;

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

@@ -276,7 +276,7 @@ public void processOpts() {
             this.setGitRepoBaseURL((String) additionalProperties.get(CodegenConstants.GIT_REPO_BASE_URL));
         } else {
             if (gitRepoBaseURL == null) {
-                gitRepoBaseURL = "github";
+                gitRepoBaseURL = "https://github.com";
             }
                 additionalProperties.put(CodegenConstants.GIT_REPO_BASE_URL, gitRepoBaseURL);
 

modules/swagger-codegen/src/main/resources/php/README.mustache

@@ -31,7 +31,7 @@ To install the bindings via [Composer](http://getcomposer.org/), add the followi
   "repositories": [
     {
       "type": "git",
-      "url": "https://{{gitRepoBaseURL}}.com/{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}.git"
+      "url": "{{gitRepoBaseURL}}/{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}.git"
     }
   ],
   "require": {

modules/swagger-codegen/src/main/resources/php/git_push.sh.mustache

@@ -6,6 +6,7 @@
 git_user_id=$1
 git_repo_id=$2
 release_note=$3
+git_repo_base_url=$4
 
 if [ "$git_user_id" = "" ]; then
     git_user_id="{{{gitUserId}}}"
@@ -22,6 +23,11 @@ if [ "$release_note" = "" ]; then
     echo "[INFO] No command line input provided. Set \$release_note to $release_note"
 fi
 
+if [ "$git_repo_base_url" = "" ]; then
+    git_repo_base_url="{{{gitRepoBaseURL}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_base_url to $git_repo_base_url"
+fi
+
 # Initialize the local directory as a Git repository
 git init
 
@@ -37,8 +43,10 @@ if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
         echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://${git_repo_base_url}.com/${git_user_id}/${git_repo_id}.git
+        git remote add origin ${git_repo_base_url}/${git_user_id}/${git_repo_id}.git
     else
+        git_repo_base_url=${git_repo_base_url#*//}
+        git_repo_base_url=${git_repo_base_url%%.*}
         git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_repo_base_url}.com/${git_user_id}/${git_repo_id}.git
     fi
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java

@@ -65,7 +65,7 @@ public void testPHPRepositoryBaseURLOption() throws Exception {
         codegenConfig.setOutputDir(output.getAbsolutePath());
         codegenConfig.setGitRepoId("test_repository");
         codegenConfig.setGitUserId("user");
-        codegenConfig.setGitRepoBaseURL("gitlab");
+        codegenConfig.setGitRepoBaseURL("https://gitlab.com");
 
         ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);
 
@@ -103,7 +103,7 @@ public void testPHPRepositoryBaseURLOption_NoOption() throws Exception {
 
         final File gitPush = new File(output, "/SwaggerClient-php/git_push.sh");
         assertTrue(gitPush.exists());
-        assertFalse(FileUtils.readFileToString(gitPush).contains("https://github.com"));
+        assertTrue(FileUtils.readFileToString(gitPush).contains("https://github.com"));
     }
 
     @Test