Skip to content

[PHP][Silex] use original path name for path variable naming #4817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Mar 3, 2017
Merged

[PHP][Silex] use original path name for path variable naming #4817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26a6264
use original path name in php silex
wing328 Feb 17, 2017
e9d1716
fix path variable naming by camelizing the name
wing328 Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.swagger.codegen.CodegenConfig;
import io.swagger.codegen.CodegenConstants;
import io.swagger.codegen.CodegenType;
import io.swagger.codegen.CodegenOperation;
import io.swagger.codegen.DefaultCodegen;
import io.swagger.codegen.SupportingFile;
import io.swagger.models.properties.ArrayProperty;
Expand All @@ -13,6 +14,10 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;

import org.apache.commons.lang3.StringUtils;

public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig {
protected String invokerPackage;
Expand Down Expand Up @@ -213,4 +218,28 @@ public String escapeQuotationMark(String input) {
public String escapeUnsafeCharacters(String input) {
return input.replace("*/", "*_/").replace("/*", "/_*");
}

@Override
public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
for (CodegenOperation op : operationList) {
String path = new String(op.path);
String[] items = path.split("/", -1);
String opsPath = "";
int pathParamIndex = 0;

for (int i = 0; i < items.length; ++i) {
if (items[i].matches("^\\{(.*)\\}$")) { // wrap in {}
// camelize path variable
items[i] = "{" + camelize(items[i].substring(1, items[i].length()-1), true) + "}";
}
}

op.path = StringUtils.join(items, "/");
}

return objs;
}

}
24 changes: 14 additions & 10 deletions modules/swagger-codegen/src/main/resources/silex/index.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,23 @@ use Silex\Application;
$app = new Silex\Application();

{{#apiInfo}}
{{#apis}}
{{#operations}}
{{#operation}}
{{#apis}}
{{#operations}}
{{#operation}}

$app->{{httpMethod}}('{{basePathWithoutHost}}{{path}}', function(Application $app, Request $request{{#pathParams}}, ${{paramName}}{{/pathParams}}) {
{{#queryParams}}${{paramName}} = $request->get('{{paramName}}');{{newline}} {{/queryParams}}
{{#formParams}}${{paramName}} = $request->get('{{paramName}}');{{newline}} {{/formParams}}
return new Response('How about implementing {{nickname}} as a {{httpMethod}} method ?');
$app->{{httpMethod}}('{{basePathWithoutHost}}{{path}}', function(Application $app, Request $request{{#pathParams}}, ${{baseName}}{{/pathParams}}) {
{{#queryParams}}
${{paramName}} = $request->get('{{paramName}}');
{{/queryParams}}
{{#formParams}}
${{paramName}} = $request->get('{{paramName}}');
{{/formParams}}
return new Response('How about implementing {{operationId}} as a {{httpMethod}} method ?');
});

{{/operation}}
{{/operations}}
{{/apis}}
{{/operation}}
{{/operations}}
{{/apis}}
{{/apiInfo}}

$app->run();
60 changes: 14 additions & 46 deletions samples/server/petstore/silex/SwaggerServer/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,141 +9,109 @@


$app->POST('/v2/pet', function(Application $app, Request $request) {


return new Response('How about implementing addPet as a POST method ?');
});


$app->DELETE('/v2/pet/{petId}', function(Application $app, Request $request, $pet_id) {


$app->DELETE('/v2/pet/{petId}', function(Application $app, Request $request, $petId) {
return new Response('How about implementing deletePet as a DELETE method ?');
});


$app->GET('/v2/pet/findByStatus', function(Application $app, Request $request) {
$status = $request->get('status');

$status = $request->get('status');
return new Response('How about implementing findPetsByStatus as a GET method ?');
});


$app->GET('/v2/pet/findByTags', function(Application $app, Request $request) {
$tags = $request->get('tags');

$tags = $request->get('tags');
return new Response('How about implementing findPetsByTags as a GET method ?');
});


$app->GET('/v2/pet/{petId}', function(Application $app, Request $request, $pet_id) {


$app->GET('/v2/pet/{petId}', function(Application $app, Request $request, $petId) {
return new Response('How about implementing getPetById as a GET method ?');
});


$app->PUT('/v2/pet', function(Application $app, Request $request) {


return new Response('How about implementing updatePet as a PUT method ?');
});


$app->POST('/v2/pet/{petId}', function(Application $app, Request $request, $pet_id) {

$name = $request->get('name'); $status = $request->get('status');
$app->POST('/v2/pet/{petId}', function(Application $app, Request $request, $petId) {
$name = $request->get('name');
$status = $request->get('status');
return new Response('How about implementing updatePetWithForm as a POST method ?');
});


$app->POST('/v2/pet/{petId}/uploadImage', function(Application $app, Request $request, $pet_id) {

$additional_metadata = $request->get('additional_metadata'); $file = $request->get('file');
$app->POST('/v2/pet/{petId}/uploadImage', function(Application $app, Request $request, $petId) {
$additional_metadata = $request->get('additional_metadata');
$file = $request->get('file');
return new Response('How about implementing uploadFile as a POST method ?');
});


$app->DELETE('/v2/store/order/{orderId}', function(Application $app, Request $request, $order_id) {


$app->DELETE('/v2/store/order/{orderId}', function(Application $app, Request $request, $orderId) {
return new Response('How about implementing deleteOrder as a DELETE method ?');
});


$app->GET('/v2/store/inventory', function(Application $app, Request $request) {


return new Response('How about implementing getInventory as a GET method ?');
});


$app->GET('/v2/store/order/{orderId}', function(Application $app, Request $request, $order_id) {


$app->GET('/v2/store/order/{orderId}', function(Application $app, Request $request, $orderId) {
return new Response('How about implementing getOrderById as a GET method ?');
});


$app->POST('/v2/store/order', function(Application $app, Request $request) {


return new Response('How about implementing placeOrder as a POST method ?');
});


$app->POST('/v2/user', function(Application $app, Request $request) {


return new Response('How about implementing createUser as a POST method ?');
});


$app->POST('/v2/user/createWithArray', function(Application $app, Request $request) {


return new Response('How about implementing createUsersWithArrayInput as a POST method ?');
});


$app->POST('/v2/user/createWithList', function(Application $app, Request $request) {


return new Response('How about implementing createUsersWithListInput as a POST method ?');
});


$app->DELETE('/v2/user/{username}', function(Application $app, Request $request, $username) {


return new Response('How about implementing deleteUser as a DELETE method ?');
});


$app->GET('/v2/user/{username}', function(Application $app, Request $request, $username) {


return new Response('How about implementing getUserByName as a GET method ?');
});


$app->GET('/v2/user/login', function(Application $app, Request $request) {
$username = $request->get('username'); $password = $request->get('password');

$username = $request->get('username');
$password = $request->get('password');
return new Response('How about implementing loginUser as a GET method ?');
});


$app->GET('/v2/user/logout', function(Application $app, Request $request) {


return new Response('How about implementing logoutUser as a GET method ?');
});


$app->PUT('/v2/user/{username}', function(Application $app, Request $request, $username) {


return new Response('How about implementing updateUser as a PUT method ?');
});

Expand Down