Skip to content

[php-symfony] Fix problem with clients, that put charset in content type header. #6078

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
ybelenko merged 5 commits into from
Apr 30, 2020
Merged

[php-symfony] Fix problem with clients, that put charset in content type header. #6078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fddfbbc
Fix problem with clients, that put charset in content type header.
reznikartem Apr 27, 2020
58c4d25
Fix code style, add $consumes length check.
reznikartem Apr 28, 2020
fa582b3
Add isContentTypeAllowed static method and tests
ybelenko Apr 29, 2020
11a192c
Fix old tests
ybelenko Apr 29, 2020
f171621
Refresh samples
ybelenko Apr 29, 2020
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class {{controllerName}} extends Controller
{{#bodyParams}}
// Make sure that the client is providing something that we can consume
$consumes = [{{#consumes}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function addPetAction(Request $request)
{
// Make sure that the client is providing something that we can consume
$consumes = ['application/json', 'application/xml'];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down Expand Up @@ -491,7 +491,7 @@ public function updatePetAction(Request $request)
{
// Make sure that the client is providing something that we can consume
$consumes = ['application/json', 'application/xml'];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ public function placeOrderAction(Request $request)
{
// Make sure that the client is providing something that we can consume
$consumes = [];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down
8 changes: 4 additions & 4 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function createUserAction(Request $request)
{
// Make sure that the client is providing something that we can consume
$consumes = [];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down Expand Up @@ -138,7 +138,7 @@ public function createUsersWithArrayInputAction(Request $request)
{
// Make sure that the client is providing something that we can consume
$consumes = [];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down Expand Up @@ -217,7 +217,7 @@ public function createUsersWithListInputAction(Request $request)
{
// Make sure that the client is providing something that we can consume
$consumes = [];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down Expand Up @@ -592,7 +592,7 @@ public function updateUserAction(Request $request, $username)
{
// Make sure that the client is providing something that we can consume
$consumes = [];
$inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0];
$inputFormat = $request->headers->has('Content-Type')?explode(";",$request->headers->get('Content-Type'))[0]:$consumes[0];
if (!in_array($inputFormat, $consumes)) {
// We can't consume the content that the client is sending us
return new Response('', 415);
Expand Down