Skip to content

Commit 2061ee6

Browse files
jtreminiojtreminio
committed
Rebuilding PHP examples
1 parent 4518cd5 commit 2061ee6

File tree

3 files changed

+123
-31
lines changed

3 files changed

+123
-31
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4567,39 +4567,39 @@ public function testEndpointParametersRequest($number, $double, $pattern_without
45674567

45684568
// form params
45694569
if ($integer !== null) {
4570-
$formParams['integer'] = ObjectSerializer::toFormValue($integer);
4570+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('integer', $integer));
45714571
}
45724572
// form params
45734573
if ($int32 !== null) {
4574-
$formParams['int32'] = ObjectSerializer::toFormValue($int32);
4574+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('int32', $int32));
45754575
}
45764576
// form params
45774577
if ($int64 !== null) {
4578-
$formParams['int64'] = ObjectSerializer::toFormValue($int64);
4578+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('int64', $int64));
45794579
}
45804580
// form params
45814581
if ($number !== null) {
4582-
$formParams['number'] = ObjectSerializer::toFormValue($number);
4582+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('number', $number));
45834583
}
45844584
// form params
45854585
if ($float !== null) {
4586-
$formParams['float'] = ObjectSerializer::toFormValue($float);
4586+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('float', $float));
45874587
}
45884588
// form params
45894589
if ($double !== null) {
4590-
$formParams['double'] = ObjectSerializer::toFormValue($double);
4590+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('double', $double));
45914591
}
45924592
// form params
45934593
if ($string !== null) {
4594-
$formParams['string'] = ObjectSerializer::toFormValue($string);
4594+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('string', $string));
45954595
}
45964596
// form params
45974597
if ($pattern_without_delimiter !== null) {
4598-
$formParams['pattern_without_delimiter'] = ObjectSerializer::toFormValue($pattern_without_delimiter);
4598+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('pattern_without_delimiter', $pattern_without_delimiter));
45994599
}
46004600
// form params
46014601
if ($byte !== null) {
4602-
$formParams['byte'] = ObjectSerializer::toFormValue($byte);
4602+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('byte', $byte));
46034603
}
46044604
// form params
46054605
if ($binary !== null) {
@@ -4608,26 +4608,26 @@ public function testEndpointParametersRequest($number, $double, $pattern_without
46084608
$paramFiles = is_array($binary) ? $binary : [$binary];
46094609
foreach ($paramFiles as $paramFile) {
46104610
$formParams['binary'][] = \GuzzleHttp\Psr7\Utils::tryFopen(
4611-
ObjectSerializer::toFormValue($paramFile),
4611+
ObjectSerializer::toFormValue('binary', $paramFile)['binary'],
46124612
'rb'
46134613
);
46144614
}
46154615
}
46164616
// form params
46174617
if ($date !== null) {
4618-
$formParams['date'] = ObjectSerializer::toFormValue($date);
4618+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('date', $date));
46194619
}
46204620
// form params
46214621
if ($date_time !== null) {
4622-
$formParams['dateTime'] = ObjectSerializer::toFormValue($date_time);
4622+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('dateTime', $date_time));
46234623
}
46244624
// form params
46254625
if ($password !== null) {
4626-
$formParams['password'] = ObjectSerializer::toFormValue($password);
4626+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('password', $password));
46274627
}
46284628
// form params
46294629
if ($callback !== null) {
4630-
$formParams['callback'] = ObjectSerializer::toFormValue($callback);
4630+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('callback', $callback));
46314631
}
46324632

46334633
$headers = $this->headerSelector->selectHeaders(
@@ -4942,11 +4942,11 @@ public function testEnumParametersRequest($enum_header_string_array = null, $enu
49424942

49434943
// form params
49444944
if ($enum_form_string_array !== null) {
4945-
$formParams['enum_form_string_array'] = ObjectSerializer::toFormValue($enum_form_string_array);
4945+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('enum_form_string_array', $enum_form_string_array));
49464946
}
49474947
// form params
49484948
if ($enum_form_string !== null) {
4949-
$formParams['enum_form_string'] = ObjectSerializer::toFormValue($enum_form_string);
4949+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('enum_form_string', $enum_form_string));
49504950
}
49514951

49524952
$headers = $this->headerSelector->selectHeaders(
@@ -5920,11 +5920,11 @@ public function testJsonFormDataRequest($param, $param2, string $contentType = s
59205920

59215921
// form params
59225922
if ($param !== null) {
5923-
$formParams['param'] = ObjectSerializer::toFormValue($param);
5923+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('param', $param));
59245924
}
59255925
// form params
59265926
if ($param2 !== null) {
5927-
$formParams['param2'] = ObjectSerializer::toFormValue($param2);
5927+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('param2', $param2));
59285928
}
59295929

59305930
$headers = $this->headerSelector->selectHeaders(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,11 +2224,11 @@ public function updatePetWithFormRequest($pet_id, $name = null, $status = null,
22242224

22252225
// form params
22262226
if ($name !== null) {
2227-
$formParams['name'] = ObjectSerializer::toFormValue($name);
2227+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('name', $name));
22282228
}
22292229
// form params
22302230
if ($status !== null) {
2231-
$formParams['status'] = ObjectSerializer::toFormValue($status);
2231+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('status', $status));
22322232
}
22332233

22342234
$headers = $this->headerSelector->selectHeaders(
@@ -2556,7 +2556,7 @@ public function uploadFileRequest($pet_id, $additional_metadata = null, $file =
25562556

25572557
// form params
25582558
if ($additional_metadata !== null) {
2559-
$formParams['additionalMetadata'] = ObjectSerializer::toFormValue($additional_metadata);
2559+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('additionalMetadata', $additional_metadata));
25602560
}
25612561
// form params
25622562
if ($file !== null) {
@@ -2565,7 +2565,7 @@ public function uploadFileRequest($pet_id, $additional_metadata = null, $file =
25652565
$paramFiles = is_array($file) ? $file : [$file];
25662566
foreach ($paramFiles as $paramFile) {
25672567
$formParams['file'][] = \GuzzleHttp\Psr7\Utils::tryFopen(
2568-
ObjectSerializer::toFormValue($paramFile),
2568+
ObjectSerializer::toFormValue('file', $paramFile)['file'],
25692569
'rb'
25702570
);
25712571
}
@@ -2903,7 +2903,7 @@ public function uploadFileWithRequiredFileRequest($pet_id, $required_file, $addi
29032903

29042904
// form params
29052905
if ($additional_metadata !== null) {
2906-
$formParams['additionalMetadata'] = ObjectSerializer::toFormValue($additional_metadata);
2906+
$formParams = array_merge($formParams, ObjectSerializer::toFormValue('additionalMetadata', $additional_metadata));
29072907
}
29082908
// form params
29092909
if ($required_file !== null) {
@@ -2912,7 +2912,7 @@ public function uploadFileWithRequiredFileRequest($pet_id, $required_file, $addi
29122912
$paramFiles = is_array($required_file) ? $required_file : [$required_file];
29132913
foreach ($paramFiles as $paramFile) {
29142914
$formParams['requiredFile'][] = \GuzzleHttp\Psr7\Utils::tryFopen(
2915-
ObjectSerializer::toFormValue($paramFile),
2915+
ObjectSerializer::toFormValue('requiredFile', $paramFile)['requiredFile'],
29162916
'rb'
29172917
);
29182918
}

‎samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php‎

Lines changed: 99 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,15 +330,28 @@ public static function toHeaderValue($value)
330330
*
331331
* @param string|\SplFileObject $value the value of the form parameter
332332
*
333-
* @return string the form string
333+
* @return array
334334
*/
335-
public static function toFormValue($value)
335+
public static function toFormValue(string $key, mixed $value)
336336
{
337-
if ($value instanceof \SplFileObject) {
338-
return $value->getRealPath();
339-
} else {
340-
return self::toString($value);
337+
$stringable = self::toString($value);
338+
339+
if ($stringable !== null) {
340+
return [$key => $stringable];
341+
} elseif ($value instanceof \SplFileObject) {
342+
return [$key => $value->getRealPath()];
341343
}
344+
345+
$flattened = [];
346+
$result = [];
347+
348+
self::flatten_array(json_decode(json_encode($value), true), $flattened);
349+
350+
foreach ($flattened as $k => $v) {
351+
$result["{$key}{$k}"] = self::toString($v);
352+
}
353+
354+
return $result;
342355
}
343356

344357
/**
@@ -349,12 +362,14 @@ public static function toFormValue($value)
349362
*
350363
* @param float|int|bool|\DateTime $value the value of the parameter
351364
*
352-
* @return string the header string
365+
* @return string|null the header string
353366
*/
354367
public static function toString($value)
355368
{
356369
if ($value instanceof \DateTime) { // datetime in ISO8601 format
357370
return $value->format(self::$dateTimeFormat);
371+
} elseif (!is_scalar($value) && $value !== null) {
372+
return null;
358373
} elseif (is_bool($value)) {
359374
return $value ? 'true' : 'false';
360375
} else {
@@ -614,4 +629,81 @@ public static function buildQuery(array $params, $encoding = PHP_QUERY_RFC3986):
614629

615630
return $qs ? (string) substr($qs, 0, -1) : '';
616631
}
632+
633+
/**
634+
* Flattens an array of Model object and generates an array compatible
635+
* with formdata - a single-level array where the keys use bracket
636+
* notation to signify nested data.
637+
*
638+
* @param \ArrayAccess|array $source
639+
*
640+
* credit: https://github.com/FranBar1966/FlatPHP
641+
*/
642+
private static function flatten_array(
643+
mixed $source,
644+
array &$destination,
645+
string $start = '',
646+
) {
647+
$opt = [
648+
'prefix' => '[',
649+
'suffix' => ']',
650+
'suffix-end' => true,
651+
'prefix-list' => '[',
652+
'suffix-list' => ']',
653+
'suffix-list-end' => true,
654+
];
655+
656+
if (!is_array($source)) {
657+
$source = (array) $source;
658+
}
659+
660+
/**
661+
* array_is_list only in PHP >= 8.1
662+
*
663+
* credit: https://www.php.net/manual/en/function.array-is-list.php#127044
664+
*/
665+
if (!function_exists('array_is_list')) {
666+
function array_is_list(array $array)
667+
{
668+
$i = -1;
669+
670+
foreach ($array as $k => $v) {
671+
++$i;
672+
if ($k !== $i) {
673+
return false;
674+
}
675+
}
676+
677+
return true;
678+
}
679+
}
680+
681+
if (array_is_list($source)) {
682+
$currentPrefix = $opt['prefix-list'];
683+
$currentSuffix = $opt['suffix-list'];
684+
$currentSuffixEnd = $opt['suffix-list-end'];
685+
} else {
686+
$currentPrefix = $opt['prefix'];
687+
$currentSuffix = $opt['suffix'];
688+
$currentSuffixEnd = $opt['suffix-end'];
689+
}
690+
691+
$currentName = $start;
692+
693+
foreach ($source as $key => $val) {
694+
$currentName .= $currentPrefix.$key;
695+
696+
if (is_array($val) && !empty($val)) {
697+
$currentName .= "{$currentSuffix}";
698+
self::flatten_array($val, $destination, $currentName);
699+
} else {
700+
if ($currentSuffixEnd) {
701+
$currentName .= $currentSuffix;
702+
}
703+
$destination[$currentName] = self::toString($val);
704+
}
705+
706+
$currentName = $start;
707+
}
708+
}
617709
}

0 commit comments

Comments
 (0)