Skip to content

Commit 86052aa

Browse files
phknotphknot
authored
fix: Use correct constructor for ApiException in PSR-18 PHP library (#21631)
* fix: Use correct constructor for ApiException * chore: Generate samples * fix: Missing $ * fix: Remove extraneous line
1 parent 7c4ada3 commit 86052aa

File tree

8 files changed

+84
-114
lines changed

8 files changed

+84
-114
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,8 @@ use function sprintf;
301301
$statusCode,
302302
(string) $request->getUri()
303303
),
304-
$statusCode,
305-
$response->getHeaders(),
306-
(string) $response->getBody()
304+
$request,
305+
$response
307306
);
308307
}
309308

@@ -806,9 +805,9 @@ use function sprintf;
806805
'Error JSON decoding server response (%s)',
807806
$request->getUri()
808807
),
809-
$response->getStatusCode(),
810-
$response->getHeaders(),
811-
$content
808+
$request,
809+
$response,
810+
$exception
812811
);
813812
}
814813
}

‎samples/client/petstore/php/psr-18/lib/Api/AnotherFakeApi.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,8 @@ public function call123TestSpecialTagsWithHttpInfo($client)
251251
$statusCode,
252252
(string) $request->getUri()
253253
),
254-
$statusCode,
255-
$response->getHeaders(),
256-
(string) $response->getBody()
254+
$request,
255+
$response
257256
);
258257
}
259258

@@ -514,9 +513,9 @@ private function handleResponseWithDataType(
514513
'Error JSON decoding server response (%s)',
515514
$request->getUri()
516515
),
517-
$response->getStatusCode(),
518-
$response->getHeaders(),
519-
$content
516+
request,
517+
$response,
518+
$exception
520519
);
521520
}
522521
}

‎samples/client/petstore/php/psr-18/lib/Api/DefaultApi.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,8 @@ public function fooGetWithHttpInfo()
245245
$statusCode,
246246
(string) $request->getUri()
247247
),
248-
$statusCode,
249-
$response->getHeaders(),
250-
(string) $response->getBody()
248+
$request,
249+
$response
251250
);
252251
}
253252

@@ -489,9 +488,9 @@ private function handleResponseWithDataType(
489488
'Error JSON decoding server response (%s)',
490489
$request->getUri()
491490
),
492-
$response->getStatusCode(),
493-
$response->getHeaders(),
494-
$content
491+
request,
492+
$response,
493+
$exception
495494
);
496495
}
497496
}

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

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,8 @@ public function fakeBigDecimalMapWithHttpInfo()
245245
$statusCode,
246246
(string) $request->getUri()
247247
),
248-
$statusCode,
249-
$response->getHeaders(),
250-
(string) $response->getBody()
248+
$request,
249+
$response
251250
);
252251
}
253252

@@ -486,9 +485,8 @@ public function fakeEnumEndpointWithHttpInfo($enum_class, $enum_class_array, $en
486485
$statusCode,
487486
(string) $request->getUri()
488487
),
489-
$statusCode,
490-
$response->getHeaders(),
491-
(string) $response->getBody()
488+
$request,
489+
$response
492490
);
493491
}
494492

@@ -785,9 +783,8 @@ public function fakeHealthGetWithHttpInfo()
785783
$statusCode,
786784
(string) $request->getUri()
787785
),
788-
$statusCode,
789-
$response->getHeaders(),
790-
(string) $response->getBody()
786+
$request,
787+
$response
791788
);
792789
}
793790

@@ -1256,9 +1253,8 @@ public function fakeOuterBooleanSerializeWithHttpInfo($body = null)
12561253
$statusCode,
12571254
(string) $request->getUri()
12581255
),
1259-
$statusCode,
1260-
$response->getHeaders(),
1261-
(string) $response->getBody()
1256+
$request,
1257+
$response
12621258
);
12631259
}
12641260

@@ -1498,9 +1494,8 @@ public function fakeOuterCompositeSerializeWithHttpInfo($outer_composite = null)
14981494
$statusCode,
14991495
(string) $request->getUri()
15001496
),
1501-
$statusCode,
1502-
$response->getHeaders(),
1503-
(string) $response->getBody()
1497+
$request,
1498+
$response
15041499
);
15051500
}
15061501

@@ -1740,9 +1735,8 @@ public function fakeOuterNumberSerializeWithHttpInfo($body = null)
17401735
$statusCode,
17411736
(string) $request->getUri()
17421737
),
1743-
$statusCode,
1744-
$response->getHeaders(),
1745-
(string) $response->getBody()
1738+
$request,
1739+
$response
17461740
);
17471741
}
17481742

@@ -1982,9 +1976,8 @@ public function fakeOuterStringSerializeWithHttpInfo($body = null)
19821976
$statusCode,
19831977
(string) $request->getUri()
19841978
),
1985-
$statusCode,
1986-
$response->getHeaders(),
1987-
(string) $response->getBody()
1979+
$request,
1980+
$response
19881981
);
19891982
}
19901983

@@ -2224,9 +2217,8 @@ public function fakePropertyEnumIntegerSerializeWithHttpInfo($outer_object_with_
22242217
$statusCode,
22252218
(string) $request->getUri()
22262219
),
2227-
$statusCode,
2228-
$response->getHeaders(),
2229-
(string) $response->getBody()
2220+
$request,
2221+
$response
22302222
);
22312223
}
22322224

@@ -2489,9 +2481,8 @@ public function fakeWith400And4xxRangeResponseEndpointWithHttpInfo($pet)
24892481
$statusCode,
24902482
(string) $request->getUri()
24912483
),
2492-
$statusCode,
2493-
$response->getHeaders(),
2494-
(string) $response->getBody()
2484+
$request,
2485+
$response
24952486
);
24962487
}
24972488

@@ -2763,9 +2754,8 @@ public function fakeWith400And4xxRangeResponseNo4xxDatatypeEndpointWithHttpInfo(
27632754
$statusCode,
27642755
(string) $request->getUri()
27652756
),
2766-
$statusCode,
2767-
$response->getHeaders(),
2768-
(string) $response->getBody()
2757+
$request,
2758+
$response
27692759
);
27702760
}
27712761

@@ -3025,9 +3015,8 @@ public function fakeWith400ResponseEndpointWithHttpInfo($pet)
30253015
$statusCode,
30263016
(string) $request->getUri()
30273017
),
3028-
$statusCode,
3029-
$response->getHeaders(),
3030-
(string) $response->getBody()
3018+
$request,
3019+
$response
30313020
);
30323021
}
30333022

@@ -3296,9 +3285,8 @@ public function fakeWith4xxRangeResponseEndpointWithHttpInfo($pet)
32963285
$statusCode,
32973286
(string) $request->getUri()
32983287
),
3299-
$statusCode,
3300-
$response->getHeaders(),
3301-
(string) $response->getBody()
3288+
$request,
3289+
$response
33023290
);
33033291
}
33043292

@@ -3562,9 +3550,8 @@ public function fakeWith4xxRangeResponseNo4xxDatatypeEndpointWithHttpInfo($pet)
35623550
$statusCode,
35633551
(string) $request->getUri()
35643552
),
3565-
$statusCode,
3566-
$response->getHeaders(),
3567-
(string) $response->getBody()
3553+
$request,
3554+
$response
35683555
);
35693556
}
35703557

@@ -4933,9 +4920,8 @@ public function testClientModelWithHttpInfo($client)
49334920
$statusCode,
49344921
(string) $request->getUri()
49354922
),
4936-
$statusCode,
4937-
$response->getHeaders(),
4938-
(string) $response->getBody()
4923+
$request,
4924+
$response
49394925
);
49404926
}
49414927

@@ -7349,9 +7335,9 @@ private function handleResponseWithDataType(
73497335
'Error JSON decoding server response (%s)',
73507336
$request->getUri()
73517337
),
7352-
$response->getStatusCode(),
7353-
$response->getHeaders(),
7354-
$content
7338+
request,
7339+
$response,
7340+
$exception
73557341
);
73567342
}
73577343
}

‎samples/client/petstore/php/psr-18/lib/Api/FakeClassnameTags123Api.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,8 @@ public function testClassnameWithHttpInfo($client)
251251
$statusCode,
252252
(string) $request->getUri()
253253
),
254-
$statusCode,
255-
$response->getHeaders(),
256-
(string) $response->getBody()
254+
$request,
255+
$response
257256
);
258257
}
259258

@@ -519,9 +518,9 @@ private function handleResponseWithDataType(
519518
'Error JSON decoding server response (%s)',
520519
$request->getUri()
521520
),
522-
$response->getStatusCode(),
523-
$response->getHeaders(),
524-
$content
521+
request,
522+
$response,
523+
$exception
525524
);
526525
}
527526
}

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

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -722,9 +722,8 @@ public function findPetsByStatusWithHttpInfo($status)
722722
$statusCode,
723723
(string) $request->getUri()
724724
),
725-
$statusCode,
726-
$response->getHeaders(),
727-
(string) $response->getBody()
725+
$request,
726+
$response
728727
);
729728
}
730729

@@ -983,9 +982,8 @@ public function findPetsByTagsWithHttpInfo($tags)
983982
$statusCode,
984983
(string) $request->getUri()
985984
),
986-
$statusCode,
987-
$response->getHeaders(),
988-
(string) $response->getBody()
985+
$request,
986+
$response
989987
);
990988
}
991989

@@ -1245,9 +1243,8 @@ public function getPetByIdWithHttpInfo($pet_id)
12451243
$statusCode,
12461244
(string) $request->getUri()
12471245
),
1248-
$statusCode,
1249-
$response->getHeaders(),
1250-
(string) $response->getBody()
1246+
$request,
1247+
$response
12511248
);
12521249
}
12531250

@@ -1994,9 +1991,8 @@ public function uploadFileWithHttpInfo($pet_id, $additional_metadata = null, $fi
19941991
$statusCode,
19951992
(string) $request->getUri()
19961993
),
1997-
$statusCode,
1998-
$response->getHeaders(),
1999-
(string) $response->getBody()
1994+
$request,
1995+
$response
20001996
);
20011997
}
20021998

@@ -2276,9 +2272,8 @@ public function uploadFileWithRequiredFileWithHttpInfo($pet_id, $required_file,
22762272
$statusCode,
22772273
(string) $request->getUri()
22782274
),
2279-
$statusCode,
2280-
$response->getHeaders(),
2281-
(string) $response->getBody()
2275+
$request,
2276+
$response
22822277
);
22832278
}
22842279

@@ -2576,9 +2571,8 @@ public function uploadImageFullFormDataWithHttpInfo($pet_id, $name, $photo_urls,
25762571
$statusCode,
25772572
(string) $request->getUri()
25782573
),
2579-
$statusCode,
2580-
$response->getHeaders(),
2581-
(string) $response->getBody()
2574+
$request,
2575+
$response
25822576
);
25832577
}
25842578

@@ -2893,9 +2887,8 @@ public function uploadImageFullFormDataNestedWithHttpInfo($pet_id, $pet = null)
28932887
$statusCode,
28942888
(string) $request->getUri()
28952889
),
2896-
$statusCode,
2897-
$response->getHeaders(),
2898-
(string) $response->getBody()
2890+
$request,
2891+
$response
28992892
);
29002893
}
29012894

@@ -3174,9 +3167,9 @@ private function handleResponseWithDataType(
31743167
'Error JSON decoding server response (%s)',
31753168
$request->getUri()
31763169
),
3177-
$response->getStatusCode(),
3178-
$response->getHeaders(),
3179-
$content
3170+
request,
3171+
$response,
3172+
$exception
31803173
);
31813174
}
31823175
}

0 commit comments

Comments
 (0)