merge master

Author: devhl-labs

bin/configs/csharp-generichost-latest-dateTimeOffset.yaml

@@ -8,3 +8,5 @@ additionalProperties:
   modelPropertySorting: alphabetical
   operationParameterSorting: alphabetical
   useDateTimeOffset: true
+  treatWarningsAsErrors: true
+  warningsNotAsErrors: CS0612

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache

@@ -388,7 +388,7 @@ namespace {{packageName}}.{{apiPackage}}
                     uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
                     uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
                         ? "{{{path}}}"
-                        : string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
+                        : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "{{{path}}}");
                     {{/servers}}
                     {{#servers}}
                     {{#-first}}

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

@@ -732,7 +732,7 @@ use {{invokerPackage}}\ObjectSerializer;
 
         $formData = $formDataProcessor->prepare([
         {{/-first}}
-            '{{paramName}}' => ${{paramName}},
+            '{{baseName}}' => ${{paramName}},
         {{#-last}}
         ]);
 

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

@@ -21,14 +21,14 @@
 
 namespace {{modelPackage}};
 {{^isEnum}}
-{{^parentSchema}}
 
+{{^parentSchema}}
 use ArrayAccess;
 use JsonSerializable;
+{{/parentSchema}}
 use InvalidArgumentException;
 use ReturnTypeWillChange;
 use {{invokerPackage}}\ObjectSerializer;
-{{/parentSchema}}
 {{/isEnum}}
 
 /**

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

@@ -654,7 +654,7 @@ use {{invokerPackage}}\ObjectSerializer;
 
         $formData = $formDataProcessor->prepare([
         {{/-first}}
-            '{{paramName}}' => ${{paramName}},
+            '{{baseName}}' => ${{paramName}},
         {{#-last}}
         ]);
 

modules/openapi-generator/src/main/resources/php/libraries/psr-18/api.mustache

@@ -612,7 +612,7 @@ use function sprintf;
 
         $formData = $formDataProcessor->prepare([
         {{/-first}}
-            '{{paramName}}' => ${{paramName}},
+            '{{baseName}}' => ${{paramName}},
         {{#-last}}
         ]);
 

samples/client/echo_api/php-nextgen-streaming/src/Api/BodyApi.php

@@ -1175,7 +1175,7 @@ public function testBodyMultipartFormdataSingleBinaryRequest(
         $formDataProcessor = new FormDataProcessor();
 
         $formData = $formDataProcessor->prepare([
-            'my_file' => $my_file,
+            'my-file' => $my_file,
         ]);
 
         $formParams = $formDataProcessor->flatten($formData);

samples/client/echo_api/php-nextgen-streaming/src/Model/DataQuery.php

@@ -28,6 +28,10 @@
 
 namespace OpenAPI\Client\Model;
 
+use InvalidArgumentException;
+use ReturnTypeWillChange;
+use OpenAPI\Client\ObjectSerializer;
+
 /**
  * DataQuery Class Doc Comment
  *

samples/client/echo_api/php-nextgen/src/Api/BodyApi.php

@@ -1175,7 +1175,7 @@ public function testBodyMultipartFormdataSingleBinaryRequest(
         $formDataProcessor = new FormDataProcessor();
 
         $formData = $formDataProcessor->prepare([
-            'my_file' => $my_file,
+            'my-file' => $my_file,
         ]);
 
         $formParams = $formDataProcessor->flatten($formData);

samples/client/echo_api/php-nextgen/src/Model/DataQuery.php

@@ -28,6 +28,10 @@
 
 namespace OpenAPI\Client\Model;
 
+use InvalidArgumentException;
+use ReturnTypeWillChange;
+use OpenAPI\Client\ObjectSerializer;
+
 /**
  * DataQuery Class Doc Comment
  *