Merge pull request #2947 from mikolajprzybysz/version-check-mustache

[PHP] Check skipping artifiactVersion in other mustache templates, since it is not required anymore
swagger-api · Jun 1, 2016 · 8f82034 · 8f82034
2 parents 7b6747e + 4757647
commit 8f82034
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -6,7 +6,9 @@
 This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: {{appVersion}}
+{{#artifactVersion}}
 - Package version: {{artifactVersion}}
+{{/artifactVersion}}
 - Build date: {{generatedDate}}
 - Build package: {{generatorClass}}
 {{#infoUrl}}

diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -1,6 +1,8 @@
 {
-    "name": "{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}",{{#artifactVersion}}
-    "version": "{{artifactVersion}}",{{/artifactVersion}}
+    "name": "{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}",
+    {{#artifactVersion}}
+    "version": "{{artifactVersion}}",
+    {{/artifactVersion}}
     "description": "{{description}}",
     "keywords": [
         "swagger",

diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -95,7 +95,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/php{{/httpUserAgent}}";
+    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{#artifactVersion}}{{{.}}}{{/artifactVersion}}{{^artifactVersion}}1.0.0{{/artifactVersion}}/php{{/httpUserAgent}}";
 
     /**
      * Debug switch (default set to false)
@@ -498,12 +498,14 @@ class Configuration
      */
     public static function toDebugReport()
     {
-        $report  = "PHP SDK ({{invokerPackage}}) Debug Report:".PHP_EOL;
-        $report .= "    OS: ".php_uname().PHP_EOL;
-        $report .= "    PHP Version: ".phpversion().PHP_EOL;
-        $report .= "    OpenAPI Spec Version: {{version}}".PHP_EOL;
-        $report .= "    SDK Package Version: {{artifactVersion}}".PHP_EOL;
-        $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath().PHP_EOL;
+        $report  = 'PHP SDK ({{invokerPackage}}) Debug Report:' . PHP_EOL;
+        $report .= '    OS: ' . php_uname() . PHP_EOL;
+        $report .= '    PHP Version: ' . phpversion() . PHP_EOL;
+        $report .= '    OpenAPI Spec Version: {{version}}' . PHP_EOL;
+	    {{#artifactVersion}}
+        $report .= '    SDK Package Version: {{artifactVersion}}' . PHP_EOL;
+    	{{/artifactVersion}}
+        $report .= '    Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
 
         return $report;
     }