loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge pull request #2861 from BeneficialName/php-fix-prop-name-as-var

Browse Source 
[PHP] list_invalid_properties now don't call undefined variables
This commit is contained in:
wing328 2016-05-13 17:35:18 +08:00
commit e24405e706
7 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/swagger-codegen/src/main/resources/php/model.mustache
View File

@ -163,39 +163,39 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}imple
{{#vars}} {{#vars}}
{{#required}} {{#required}}
if ($this->container['{{name}}'] === null) { if ($this->container['{{name}}'] === null) {
$invalid_properties[] = "'${{name}}' can't be null"; $invalid_properties[] = "'{{name}}' can't be null";
} }
{{/required}} {{/required}}
{{#isEnum}} {{#isEnum}}
$allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}); $allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
if (!in_array($this->container['{{name}}'], $allowed_values)) { if (!in_array($this->container['{{name}}'], $allowed_values)) {
$invalid_properties[] = "invalid value for '${{name}}', must be one of #{allowed_values}."; $invalid_properties[] = "invalid value for '{{name}}', must be one of #{allowed_values}.";
} }
{{/isEnum}} {{/isEnum}}
{{#hasValidation}} {{#hasValidation}}
{{#maxLength}} {{#maxLength}}
if (strlen($this->container['{{name}}']) > {{maxLength}}) { if (strlen($this->container['{{name}}']) > {{maxLength}}) {
$invalid_properties[] = "invalid value for '${{name}}', the character length must be smaller than or equal to {{{maxLength}}}."; $invalid_properties[] = "invalid value for '{{name}}', the character length must be smaller than or equal to {{{maxLength}}}.";
} }
{{/maxLength}} {{/maxLength}}
{{#minLength}} {{#minLength}}
if (strlen($this->container['{{name}}']) < {{minLength}}) { if (strlen($this->container['{{name}}']) < {{minLength}}) {
$invalid_properties[] = "invalid value for '${{name}}', the character length must be bigger than or equal to {{{minLength}}}."; $invalid_properties[] = "invalid value for '{{name}}', the character length must be bigger than or equal to {{{minLength}}}.";
} }
{{/minLength}} {{/minLength}}
{{#maximum}} {{#maximum}}
if ($this->container['{{name}}'] > {{maximum}}) { if ($this->container['{{name}}'] > {{maximum}}) {
$invalid_properties[] = "invalid value for '${{name}}', must be smaller than or equal to {{maximum}}."; $invalid_properties[] = "invalid value for '{{name}}', must be smaller than or equal to {{maximum}}.";
} }
{{/maximum}} {{/maximum}}
{{#minimum}} {{#minimum}}
if ($this->container['{{name}}'] < {{minimum}}) { if ($this->container['{{name}}'] < {{minimum}}) {
$invalid_properties[] = "invalid value for '${{name}}', must be bigger than or equal to {{minimum}}."; $invalid_properties[] = "invalid value for '{{name}}', must be bigger than or equal to {{minimum}}.";
} }
{{/minimum}} {{/minimum}}
{{#pattern}} {{#pattern}}
if (!preg_match("{{pattern}}", $this->container['{{name}}'])) { if (!preg_match("{{pattern}}", $this->container['{{name}}'])) {
$invalid_properties[] = "invalid value for '${{name}}', must be conform to the pattern {{pattern}}."; $invalid_properties[] = "invalid value for '{{name}}', must be conform to the pattern {{pattern}}.";
} }
{{/pattern}} {{/pattern}}
{{/hasValidation}} {{/hasValidation}}

2
samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
View File

@ -139,7 +139,7 @@ class Animal implements ArrayAccess
{ {
$invalid_properties = array(); $invalid_properties = array();
if ($this->container['class_name'] === null) { if ($this->container['class_name'] === null) {
$invalid_properties[] = "'$class_name' can't be null"; $invalid_properties[] = "'class_name' can't be null";
} }
return $invalid_properties; return $invalid_properties;
} }

6
samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
View File

@ -174,15 +174,15 @@ class EnumTest implements ArrayAccess
$invalid_properties = array(); $invalid_properties = array();
$allowed_values = array("UPPER", "lower"); $allowed_values = array("UPPER", "lower");
if (!in_array($this->container['enum_string'], $allowed_values)) { if (!in_array($this->container['enum_string'], $allowed_values)) {
$invalid_properties[] = "invalid value for '$enum_string', must be one of #{allowed_values}."; $invalid_properties[] = "invalid value for 'enum_string', must be one of #{allowed_values}.";
} }
$allowed_values = array("1", "-1"); $allowed_values = array("1", "-1");
if (!in_array($this->container['enum_integer'], $allowed_values)) { if (!in_array($this->container['enum_integer'], $allowed_values)) {
$invalid_properties[] = "invalid value for '$enum_integer', must be one of #{allowed_values}."; $invalid_properties[] = "invalid value for 'enum_integer', must be one of #{allowed_values}.";
} }
$allowed_values = array("1.1", "-1.2"); $allowed_values = array("1.1", "-1.2");
if (!in_array($this->container['enum_number'], $allowed_values)) { if (!in_array($this->container['enum_number'], $allowed_values)) {
$invalid_properties[] = "invalid value for '$enum_number', must be one of #{allowed_values}."; $invalid_properties[] = "invalid value for 'enum_number', must be one of #{allowed_values}.";
} }
return $invalid_properties; return $invalid_properties;
} }

34
samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
View File

@ -190,55 +190,55 @@ class FormatTest implements ArrayAccess
{ {
$invalid_properties = array(); $invalid_properties = array();
if ($this->container['integer'] > 100.0) { if ($this->container['integer'] > 100.0) {
$invalid_properties[] = "invalid value for '$integer', must be smaller than or equal to 100.0."; $invalid_properties[] = "invalid value for 'integer', must be smaller than or equal to 100.0.";
} }
if ($this->container['integer'] < 10.0) { if ($this->container['integer'] < 10.0) {
$invalid_properties[] = "invalid value for '$integer', must be bigger than or equal to 10.0."; $invalid_properties[] = "invalid value for 'integer', must be bigger than or equal to 10.0.";
} }
if ($this->container['int32'] > 200.0) { if ($this->container['int32'] > 200.0) {
$invalid_properties[] = "invalid value for '$int32', must be smaller than or equal to 200.0."; $invalid_properties[] = "invalid value for 'int32', must be smaller than or equal to 200.0.";
} }
if ($this->container['int32'] < 20.0) { if ($this->container['int32'] < 20.0) {
$invalid_properties[] = "invalid value for '$int32', must be bigger than or equal to 20.0."; $invalid_properties[] = "invalid value for 'int32', must be bigger than or equal to 20.0.";
} }
if ($this->container['number'] === null) { if ($this->container['number'] === null) {
$invalid_properties[] = "'$number' can't be null"; $invalid_properties[] = "'number' can't be null";
} }
if ($this->container['number'] > 543.2) { if ($this->container['number'] > 543.2) {
$invalid_properties[] = "invalid value for '$number', must be smaller than or equal to 543.2."; $invalid_properties[] = "invalid value for 'number', must be smaller than or equal to 543.2.";
} }
if ($this->container['number'] < 32.1) { if ($this->container['number'] < 32.1) {
$invalid_properties[] = "invalid value for '$number', must be bigger than or equal to 32.1."; $invalid_properties[] = "invalid value for 'number', must be bigger than or equal to 32.1.";
} }
if ($this->container['float'] > 987.6) { if ($this->container['float'] > 987.6) {
$invalid_properties[] = "invalid value for '$float', must be smaller than or equal to 987.6."; $invalid_properties[] = "invalid value for 'float', must be smaller than or equal to 987.6.";
} }
if ($this->container['float'] < 54.3) { if ($this->container['float'] < 54.3) {
$invalid_properties[] = "invalid value for '$float', must be bigger than or equal to 54.3."; $invalid_properties[] = "invalid value for 'float', must be bigger than or equal to 54.3.";
} }
if ($this->container['double'] > 123.4) { if ($this->container['double'] > 123.4) {
$invalid_properties[] = "invalid value for '$double', must be smaller than or equal to 123.4."; $invalid_properties[] = "invalid value for 'double', must be smaller than or equal to 123.4.";
} }
if ($this->container['double'] < 67.8) { if ($this->container['double'] < 67.8) {
$invalid_properties[] = "invalid value for '$double', must be bigger than or equal to 67.8."; $invalid_properties[] = "invalid value for 'double', must be bigger than or equal to 67.8.";
} }
if (!preg_match("/[a-z]/i", $this->container['string'])) { if (!preg_match("/[a-z]/i", $this->container['string'])) {
$invalid_properties[] = "invalid value for '$string', must be conform to the pattern /[a-z]/i."; $invalid_properties[] = "invalid value for 'string', must be conform to the pattern /[a-z]/i.";
} }
if ($this->container['byte'] === null) { if ($this->container['byte'] === null) {
$invalid_properties[] = "'$byte' can't be null"; $invalid_properties[] = "'byte' can't be null";
} }
if ($this->container['date'] === null) { if ($this->container['date'] === null) {
$invalid_properties[] = "'$date' can't be null"; $invalid_properties[] = "'date' can't be null";
} }
if ($this->container['password'] === null) { if ($this->container['password'] === null) {
$invalid_properties[] = "'$password' can't be null"; $invalid_properties[] = "'password' can't be null";
} }
if (strlen($this->container['password']) > 64) { if (strlen($this->container['password']) > 64) {
$invalid_properties[] = "invalid value for '$password', the character length must be smaller than or equal to 64."; $invalid_properties[] = "invalid value for 'password', the character length must be smaller than or equal to 64.";
} }
if (strlen($this->container['password']) < 10) { if (strlen($this->container['password']) < 10) {
$invalid_properties[] = "invalid value for '$password', the character length must be bigger than or equal to 10."; $invalid_properties[] = "invalid value for 'password', the character length must be bigger than or equal to 10.";
} }
return $invalid_properties; return $invalid_properties;
} }

2
samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
View File

@ -145,7 +145,7 @@ class Name implements ArrayAccess
{ {
$invalid_properties = array(); $invalid_properties = array();
if ($this->container['name'] === null) { if ($this->container['name'] === null) {
$invalid_properties[] = "'$name' can't be null"; $invalid_properties[] = "'name' can't be null";
} }
return $invalid_properties; return $invalid_properties;
} }

2
samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
View File

@ -167,7 +167,7 @@ class Order implements ArrayAccess
$invalid_properties = array(); $invalid_properties = array();
$allowed_values = array("placed", "approved", "delivered"); $allowed_values = array("placed", "approved", "delivered");
if (!in_array($this->container['status'], $allowed_values)) { if (!in_array($this->container['status'], $allowed_values)) {
$invalid_properties[] = "invalid value for '$status', must be one of #{allowed_values}."; $invalid_properties[] = "invalid value for 'status', must be one of #{allowed_values}.";
} }
return $invalid_properties; return $invalid_properties;
} }

6
samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
View File

@ -166,14 +166,14 @@ class Pet implements ArrayAccess
{ {
$invalid_properties = array(); $invalid_properties = array();
if ($this->container['name'] === null) { if ($this->container['name'] === null) {
$invalid_properties[] = "'$name' can't be null"; $invalid_properties[] = "'name' can't be null";
} }
if ($this->container['photo_urls'] === null) { if ($this->container['photo_urls'] === null) {
$invalid_properties[] = "'$photo_urls' can't be null"; $invalid_properties[] = "'photo_urls' can't be null";
} }
$allowed_values = array("available", "pending", "sold"); $allowed_values = array("available", "pending", "sold");
if (!in_array($this->container['status'], $allowed_values)) { if (!in_array($this->container['status'], $allowed_values)) {
$invalid_properties[] = "invalid value for '$status', must be one of #{allowed_values}."; $invalid_properties[] = "invalid value for 'status', must be one of #{allowed_values}.";
} }
return $invalid_properties; return $invalid_properties;
} }