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

[PHP] Preserve JSON accept header (#4684)

Browse Source 
* [PHP] Preserve JSON accept header

* recompile php client

* revise

* recompile
This commit is contained in:
Roland Franssen 2019-12-13 10:14:18 +01:00 committed by William Cheng
parent 3754679751
commit 0ffb99a48e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache vendored
View File

@ -72,8 +72,8 @@ class HeaderSelector
{ {
if (count($accept) === 0 || (count($accept) === 1 && $accept[0] === '')) { if (count($accept) === 0 || (count($accept) === 1 && $accept[0] === '')) {
return null; return null;
} elseif (preg_grep("/application\/json/i", $accept)) { } elseif ($jsonAccept = preg_grep('~(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$~', $accept)) {
return 'application/json'; return implode(',', $jsonAccept);
} else { } else {
return implode(',', $accept); return implode(',', $accept);
} }

4
samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
View File

@ -82,8 +82,8 @@ class HeaderSelector
{ {
if (count($accept) === 0 || (count($accept) === 1 && $accept[0] === '')) { if (count($accept) === 0 || (count($accept) === 1 && $accept[0] === '')) {
return null; return null;
} elseif (preg_grep("/application\/json/i", $accept)) { } elseif ($jsonAccept = preg_grep('~(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$~', $accept)) {
return 'application/json'; return implode(',', $jsonAccept);
} else { } else {
return implode(',', $accept); return implode(',', $accept);
} }

4
samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
View File

@ -82,8 +82,8 @@ class HeaderSelector
{ {
if (count($accept) === 0 || (count($accept) === 1 && $accept[0] === '')) { if (count($accept) === 0 || (count($accept) === 1 && $accept[0] === '')) {
return null; return null;
} elseif (preg_grep("/application\/json/i", $accept)) { } elseif ($jsonAccept = preg_grep('~(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$~', $accept)) {
return 'application/json'; return implode(',', $jsonAccept);
} else { } else {
return implode(',', $accept); return implode(',', $accept);
} }