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

[PHP] convert data to string before giving it to preg_match (#16513)

Browse Source
This commit is contained in:
Artur Neumann 2023-09-06 13:25:07 +05:45 committed by GitHub
parent 75ac4a2f58
commit 270238e060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/php/model_generic.mustache vendored
View File

@ -449,7 +449,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
} }
{{/minimum}} {{/minimum}}
{{#pattern}} {{#pattern}}
if ({{#isNullable}}!is_null(${{name}}) && {{/isNullable}}(!preg_match("{{{pattern}}}", ${{name}}))) { if ({{#isNullable}}!is_null(${{name}}) && {{/isNullable}}(!preg_match("{{{pattern}}}", ObjectSerializer::toString(${{name}})))) {
throw new \InvalidArgumentException("invalid value for \${{name}} when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."); throw new \InvalidArgumentException("invalid value for \${{name}} when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}.");
} }
{{/pattern}} {{/pattern}}

6
samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
View File

@ -718,7 +718,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
throw new \InvalidArgumentException('non-nullable string cannot be null'); throw new \InvalidArgumentException('non-nullable string cannot be null');
} }
if ((!preg_match("/[a-z]/i", $string))) { if ((!preg_match("/[a-z]/i", ObjectSerializer::toString($string)))) {
throw new \InvalidArgumentException("invalid value for \$string when calling FormatTest., must conform to the pattern /[a-z]/i."); throw new \InvalidArgumentException("invalid value for \$string when calling FormatTest., must conform to the pattern /[a-z]/i.");
} }
@ -919,7 +919,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
throw new \InvalidArgumentException('non-nullable pattern_with_digits cannot be null'); throw new \InvalidArgumentException('non-nullable pattern_with_digits cannot be null');
} }
if ((!preg_match("/^\\d{10}$/", $pattern_with_digits))) { if ((!preg_match("/^\\d{10}$/", ObjectSerializer::toString($pattern_with_digits)))) {
throw new \InvalidArgumentException("invalid value for \$pattern_with_digits when calling FormatTest., must conform to the pattern /^\\d{10}$/."); throw new \InvalidArgumentException("invalid value for \$pattern_with_digits when calling FormatTest., must conform to the pattern /^\\d{10}$/.");
} }
@ -951,7 +951,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
throw new \InvalidArgumentException('non-nullable pattern_with_digits_and_delimiter cannot be null'); throw new \InvalidArgumentException('non-nullable pattern_with_digits_and_delimiter cannot be null');
} }
if ((!preg_match("/^image_\\d{1,3}$/i", $pattern_with_digits_and_delimiter))) { if ((!preg_match("/^image_\\d{1,3}$/i", ObjectSerializer::toString($pattern_with_digits_and_delimiter)))) {
throw new \InvalidArgumentException("invalid value for \$pattern_with_digits_and_delimiter when calling FormatTest., must conform to the pattern /^image_\\d{1,3}$/i."); throw new \InvalidArgumentException("invalid value for \$pattern_with_digits_and_delimiter when calling FormatTest., must conform to the pattern /^image_\\d{1,3}$/i.");
} }

6
samples/client/petstore/php/psr-18/lib/Model/FormatTest.php
View File

@ -718,7 +718,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
throw new \InvalidArgumentException('non-nullable string cannot be null'); throw new \InvalidArgumentException('non-nullable string cannot be null');
} }
if ((!preg_match("/[a-z]/i", $string))) { if ((!preg_match("/[a-z]/i", ObjectSerializer::toString($string)))) {
throw new \InvalidArgumentException("invalid value for \$string when calling FormatTest., must conform to the pattern /[a-z]/i."); throw new \InvalidArgumentException("invalid value for \$string when calling FormatTest., must conform to the pattern /[a-z]/i.");
} }
@ -919,7 +919,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
throw new \InvalidArgumentException('non-nullable pattern_with_digits cannot be null'); throw new \InvalidArgumentException('non-nullable pattern_with_digits cannot be null');
} }
if ((!preg_match("/^\\d{10}$/", $pattern_with_digits))) { if ((!preg_match("/^\\d{10}$/", ObjectSerializer::toString($pattern_with_digits)))) {
throw new \InvalidArgumentException("invalid value for \$pattern_with_digits when calling FormatTest., must conform to the pattern /^\\d{10}$/."); throw new \InvalidArgumentException("invalid value for \$pattern_with_digits when calling FormatTest., must conform to the pattern /^\\d{10}$/.");
} }
@ -951,7 +951,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
throw new \InvalidArgumentException('non-nullable pattern_with_digits_and_delimiter cannot be null'); throw new \InvalidArgumentException('non-nullable pattern_with_digits_and_delimiter cannot be null');
} }
if ((!preg_match("/^image_\\d{1,3}$/i", $pattern_with_digits_and_delimiter))) { if ((!preg_match("/^image_\\d{1,3}$/i", ObjectSerializer::toString($pattern_with_digits_and_delimiter)))) {
throw new \InvalidArgumentException("invalid value for \$pattern_with_digits_and_delimiter when calling FormatTest., must conform to the pattern /^image_\\d{1,3}$/i."); throw new \InvalidArgumentException("invalid value for \$pattern_with_digits_and_delimiter when calling FormatTest., must conform to the pattern /^image_\\d{1,3}$/i.");
} }