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

[PHP-NG] convert data to string before giving it to preg_match (#17119)

Browse Source
This commit is contained in:
Artur Neumann
2023-11-18 08:02:34 +05:45
committed by GitHub
parent 3552935a5b
commit 5c69284928
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,7 +446,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
}
{{/minimum}}
{{#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}}}.");
}
{{/pattern}}

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

@@ -716,7 +716,7 @@ class FormatTest implements ModelInterface, ArrayAccess, JsonSerializable
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.");
}
@@ -917,7 +917,7 @@ class FormatTest implements ModelInterface, ArrayAccess, JsonSerializable
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}$/.");
}
@@ -949,7 +949,7 @@ class FormatTest implements ModelInterface, ArrayAccess, JsonSerializable
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.");
}