mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-20 09:19:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Updated CreateShortCodeContentNegotiationMiddleware so that query parameter takes precedence over Accept header

Browse source
This commit is contained in:
Alejandro Celaya 2018-05-07 11:17:10 +02:00
parent 7c6da4985d
commit b0dbb2dae4
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
module/Rest/src/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddleware.php
View file

@ -30,9 +30,10 @@ class CreateShortCodeContentNegotiationMiddleware implements MiddlewareInterface
return $response; return $response;
} }
$acceptedType = $request->hasHeader('Accept') $query = $request->getQueryParams();
? $this->determineAcceptTypeFromHeader($request->getHeaderLine('Accept')) $acceptedType = isset($query['format'])
: $this->determineAcceptTypeFromQuery($request->getQueryParams()); ? $this->determineAcceptTypeFromQuery($query)
: $this->determineAcceptTypeFromHeader($request->getHeaderLine('Accept'));
// If JSON was requested, return the response from next handler as is // If JSON was requested, return the response from next handler as is
if ($acceptedType === self::JSON) { if ($acceptedType === self::JSON) {

1
module/Rest/test/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddlewareTest.php
View file

@ -74,6 +74,7 @@ class CreateShortCodeContentNegotiationMiddlewareTest extends TestCase
['application/json', [], 'application/json'], ['application/json', [], 'application/json'],
['application/xml', [], 'application/json'], ['application/xml', [], 'application/json'],
['text/plain', [], 'text/plain'], ['text/plain', [], 'text/plain'],
['application/json', ['format' => 'txt'], 'text/plain'],
]; ];
} }