[php][php-nextgen] Apply baseName fix to php-nextgen and psr-18 templates (#23360)

* Php: Fix form data field names to use spec-defined baseName instead of paramName

* Regenerate tests

* Fixed tests

* Apply baseName fix to php-nextgen and psr-18 templates

* Tests regeneration

Author: ksvirkou-hubspot

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/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/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/petstore/php-nextgen/OpenAPIClient-php/src/Api/FakeApi.php

@@ -5933,7 +5933,7 @@ public function testEndpointParametersRequest(
             'byte' => $byte,
             'binary' => $binary,
             'date' => $date,
-            'date_time' => $date_time,
+            'dateTime' => $date_time,
             'password' => $password,
             'callback' => $callback,
         ]);

samples/client/petstore/php-nextgen/OpenAPIClient-php/src/Api/PetApi.php

@@ -2574,7 +2574,7 @@ public function uploadFileRequest(
         $formDataProcessor = new FormDataProcessor();
 
         $formData = $formDataProcessor->prepare([
-            'additional_metadata' => $additional_metadata,
+            'additionalMetadata' => $additional_metadata,
             'file' => $file,
         ]);
 
@@ -2896,8 +2896,8 @@ public function uploadFileWithRequiredFileRequest(
         $formDataProcessor = new FormDataProcessor();
 
         $formData = $formDataProcessor->prepare([
-            'additional_metadata' => $additional_metadata,
-            'required_file' => $required_file,
+            'additionalMetadata' => $additional_metadata,
+            'requiredFile' => $required_file,
         ]);
 
         $formParams = $formDataProcessor->flatten($formData);

samples/client/petstore/php/psr-18/lib/Api/FakeApi.php

@@ -5395,7 +5395,7 @@ public function testEndpointParametersRequest($number, $double, $pattern_without
             'byte' => $byte,
             'binary' => $binary,
             'date' => $date,
-            'date_time' => $date_time,
+            'dateTime' => $date_time,
             'password' => $password,
             'callback' => $callback,
         ]);

samples/client/petstore/php/psr-18/lib/Api/PetApi.php

@@ -2130,7 +2130,7 @@ public function uploadFileRequest($pet_id, $additional_metadata = null, $file =
         $formDataProcessor = new FormDataProcessor();
 
         $formData = $formDataProcessor->prepare([
-            'additional_metadata' => $additional_metadata,
+            'additionalMetadata' => $additional_metadata,
             'file' => $file,
         ]);
 
@@ -2417,8 +2417,8 @@ public function uploadFileWithRequiredFileRequest($pet_id, $required_file, $addi
         $formDataProcessor = new FormDataProcessor();
 
         $formData = $formDataProcessor->prepare([
-            'additional_metadata' => $additional_metadata,
-            'required_file' => $required_file,
+            'additionalMetadata' => $additional_metadata,
+            'requiredFile' => $required_file,
         ]);
 
         $formParams = $formDataProcessor->flatten($formData);
@@ -2744,7 +2744,7 @@ public function uploadImageFullFormDataRequest($pet_id, $name, $photo_urls, $id
             'id' => $id,
             'category' => $category,
             'name' => $name,
-            'photo_urls' => $photo_urls,
+            'photoUrls' => $photo_urls,
             'tags' => $tags,
             'status' => $status,
             'file' => $file,