loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

better reserved word handling for php

Browse Source
This commit is contained in:
wing328 2016-02-25 13:16:54 +08:00
parent 6bbd691913
commit 4e034d3dc5
7 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
View File

@ -395,7 +395,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
// method name cannot use reserved keyword, e.g. return
if (reservedWords.contains(operationId)) {
throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
operationId = "call_" + operationId;
}
return camelize(sanitizeName(operationId), true);

2
modules/swagger-codegen/src/test/resources/2_0/petstore.json
View File

@ -263,7 +263,7 @@
],
"parameters": [
{
"name": "package",
"name": "petId",
"in": "path",
"description": "ID of pet that needs to be fetched",
"required": true,

12
samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
View File

@ -879,7 +879,7 @@ class PetApi
}
/**
* getPetByIdWithByteArray
* petPetIdtestingByteArraytrueGet
*
* Fake endpoint to test byte array return by 'Find pet by ID'
*
@ -887,15 +887,15 @@ class PetApi
* @return ByteArray
* @throws \Swagger\Client\ApiException on non-2xx response
*/
public function getPetByIdWithByteArray($pet_id)
public function petPetIdtestingByteArraytrueGet($pet_id)
{
list($response, $statusCode, $httpHeader) = $this->getPetByIdWithByteArrayWithHttpInfo ($pet_id);
list($response, $statusCode, $httpHeader) = $this->petPetIdtestingByteArraytrueGetWithHttpInfo ($pet_id);
return $response;
}
/**
* getPetByIdWithByteArrayWithHttpInfo
* petPetIdtestingByteArraytrueGetWithHttpInfo
*
* Fake endpoint to test byte array return by 'Find pet by ID'
*
@ -903,12 +903,12 @@ class PetApi
* @return Array of ByteArray, HTTP status code, HTTP response headers (array of strings)
* @throws \Swagger\Client\ApiException on non-2xx response
*/
public function getPetByIdWithByteArrayWithHttpInfo($pet_id)
public function petPetIdtestingByteArraytrueGetWithHttpInfo($pet_id)
{
// verify the required parameter 'pet_id' is set
if ($pet_id === null) {
throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetByIdWithByteArray');
throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling petPetIdtestingByteArraytrueGet');
}
// parse inputs

10
samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
View File

@ -180,7 +180,7 @@ class StoreApi
}
/**
* placeOrder
* callReturn
*
* Place an order for a pet
*
@ -188,15 +188,15 @@ class StoreApi
* @return \Swagger\Client\Model\Order
* @throws \Swagger\Client\ApiException on non-2xx response
*/
public function placeOrder($body = null)
public function callReturn($body = null)
{
list($response, $statusCode, $httpHeader) = $this->placeOrderWithHttpInfo ($body);
list($response, $statusCode, $httpHeader) = $this->callReturnWithHttpInfo ($body);
return $response;
}
/**
* placeOrderWithHttpInfo
* callReturnWithHttpInfo
*
* Place an order for a pet
*
@ -204,7 +204,7 @@ class StoreApi
* @return Array of \Swagger\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
* @throws \Swagger\Client\ApiException on non-2xx response
*/
public function placeOrderWithHttpInfo($body = null)
public function callReturnWithHttpInfo($body = null)
{

4
samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
View File

@ -146,12 +146,12 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
}
/**
* Test case for getPetByIdWithByteArray
* Test case for petPetIdtestingByteArraytrueGet
*
* Fake endpoint to test byte array return by 'Find pet by ID'
*
*/
public function test_getPetByIdWithByteArray() {
public function test_petPetIdtestingByteArraytrueGet() {
}

4
samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
View File

@ -76,12 +76,12 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
}
/**
* Test case for placeOrder
* Test case for callReturn
*
* Place an order for a pet
*
*/
public function test_placeOrder() {
public function test_callReturn() {
}

2
samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
View File

@ -329,7 +329,7 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
$pet_api = new Swagger\Client\Api\PetAPI($api_client);
// test getPetByIdWithByteArray
$pet_id = 10005;
$bytes = $pet_api->getPetByIdWithByteArray($pet_id);
$bytes = $pet_api->petPetIdtestingByteArraytrueGet($pet_id);
$json = json_decode(call_user_func_array('pack', array_merge(array('C*'), $bytes )), true);
$this->assertInternalType("array", $bytes);