Skip to content

Commit ab7b185

Browse files
JulianVennenJulianVennen
committed
[php][php-nextgen] Use exts instead of vendorExtensions
1 parent 6866fcb commit ab7b185

5 files changed

Lines changed: 54 additions & 54 deletions

File tree

‎modules/openapi-generator/src/main/resources/php-nextgen/api.mustache‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ use {{invokerPackage}}\ObjectSerializer;
131131
* {{.}}
132132
*
133133
{{/description}}
134-
{{#vendorExtensions.x-group-parameters}}
134+
{{#exts.x-group-parameters}}
135135
* Note: the input parameter is an associative array with the keys listed as the parameter name below
136136
*
137-
{{/vendorExtensions.x-group-parameters}}
137+
{{/exts.x-group-parameters}}
138138
{{#servers}}
139139
{{#-first}}
140140
* This operation contains host(s) defined in the OpenAPI spec. Use 'hostIndex' to select the host.
@@ -168,15 +168,15 @@ use {{invokerPackage}}\ObjectSerializer;
168168
*
169169
* @throws ApiException on non-2xx response or if the response body is not in the expected format
170170
* @throws InvalidArgumentException
171-
* @return {{{vendorExtensions.x-php-doc-return-type}}}
171+
* @return {{{exts.x-php-doc-return-type}}}
172172
{{#isDeprecated}}
173173
* @deprecated
174174
{{/isDeprecated}}
175175
*/
176176
public function {{operationId}}(
177-
{{^vendorExtensions.x-group-parameters}}
177+
{{^exts.x-group-parameters}}
178178
{{#allParams}}
179-
{{vendorExtensions.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
179+
{{exts.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
180180
{{/allParams}}
181181
{{#servers}}
182182
{{#-first}}
@@ -185,14 +185,14 @@ use {{invokerPackage}}\ObjectSerializer;
185185
{{/-first}}
186186
{{/servers}}
187187
string $contentType = self::contentTypes['{{{operationId}}}'][0]
188-
{{/vendorExtensions.x-group-parameters}}
189-
{{#vendorExtensions.x-group-parameters}}
188+
{{/exts.x-group-parameters}}
189+
{{#exts.x-group-parameters}}
190190
array $associative_array
191-
{{/vendorExtensions.x-group-parameters}}
192-
): {{{vendorExtensions.x-php-return-type}}}
191+
{{/exts.x-group-parameters}}
192+
): {{{exts.x-php-return-type}}}
193193
{
194-
{{^vendorExtensions.x-php-return-type-is-void}}list($response) = {{/vendorExtensions.x-php-return-type-is-void}}$this->{{operationId}}WithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}});{{^vendorExtensions.x-php-return-type-is-void}}
195-
return $response;{{/vendorExtensions.x-php-return-type-is-void}}
194+
{{^exts.x-php-return-type-is-void}}list($response) = {{/exts.x-php-return-type-is-void}}$this->{{operationId}}WithHttpInfo({{^exts.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/exts.x-group-parameters}}{{#exts.x-group-parameters}}$associative_array{{/exts.x-group-parameters}});{{^exts.x-php-return-type-is-void}}
195+
return $response;{{/exts.x-php-return-type-is-void}}
196196
}
197197

198198
/**
@@ -206,10 +206,10 @@ use {{invokerPackage}}\ObjectSerializer;
206206
* {{.}}
207207
*
208208
{{/description}}
209-
{{#vendorExtensions.x-group-parameters}}
209+
{{#exts.x-group-parameters}}
210210
* Note: the input parameter is an associative array with the keys listed as the parameter name below
211211
*
212-
{{/vendorExtensions.x-group-parameters}}
212+
{{/exts.x-group-parameters}}
213213
{{#servers}}
214214
{{#-first}}
215215
* This operation contains host(s) defined in the OpenAPI spec. Use 'hostIndex' to select the host.
@@ -249,9 +249,9 @@ use {{invokerPackage}}\ObjectSerializer;
249249
{{/isDeprecated}}
250250
*/
251251
public function {{operationId}}WithHttpInfo(
252-
{{^vendorExtensions.x-group-parameters}}
252+
{{^exts.x-group-parameters}}
253253
{{#allParams}}
254-
{{vendorExtensions.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
254+
{{exts.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
255255
{{/allParams}}
256256
{{#servers}}
257257
{{#-first}}
@@ -260,13 +260,13 @@ use {{invokerPackage}}\ObjectSerializer;
260260
{{/-first}}
261261
{{/servers}}
262262
string $contentType = self::contentTypes['{{{operationId}}}'][0]
263-
{{/vendorExtensions.x-group-parameters}}
264-
{{#vendorExtensions.x-group-parameters}}
263+
{{/exts.x-group-parameters}}
264+
{{#exts.x-group-parameters}}
265265
array $associative_array
266-
{{/vendorExtensions.x-group-parameters}}
266+
{{/exts.x-group-parameters}}
267267
): array
268268
{
269-
$request = $this->{{operationId}}Request({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}});
269+
$request = $this->{{operationId}}Request({{^exts.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/exts.x-group-parameters}}{{#exts.x-group-parameters}}$associative_array{{/exts.x-group-parameters}});
270270

271271
try {
272272
$options = $this->createHttpClientOption();
@@ -379,10 +379,10 @@ use {{invokerPackage}}\ObjectSerializer;
379379
* {{.}}
380380
*
381381
{{/description}}
382-
{{#vendorExtensions.x-group-parameters}}
382+
{{#exts.x-group-parameters}}
383383
* Note: the input parameter is an associative array with the keys listed as the parameter name below
384384
*
385-
{{/vendorExtensions.x-group-parameters}}
385+
{{/exts.x-group-parameters}}
386386
{{#servers}}
387387
{{#-first}}
388388
* This operation contains host(s) defined in the OpenAPI spec. Use 'hostIndex' to select the host.
@@ -421,9 +421,9 @@ use {{invokerPackage}}\ObjectSerializer;
421421
{{/isDeprecated}}
422422
*/
423423
public function {{operationId}}Async(
424-
{{^vendorExtensions.x-group-parameters}}
424+
{{^exts.x-group-parameters}}
425425
{{#allParams}}
426-
{{vendorExtensions.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
426+
{{exts.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
427427
{{/allParams}}
428428
{{#servers}}
429429
{{#-first}}
@@ -432,13 +432,13 @@ use {{invokerPackage}}\ObjectSerializer;
432432
{{/-first}}
433433
{{/servers}}
434434
string $contentType = self::contentTypes['{{{operationId}}}'][0]
435-
{{/vendorExtensions.x-group-parameters}}
436-
{{#vendorExtensions.x-group-parameters}}
435+
{{/exts.x-group-parameters}}
436+
{{#exts.x-group-parameters}}
437437
array $associative_array
438-
{{/vendorExtensions.x-group-parameters}}
438+
{{/exts.x-group-parameters}}
439439
): PromiseInterface
440440
{
441-
return $this->{{operationId}}AsyncWithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}})
441+
return $this->{{operationId}}AsyncWithHttpInfo({{^exts.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/exts.x-group-parameters}}{{#exts.x-group-parameters}}$associative_array{{/exts.x-group-parameters}})
442442
->then(
443443
function ($response) {
444444
return $response[0];
@@ -457,10 +457,10 @@ use {{invokerPackage}}\ObjectSerializer;
457457
* {{.}}
458458
*
459459
{{/description}}
460-
{{#vendorExtensions.x-group-parameters}}
460+
{{#exts.x-group-parameters}}
461461
* Note: the input parameter is an associative array with the keys listed as the parameter name below
462462
*
463-
{{/vendorExtensions.x-group-parameters}}
463+
{{/exts.x-group-parameters}}
464464
{{#servers}}
465465
{{#-first}}
466466
* This operation contains host(s) defined in the OpenAPI spec. Use 'hostIndex' to select the host.
@@ -499,9 +499,9 @@ use {{invokerPackage}}\ObjectSerializer;
499499
{{/isDeprecated}}
500500
*/
501501
public function {{operationId}}AsyncWithHttpInfo(
502-
{{^vendorExtensions.x-group-parameters}}
502+
{{^exts.x-group-parameters}}
503503
{{#allParams}}
504-
{{vendorExtensions.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
504+
{{exts.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
505505
{{/allParams}}
506506
{{#servers}}
507507
{{#-first}}
@@ -510,14 +510,14 @@ use {{invokerPackage}}\ObjectSerializer;
510510
{{/-first}}
511511
{{/servers}}
512512
string $contentType = self::contentTypes['{{{operationId}}}'][0]
513-
{{/vendorExtensions.x-group-parameters}}
514-
{{#vendorExtensions.x-group-parameters}}
513+
{{/exts.x-group-parameters}}
514+
{{#exts.x-group-parameters}}
515515
array $associative_array
516-
{{/vendorExtensions.x-group-parameters}}
516+
{{/exts.x-group-parameters}}
517517
): PromiseInterface
518518
{
519519
$returnType = '{{{returnType}}}';
520-
$request = $this->{{operationId}}Request({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}});
520+
$request = $this->{{operationId}}Request({{^exts.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/exts.x-group-parameters}}{{#exts.x-group-parameters}}$associative_array{{/exts.x-group-parameters}});
521521

522522
return $this->client
523523
->sendAsync($request, $this->createHttpClientOption())
@@ -563,10 +563,10 @@ use {{invokerPackage}}\ObjectSerializer;
563563
/**
564564
* Create request for operation '{{{operationId}}}'
565565
*
566-
{{#vendorExtensions.x-group-parameters}}
566+
{{#exts.x-group-parameters}}
567567
* Note: the input parameter is an associative array with the keys listed as the parameter name below
568568
*
569-
{{/vendorExtensions.x-group-parameters}}
569+
{{/exts.x-group-parameters}}
570570
{{#servers}}
571571
{{#-first}}
572572
* This operation contains host(s) defined in the OpenAPI spec. Use 'hostIndex' to select the host.
@@ -605,9 +605,9 @@ use {{invokerPackage}}\ObjectSerializer;
605605
{{/isDeprecated}}
606606
*/
607607
public function {{operationId}}Request(
608-
{{^vendorExtensions.x-group-parameters}}
608+
{{^exts.x-group-parameters}}
609609
{{#allParams}}
610-
{{vendorExtensions.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
610+
{{exts.x-php-param-type}} ${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}},
611611
{{/allParams}}
612612
{{#servers}}
613613
{{#-first}}
@@ -616,13 +616,13 @@ use {{invokerPackage}}\ObjectSerializer;
616616
{{/-first}}
617617
{{/servers}}
618618
string $contentType = self::contentTypes['{{{operationId}}}'][0]
619-
{{/vendorExtensions.x-group-parameters}}
620-
{{#vendorExtensions.x-group-parameters}}
619+
{{/exts.x-group-parameters}}
620+
{{#exts.x-group-parameters}}
621621
array $associative_array
622-
{{/vendorExtensions.x-group-parameters}}
622+
{{/exts.x-group-parameters}}
623623
): Request
624624
{
625-
{{#vendorExtensions.x-group-parameters}}
625+
{{#exts.x-group-parameters}}
626626
// unbox the parameters from the associative array
627627
{{#allParams}}
628628
${{paramName}} = array_key_exists('{{paramName}}', $associative_array) ? $associative_array['{{paramName}}'] : {{{defaultValue}}}{{^defaultValue}}null{{/defaultValue}};
@@ -631,7 +631,7 @@ use {{invokerPackage}}\ObjectSerializer;
631631
$variables = array_key_exists('variables', $associative_array) ? $associative_array['variables'] : [];
632632
{{/servers.0}}
633633
$contentType = $associative_array['contentType'] ?? self::contentTypes['{{{operationId}}}'][0];
634-
{{/vendorExtensions.x-group-parameters}}{{#allParams}}
634+
{{/exts.x-group-parameters}}{{#allParams}}
635635
{{#required}}
636636
// verify the required parameter '{{paramName}}' is set
637637
if (${{paramName}} === null || (is_array(${{paramName}}) && count(${{paramName}}) === 0)) {

‎modules/openapi-generator/src/main/resources/php-nextgen/api_doc.mustache‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ $apiInstance = new {{invokerPackage}}\Api\{{classname}}(
4747
new GuzzleHttp\Client(){{#hasAuthMethods}},
4848
$config{{/hasAuthMethods}}
4949
);
50-
{{^vendorExtensions.x-group-parameters}}
50+
{{^exts.x-group-parameters}}
5151
{{#allParams}}${{paramName}} = {{{example}}}; // {{{dataType}}}{{#description}} | {{{.}}}{{/description}}
5252
{{/allParams}}{{#servers}}{{#-first}}
5353
$hostIndex = 0;
5454
$variables = [{{#variables}}
5555
'{{{name}}}' => '{{{default}}}{{^default}}YOUR_VALUE{{/default}}',{{/variables}}
5656
];
57-
{{/-first}}{{/servers}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}
57+
{{/-first}}{{/servers}}{{/exts.x-group-parameters}}{{#exts.x-group-parameters}}
5858
$associative_array = [
5959
{{#allParams}} '{{paramName}}' => {{{example}}}, // {{{dataType}}}{{#description}} | {{{.}}}{{/description}}
6060
{{/allParams}}
@@ -64,10 +64,10 @@ $associative_array = [
6464
'{{{name}}}' => '{{{default}}}{{^default}}YOUR_VALUE{{/default}}',{{/variables}}
6565
],
6666
{{/-first}}{{/servers}}];
67-
{{/vendorExtensions.x-group-parameters}}
67+
{{/exts.x-group-parameters}}
6868

6969
try {
70-
{{#returnType}}$result = {{/returnType}}$apiInstance->{{{operationId}}}({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#servers}}{{#-first}}{{#allParams}}{{#-first}}, {{/-first}}{{/allParams}}$hostIndex, $variables{{/-first}}{{/servers}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associate_array{{/vendorExtensions.x-group-parameters}});{{#returnType}}
70+
{{#returnType}}$result = {{/returnType}}$apiInstance->{{{operationId}}}({{^exts.x-group-parameters}}{{#allParams}}${{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#servers}}{{#-first}}{{#allParams}}{{#-first}}, {{/-first}}{{/allParams}}$hostIndex, $variables{{/-first}}{{/servers}}{{/exts.x-group-parameters}}{{#exts.x-group-parameters}}$associate_array{{/exts.x-group-parameters}});{{#returnType}}
7171
print_r($result);{{/returnType}}
7272
} catch (Exception $e) {
7373
echo 'Exception when calling {{classname}}->{{operationId}}: ', $e->getMessage(), PHP_EOL;
@@ -76,10 +76,10 @@ try {
7676

7777
### Parameters
7878

79-
{{#vendorExtensions.x-group-parameters}}
79+
{{#exts.x-group-parameters}}
8080
Note: the input parameter is an associative array with the keys listed as the parameter names below.
8181

82-
{{/vendorExtensions.x-group-parameters}}
82+
{{/exts.x-group-parameters}}
8383
{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}| Name | Type | Description | Notes |
8484
| ------------- | ------------- | ------------- | ------------- |{{/-last}}{{/allParams}}
8585
{{#allParams}}| **{{paramName}}** | {{#isFile}}**{{{dataType}}}**{{/isFile}}{{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{{dataType}}}**](../Model/{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional]{{/required}}{{#defaultValue}} [default to {{.}}]{{/defaultValue}} |

‎modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ use PHPUnit\Framework\TestCase;
6868
* {{{summary}}}.
6969
*
7070
*/
71-
public function test{{vendorExtensions.x-test-operation-id}}()
71+
public function test{{exts.x-test-operation-id}}()
7272
{
7373
// TODO: implement
7474
self::markTestIncomplete('Not implemented');

‎modules/openapi-generator/src/main/resources/php-nextgen/model_enum.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
enum {{classname}}: {{vendorExtensions.x-php-enum-type}}
1+
enum {{classname}}: {{exts.x-php-enum-type}}
22
{
33
{{#allowableValues}}
44
{{#enumVars}}

‎modules/openapi-generator/src/main/resources/php-nextgen/model_generic.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
381381
* @deprecated
382382
{{/deprecated}}
383383
*/
384-
public function {{getter}}(): {{vendorExtensions.x-php-prop-type}}
384+
public function {{getter}}(): {{exts.x-php-prop-type}}
385385
{
386386
return $this->container['{{name}}'];
387387
}
@@ -396,7 +396,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
396396
* @deprecated
397397
{{/deprecated}}
398398
*/
399-
public function {{setter}}({{vendorExtensions.x-php-prop-type}} ${{name}}): static
399+
public function {{setter}}({{exts.x-php-prop-type}} ${{name}}): static
400400
{
401401
{{#isNullable}}
402402
if (is_null(${{name}})) {

0 commit comments

Comments
 (0)