From 6bb953d0aafa1b325c24b51234bd0612fb90ece8 Mon Sep 17 00:00:00 2001 From: Kim Sondrup Date: Fri, 13 May 2016 00:31:45 +0200 Subject: [PATCH] [PHP] Remove trailing spaces from templates --- .../src/main/resources/php/ApiClient.mustache | 14 +++++----- .../resources/php/ObjectSerializer.mustache | 12 ++++---- .../src/main/resources/php/README.mustache | 4 +-- .../src/main/resources/php/api.mustache | 24 ++++++++-------- .../src/main/resources/php/api_doc.mustache | 4 +-- .../src/main/resources/php/api_test.mustache | 4 +-- .../src/main/resources/php/autoload.mustache | 6 ++-- .../main/resources/php/git_push.sh.mustache | 2 +- .../src/main/resources/php/model.mustache | 28 +++++++++---------- .../main/resources/php/model_generic.mustache | 28 +++++++++---------- 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache index 5b8b9b21632..5561828e847 100644 --- a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache @@ -160,7 +160,7 @@ class ApiClient if ($this->config->getCurlTimeout() != 0) { curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout()); } - // return the result on success, rather than just true + // return the result on success, rather than just true curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); @@ -300,11 +300,11 @@ class ApiClient // ref/credit: http://php.net/manual/en/function.http-parse-headers.php#112986 $headers = array(); $key = ''; - + foreach(explode("\n", $raw_headers) as $h) { $h = explode(':', $h, 2); - + if (isset($h[1])) { if (!isset($headers[$h[0]])) @@ -317,18 +317,18 @@ class ApiClient { $headers[$h[0]] = array_merge(array($headers[$h[0]]), array(trim($h[1]))); } - + $key = $h[0]; } else { - if (substr($h[0], 0, 1) == "\t") - $headers[$key] .= "\r\n\t".trim($h[0]); + if (substr($h[0], 0, 1) == "\t") + $headers[$key] .= "\r\n\t".trim($h[0]); elseif (!$key) $headers[0] = trim($h[0]);trim($h[0]); } } - + return $headers; } } diff --git a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache index 34d79b0ae39..46f457fca32 100644 --- a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache +++ b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache @@ -1,6 +1,6 @@ fwrite($data); error_log("[INFO] Written $byte_written byte to $filename. Please move the file to a proper folder or delete the temp file after processing.\n", 3, Configuration::getDefaultConfiguration()->getDebugFile()); return $deserialized; - + } else { // If a discriminator is defined and points to a valid subclass, use it. if (!empty($discriminator) && isset($data->{$discriminator}) && is_string($data->{$discriminator})) { @@ -282,11 +282,11 @@ class ObjectSerializer $instance = new $class(); foreach ($instance::swaggerTypes() as $property => $type) { $propertySetter = $instance::setters()[$property]; - + if (!isset($propertySetter) || !isset($data->{$instance::attributeMap()[$property]})) { continue; } - + $propertyValue = $data->{$instance::attributeMap()[$property]}; if (isset($propertyValue)) { $instance->$propertySetter(self::deserialize($propertyValue, $type, null, $discriminator)); diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache index 3049d013ca5..1bc31869371 100644 --- a/modules/swagger-codegen/src/main/resources/php/README.mustache +++ b/modules/swagger-codegen/src/main/resources/php/README.mustache @@ -46,7 +46,7 @@ Download the files and include `autoload.php`: require_once('/path/to/{{packagePath}}/autoload.php'); ``` -## Tests +## Tests To run the unit tests: @@ -108,7 +108,7 @@ Class | Method | HTTP request | Description {{/authMethods}}{{#authMethods}}{{#last}} Authentication schemes defined for the API:{{/last}}{{/authMethods}} {{#authMethods}}## {{{name}}} -{{#isApiKey}}- **Type**: API key +{{#isApiKey}}- **Type**: API key - **API key parameter name**: {{{keyParamName}}} - **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}} {{/isApiKey}} diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache index cc74dfd3a2a..3e8085fb006 100644 --- a/modules/swagger-codegen/src/main/resources/php/api.mustache +++ b/modules/swagger-codegen/src/main/resources/php/api.mustache @@ -26,8 +26,8 @@ */ /** - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ @@ -55,7 +55,7 @@ use \{{invokerPackage}}\ObjectSerializer; * @var \{{invokerPackage}}\ApiClient instance of the ApiClient */ protected $apiClient; - + /** * Constructor * @param \{{invokerPackage}}\ApiClient|null $apiClient The api client to use @@ -66,10 +66,10 @@ use \{{invokerPackage}}\ObjectSerializer; $apiClient = new ApiClient(); $apiClient->getConfig()->setHost('{{basePath}}'); } - + $this->apiClient = $apiClient; } - + /** * Get API client * @return \{{invokerPackage}}\ApiClient get the API client @@ -78,7 +78,7 @@ use \{{invokerPackage}}\ObjectSerializer; { return $this->apiClient; } - + /** * Set the API client * @param \{{invokerPackage}}\ApiClient $apiClient set the API client @@ -89,7 +89,7 @@ use \{{invokerPackage}}\ObjectSerializer; $this->apiClient = $apiClient; return $this; } - + {{#operation}} /** * {{{operationId}}} @@ -103,7 +103,7 @@ use \{{invokerPackage}}\ObjectSerializer; public function {{operationId}}({{#allParams}}${{paramName}}{{^required}} = null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { list($response) = $this->{{operationId}}WithHttpInfo ({{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); - return $response; + return $response; } @@ -153,7 +153,7 @@ use \{{invokerPackage}}\ObjectSerializer; {{/hasValidation}} {{/allParams}} - + // parse inputs $resourcePath = "{{path}}"; $httpBody = ''; @@ -165,7 +165,7 @@ use \{{invokerPackage}}\ObjectSerializer; $headerParams['Accept'] = $_header_accept; } $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}})); - + {{#queryParams}}// query params {{#collectionFormat}} if (is_array(${{paramName}})) { @@ -220,7 +220,7 @@ use \{{invokerPackage}}\ObjectSerializer; if (isset(${{paramName}})) { $_tempBody = ${{paramName}}; }{{/bodyParams}} - + // for model (json/xml) if (isset($_tempBody)) { $httpBody = $_tempBody; // $_tempBody is the method argument, if present @@ -264,7 +264,7 @@ use \{{invokerPackage}}\ObjectSerializer; $e->setResponseObject($data); break;{{/dataType}}{{/responses}} } - + throw $e; } } diff --git a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache index 4cf01aa510b..fa6033b084a 100644 --- a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache +++ b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache @@ -17,7 +17,7 @@ Method | HTTP request | Description {{{notes}}}{{/notes}} -### Example +### Example ```php {{{operationId}}}({{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}} print_r($result);{{/returnType}} } catch (Exception $e) { diff --git a/modules/swagger-codegen/src/main/resources/php/api_test.mustache b/modules/swagger-codegen/src/main/resources/php/api_test.mustache index fc07d338301..cd88433de32 100644 --- a/modules/swagger-codegen/src/main/resources/php/api_test.mustache +++ b/modules/swagger-codegen/src/main/resources/php/api_test.mustache @@ -26,8 +26,8 @@ */ /** - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen * Please update the test case below to test the endpoint. */ diff --git a/modules/swagger-codegen/src/main/resources/php/autoload.mustache b/modules/swagger-codegen/src/main/resources/php/autoload.mustache index 04be6e11992..70a61878edb 100644 --- a/modules/swagger-codegen/src/main/resources/php/autoload.mustache +++ b/modules/swagger-codegen/src/main/resources/php/autoload.mustache @@ -1,13 +1,13 @@ '{{getter}}'{{#hasMore}}, {{/hasMore}}{{/vars}} ); - + static function getters() { return {{#parentSchema}}parent::getters() + {{/parentSchema}}self::$getters; } @@ -152,7 +152,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}imple /** * show all the invalid properties with reasons. - * + * * @return array invalid properties with reasons */ public function list_invalid_properties() @@ -204,8 +204,8 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}imple /** * validate all the properties in the model * return true if all passed - * - * @return bool True if all properteis are valid + * + * @return bool True if all properteis are valid */ public function valid() { @@ -309,7 +309,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}imple {{/vars}} /** * Returns true if offset exists. False otherwise. - * @param integer $offset Offset + * @param integer $offset Offset * @return boolean */ public function offsetExists($offset) @@ -319,17 +319,17 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}imple /** * Gets offset. - * @param integer $offset Offset - * @return mixed + * @param integer $offset Offset + * @return mixed */ public function offsetGet($offset) { return isset($this->container[$offset]) ? $this->container[$offset] : null; } - + /** * Sets value based on offset. - * @param integer $offset Offset + * @param integer $offset Offset * @param mixed $value Value to be set * @return void */ @@ -341,17 +341,17 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}imple $this->container[$offset] = $value; } } - + /** * Unsets offset. - * @param integer $offset Offset + * @param integer $offset Offset * @return void */ public function offsetUnset($offset) { unset($this->container[$offset]); } - + /** * Gets the string presentation of the object * @return string diff --git a/modules/swagger-codegen/src/main/resources/php/model_generic.mustache b/modules/swagger-codegen/src/main/resources/php/model_generic.mustache index 006cd09c62a..202c608edef 100644 --- a/modules/swagger-codegen/src/main/resources/php/model_generic.mustache +++ b/modules/swagger-codegen/src/main/resources/php/model_generic.mustache @@ -1,19 +1,19 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayAccess { /** - * Array of property to type mappings. Used for (de)serialization + * Array of property to type mappings. Used for (de)serialization * @var string[] */ static $swaggerTypes = array( {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}}, {{/hasMore}}{{/vars}} ); - + static function swaggerTypes() { return self::$swaggerTypes{{#parent}} + parent::swaggerTypes(){{/parent}}; } - /** + /** * Array of attributes where the key is the local name, and the value is the original name * @var string[] */ @@ -21,7 +21,7 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}}, {{/hasMore}}{{/vars}} ); - + static function attributeMap() { return {{#parent}}parent::attributeMap() + {{/parent}}self::$attributeMap; } @@ -34,7 +34,7 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA {{#vars}}'{{name}}' => '{{setter}}'{{#hasMore}}, {{/hasMore}}{{/vars}} ); - + static function setters() { return {{#parent}}parent::setters() + {{/parent}}self::$setters; } @@ -47,7 +47,7 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA {{#vars}}'{{name}}' => '{{getter}}'{{#hasMore}}, {{/hasMore}}{{/vars}} ); - + static function getters() { return {{#parent}}parent::getters() + {{/parent}}self::$getters; } @@ -115,7 +115,7 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA {{/vars}} /** * Returns true if offset exists. False otherwise. - * @param integer $offset Offset + * @param integer $offset Offset * @return boolean */ public function offsetExists($offset) @@ -125,17 +125,17 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA /** * Gets offset. - * @param integer $offset Offset - * @return mixed + * @param integer $offset Offset + * @return mixed */ public function offsetGet($offset) { return $this->$offset; } - + /** * Sets value based on offset. - * @param integer $offset Offset + * @param integer $offset Offset * @param mixed $value Value to be set * @return void */ @@ -143,17 +143,17 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA { $this->$offset = $value; } - + /** * Unsets offset. - * @param integer $offset Offset + * @param integer $offset Offset * @return void */ public function offsetUnset($offset) { unset($this->$offset); } - + /** * Gets the string presentation of the object. * @return string