Skip to content

Commit b7b8b52

Browse files
arnestedarnested
committed
Use HTTP headers from ApiException in PHP client.
The `$httpHeader` variable was not set when catching exceptions. See also #1354. Regenerated php-petstore sample.
1 parent 733e19c commit b7b8b52

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

‎modules/swagger-codegen/src/main/resources/php/api.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ use \{{invokerPackage}}\ObjectSerializer;
173173
} catch (ApiException $e) {
174174
switch ($e->getCode()) { {{#responses}}{{#dataType}}
175175
case {{code}}:
176-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '{{dataType}}', $httpHeader);
176+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '{{dataType}}', $e->getResponseHeaders());
177177
$e->setResponseObject($data);
178178
break;{{/dataType}}{{/responses}}
179179
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public function findPetsByStatus($status=null)
276276
} catch (ApiException $e) {
277277
switch ($e->getCode()) {
278278
case 200:
279-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $httpHeader);
279+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $e->getResponseHeaders());
280280
$e->setResponseObject($data);
281281
break;
282282
}
@@ -349,7 +349,7 @@ public function findPetsByTags($tags=null)
349349
} catch (ApiException $e) {
350350
switch ($e->getCode()) {
351351
case 200:
352-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $httpHeader);
352+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $e->getResponseHeaders());
353353
$e->setResponseObject($data);
354354
break;
355355
}
@@ -416,16 +416,16 @@ public function getPetById($pet_id)
416416
$httpBody = $formParams; // for HTTP post (form)
417417
}
418418

419+
420+
//TODO support oauth
421+
419422
$apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
420423
if (isset($apiKey)) {
421424
$headerParams['api_key'] = $apiKey;
422425
}
423426

424427

425428

426-
427-
//TODO support oauth
428-
429429
// make the API Call
430430
try
431431
{
@@ -437,7 +437,7 @@ public function getPetById($pet_id)
437437
} catch (ApiException $e) {
438438
switch ($e->getCode()) {
439439
case 200:
440-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet', $httpHeader);
440+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet', $e->getResponseHeaders());
441441
$e->setResponseObject($data);
442442
break;
443443
}

‎samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function getInventory()
148148
} catch (ApiException $e) {
149149
switch ($e->getCode()) {
150150
case 200:
151-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'map[string,int]', $httpHeader);
151+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'map[string,int]', $e->getResponseHeaders());
152152
$e->setResponseObject($data);
153153
break;
154154
}
@@ -219,7 +219,7 @@ public function placeOrder($body=null)
219219
} catch (ApiException $e) {
220220
switch ($e->getCode()) {
221221
case 200:
222-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $httpHeader);
222+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $e->getResponseHeaders());
223223
$e->setResponseObject($data);
224224
break;
225225
}
@@ -297,7 +297,7 @@ public function getOrderById($order_id)
297297
} catch (ApiException $e) {
298298
switch ($e->getCode()) {
299299
case 200:
300-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $httpHeader);
300+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $e->getResponseHeaders());
301301
$e->setResponseObject($data);
302302
break;
303303
}

‎samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ public function loginUser($username=null, $password=null)
332332
} catch (ApiException $e) {
333333
switch ($e->getCode()) {
334334
case 200:
335-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'string', $httpHeader);
335+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'string', $e->getResponseHeaders());
336336
$e->setResponseObject($data);
337337
break;
338338
}
@@ -466,7 +466,7 @@ public function getUserByName($username)
466466
} catch (ApiException $e) {
467467
switch ($e->getCode()) {
468468
case 200:
469-
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\User', $httpHeader);
469+
$data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\User', $e->getResponseHeaders());
470470
$e->setResponseObject($data);
471471
break;
472472
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function deserialize($data, $class, $httpHeader=null)
193193
$deserialized = $values;
194194
} elseif ($class === '\DateTime') {
195195
$deserialized = new \DateTime($data);
196-
} elseif (in_array($class, array('integer', 'int', 'void', 'number', 'object', 'double', 'float', 'byte', 'DateTime', 'string', 'mixed', 'boolean', 'bool'))) {
196+
} elseif (in_array($class, array('void', 'bool', 'string', 'double', 'byte', 'mixed', 'integer', 'float', 'int', 'DateTime', 'number', 'boolean', 'object'))) {
197197
settype($data, $class);
198198
$deserialized = $data;
199199
} elseif ($class === '\SplFileObject') {

0 commit comments

Comments
 (0)