Merge remote-tracking branch 'origin' into okhttp4-generator-tweak

HugoMario · HugoMario · commit 70a703490101 · 2023-06-01T23:35:39.000-05:00
diff --git a/src/main/resources/handlebars/Java/libraries/feign/api.mustache b/src/main/resources/handlebars/Java/libraries/feign/api.mustache
@@ -40,10 +40,10 @@ public interface {{classname}} extends ApiClient.Api {
   @RequestLine("{{httpMethod}} {{{path}}}{{#hasQueryParams}}?{{/hasQueryParams}}{{#queryParams}}{{baseName}}={{braces "left"}}{{paramName}}{{braces "right"}}{{#has this 'more'}}&{{/has}}{{/queryParams}}")
   @Headers({
   {{#vendorExtensions.x-contentType}}
-      "Content-Type: {{vendorExtensions.x-contentType}}",
+      "Content-Type: {{{vendorExtensions.x-contentType}}}",
   {{/vendorExtensions.x-contentType}}
   {{#vendorExtensions.x-accepts}}
-      "Accept: {{vendorExtensions.x-accepts}}",
+      "Accept: {{{vendorExtensions.x-accepts}}}",
   {{/vendorExtensions.x-accepts}}
   {{^vendorExtensions.x-accepts}}
       "Accept: */*",
@@ -85,13 +85,13 @@ public interface {{classname}} extends ApiClient.Api {
   @RequestLine("{{httpMethod}} {{{path}}}?{{#queryParams}}{{baseName}}={{braces "left"}}{{paramName}}{{braces "right"}}{{#has this 'more'}}&{{/has}}{{/queryParams}}")
   @Headers({
   {{#vendorExtensions.x-contentType}}
-      "Content-Type: {{vendorExtensions.x-contentType}}",
+      "Content-Type: {{{vendorExtensions.x-contentType}}}",
   {{/vendorExtensions.x-contentType}}
   {{^vendorExtensions.x-contentType}}
       "Content-Type: */*",
   {{/vendorExtensions.x-contentType}}
   {{#vendorExtensions.x-accepts}}
-      "Accept: {{vendorExtensions.x-accepts}}",
+      "Accept: {{{vendorExtensions.x-accepts}}}",
   {{/vendorExtensions.x-accepts}}
   {{#headerParams}}
       "{{baseName}}: {{braces "left"}}{{paramName}}{{braces "right"}}"{{#has this 'more'}},{{/has}}
diff --git a/src/main/resources/handlebars/php/api.mustache b/src/main/resources/handlebars/php/api.mustache
@@ -448,7 +448,7 @@ use {{invokerPackage}}\ObjectSerializer;
 
             } else {
                 // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
+                $httpBody = \GuzzleHttp\Psr7\Query::build($formParams);
             }
         }
 
@@ -491,7 +491,7 @@ use {{invokerPackage}}\ObjectSerializer;
             $headers
         );
 
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
+        $query = \GuzzleHttp\Psr7\Query::build($queryParams);
         return new Request(
             '{{httpMethod}}',
             $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
diff --git a/src/main/resources/handlebars/php/model_enum.mustache b/src/main/resources/handlebars/php/model_enum.mustache
@@ -3,17 +3,23 @@ class {{classname}}
     /**
      * Possible values of this enum
      */
-    {{#allowableValues}}{{#enumVars}}const {{{name}}} = {{{value}}};
-    {{/enumVars}}{{/allowableValues}}
+    {{#allowableValues}}
+    {{#enumVars}}
+    const {{{name}}} = {{{value}}};
+    {{/enumVars}}
+    {{/allowableValues}}
     /**
      * Gets allowable values of the enum
      * @return string[]
      */
     public static function getAllowableEnumValues()
     {
         return [
-            {{#allowableValues}}{{#enumVars}}self::{{{name}}},{{^@last}}
-            {{/@last}}{{/enumVars}}{{/allowableValues}}
+            {{#allowableValues}}
+            {{#enumVars}}
+            self::{{{name}}}{{#hasMore}},{{/hasMore}}
+            {{/enumVars}}
+            {{/allowableValues}}
         ];
     }
 }
diff --git a/src/main/resources/handlebars/php/model_generic.mustache b/src/main/resources/handlebars/php/model_generic.mustache
@@ -15,8 +15,9 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
       * @var string[]
       */
     protected static $swaggerTypes = [
-        {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
-        {{/hasMore}}{{/vars}}
+        {{#vars}}
+        '{{name}}' => '{{{datatype}}}'{{#hasMore}},{{/hasMore}}
+        {{/vars}}
     ];
 
     /**
@@ -25,8 +26,9 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
       * @var string[]
       */
     protected static $swaggerFormats = [
-        {{#vars}}'{{name}}' => {{#dataFormat}}'{{{dataFormat}}}'{{/dataFormat}}{{^dataFormat}}null{{/dataFormat}}{{#hasMore}},
-        {{/hasMore}}{{/vars}}
+        {{#vars}}
+        '{{name}}' => {{#dataFormat}}'{{{dataFormat}}}'{{/dataFormat}}{{^dataFormat}}null{{/dataFormat}}{{#hasMore}},{{/hasMore}}
+        {{/vars}}
     ];
 
     /**
@@ -56,8 +58,9 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
      * @var string[]
      */
     protected static $attributeMap = [
-        {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
-        {{/hasMore}}{{/vars}}
+        {{#vars}}
+        '{{name}}' => '{{baseName}}'{{#hasMore}},{{/hasMore}}
+        {{/vars}}
     ];
 
     /**
@@ -66,8 +69,9 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
      * @var string[]
      */
     protected static $setters = [
-        {{#vars}}'{{name}}' => '{{setter}}'{{#hasMore}},
-        {{/hasMore}}{{/vars}}
+        {{#vars}}
+        '{{name}}' => '{{setter}}'{{#hasMore}},{{/hasMore}}
+        {{/vars}}
     ];
 
     /**
@@ -76,8 +80,9 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
      * @var string[]
      */
     protected static $getters = [
-        {{#vars}}'{{name}}' => '{{getter}}'{{#hasMore}},
-        {{/hasMore}}{{/vars}}
+        {{#vars}}
+        '{{name}}' => '{{getter}}'{{#hasMore}},{{/hasMore}}
+        {{/vars}}
     ];
 
     /**
@@ -121,10 +126,18 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
         return self::$swaggerModelName;
     }
 
-    {{#vars}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}const {{enumName}}_{{{name}}} = {{{value}}};
-    {{/enumVars}}{{/allowableValues}}{{/isEnum}}{{/vars}}
+    {{#vars}}
+    {{#isEnum}}
+    {{#allowableValues}}
+    {{#enumVars}}
+    const {{enumName}}_{{{name}}} = {{{value}}};
+    {{/enumVars}}
+    {{/allowableValues}}
+    {{/isEnum}}
+    {{/vars}}
 
-    {{#vars}}{{#isEnum}}
+    {{#vars}}
+    {{#isEnum}}
     /**
      * Gets allowable values of the enum
      *
@@ -133,11 +146,15 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
     public function {{getter}}AllowableValues()
     {
         return [
-            {{#allowableValues}}{{#enumVars}}self::{{enumName}}_{{{name}}},{{^@last}}
-            {{/@last}}{{/enumVars}}{{/allowableValues}}
+            {{#allowableValues}}
+            {{#enumVars}}
+            self::{{enumName}}_{{{name}}}{{#hasMore}},{{/hasMore}}
+            {{/enumVars}}
+            {{/allowableValues}}
         ];
     }
-    {{/isEnum}}{{/vars}}
+    {{/isEnum}}
+    {{/vars}}
 
     {{^parentSchema}}
     /**

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ use {{invokerPackage}}\ObjectSerializer;`
`448`	`448`
`449`	`449`	`} else {`
`450`	`450`	`// for HTTP post (form)`
`451`		`- $httpBody = \GuzzleHttp\Psr7\build_query($formParams);`
	`451`	`+ $httpBody = \GuzzleHttp\Psr7\Query::build($formParams);`
`452`	`452`	`}`
`453`	`453`	`}`
`454`	`454`
`@@ -491,7 +491,7 @@ use {{invokerPackage}}\ObjectSerializer;`
`491`	`491`	`$headers`
`492`	`492`	`);`
`493`	`493`
`494`		`- $query = \GuzzleHttp\Psr7\build_query($queryParams);`
	`494`	`+ $query = \GuzzleHttp\Psr7\Query::build($queryParams);`
`495`	`495`	`return new Request(`
`496`	`496`	`'{{httpMethod}}',`
`497`	`497`	`$this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),`