Merge branch 'master' of https://github.com/sdavis-r7/swagger-codegen into sdavis-r7-master

Conflicts:
	modules/swagger-codegen/src/main/resources/php/model.mustache
	modules/swagger-codegen/src/main/resources/php/model_generic.mustache
This commit is contained in:
wing328
2016-06-27 16:20:44 +08:00
7 changed files with 41 additions and 16 deletions

View File

@@ -86,9 +86,10 @@ use \{{invokerPackage}}\ObjectSerializer;
* Operation {{{operationId}}}
*
* {{{summary}}}.
*
{{#allParams}} * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
{{/allParams}} *
*/
{{#allParams}} // * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
{{/allParams}}
/**
* @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
* @throws \{{invokerPackage}}\ApiException on non-2xx response
*/
@@ -103,9 +104,10 @@ use \{{invokerPackage}}\ObjectSerializer;
* Operation {{{operationId}}}WithHttpInfo
*
* {{{summary}}}.
*
{{#allParams}} * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
{{/allParams}} *
*/
{{#allParams}} // * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
{{/allParams}}
/**
* @return Array of {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}null{{/returnType}}, HTTP status code, HTTP response headers (array of strings)
* @throws \{{invokerPackage}}\ApiException on non-2xx response
*/

View File

@@ -29,10 +29,11 @@ use \ArrayAccess;
/**
* {{classname}} Class Doc Comment
*
* @category Class
* @category Class */
{{#description}}
* @description {{description}}
// @description {{description}}
{{/description}}
/**
* @package {{invokerPackage}}
* @author http://github.com/swagger-api/swagger-codegen
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2

View File

@@ -25,8 +25,9 @@ namespace {{invokerPackage}};
/**
* {{classname}}Test Class Doc Comment
*
* @category Class
* @description {{#description}}{{description}}{{/description}}{{^description}}{{classname}}{{/description}}
* @category Class */
// * @description {{#description}}{{description}}{{/description}}{{^description}}{{classname}}{{/description}}
/**
* @package {{invokerPackage}}
* @author http://github.com/swagger-api/swagger-codegen
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2

View File

@@ -2,12 +2,11 @@
{{#appName}}
* {{{appName}}}
*
{{/appName}}
{{/appName}} */
{{#appDescription}}
* {{{appDescription}}}
*
//* {{{appDescription}}}
{{/appDescription}}
* {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
/* {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
* {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*