Skip to content

Commit 52b38b6

Browse files
[Php] Fix form data field names to use spec-defined baseName (#23347)
* Php: Fix form data field names to use spec-defined baseName instead of paramName * Regenerate tests * Fixed tests
1 parent 8dce5e5 commit 52b38b6

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ use {{invokerPackage}}\ObjectSerializer;
654654

655655
$formData = $formDataProcessor->prepare([
656656
{{/-first}}
657-
'{{paramName}}' => ${{paramName}},
657+
'{{baseName}}' => ${{paramName}},
658658
{{#-last}}
659659
]);
660660

samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5647,7 +5647,7 @@ public function testEndpointParametersRequest($number, $double, $pattern_without
56475647
'byte' => $byte,
56485648
'binary' => $binary,
56495649
'date' => $date,
5650-
'date_time' => $date_time,
5650+
'dateTime' => $date_time,
56515651
'password' => $password,
56525652
'callback' => $callback,
56535653
]);

samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2431,7 +2431,7 @@ public function uploadFileRequest($pet_id, $additional_metadata = null, $file =
24312431
$formDataProcessor = new FormDataProcessor();
24322432

24332433
$formData = $formDataProcessor->prepare([
2434-
'additional_metadata' => $additional_metadata,
2434+
'additionalMetadata' => $additional_metadata,
24352435
'file' => $file,
24362436
]);
24372437

@@ -2732,8 +2732,8 @@ public function uploadFileWithRequiredFileRequest($pet_id, $required_file, $addi
27322732
$formDataProcessor = new FormDataProcessor();
27332733

27342734
$formData = $formDataProcessor->prepare([
2735-
'additional_metadata' => $additional_metadata,
2736-
'required_file' => $required_file,
2735+
'additionalMetadata' => $additional_metadata,
2736+
'requiredFile' => $required_file,
27372737
]);
27382738

27392739
$formParams = $formDataProcessor->flatten($formData);
@@ -3078,7 +3078,7 @@ public function uploadImageFullFormDataRequest($pet_id, $name, $photo_urls, $id
30783078
'id' => $id,
30793079
'category' => $category,
30803080
'name' => $name,
3081-
'photo_urls' => $photo_urls,
3081+
'photoUrls' => $photo_urls,
30823082
'tags' => $tags,
30833083
'status' => $status,
30843084
'file' => $file,

samples/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ public function testObjectInFormData()
414414
$contents = $request->getBody()->getContents();
415415

416416
$this->assertBodyContents('name', $name, $contents);
417-
$this->assertBodyContents('photo_urls[0]', $photo_urls[0], $contents);
418-
$this->assertBodyContents('photo_urls[1]', $photo_urls[1], $contents);
417+
$this->assertBodyContents('photoUrls[0]', $photo_urls[0], $contents);
418+
$this->assertBodyContents('photoUrls[1]', $photo_urls[1], $contents);
419419
$this->assertBodyContents('category[id]', $category->getId(), $contents);
420420
$this->assertBodyContents('category[name]', $category->getName(), $contents);
421421
$this->assertBodyContents('tags[0][id]', $tags[0]->getId(), $contents);

0 commit comments

Comments
 (0)