Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-06 23:33:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored exceptions to properly use package exceptions

Browse Source
This commit is contained in:
Alejandro Celaya
2017-12-30 21:35:26 +01:00
parent 745ff51150
commit ede4525332
18 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
module/Rest/src/Middleware/BodyParserMiddleware.php
View File

@@ -8,7 +8,7 @@ use Interop\Http\ServerMiddleware\DelegateInterface;
use Interop\Http\ServerMiddleware\MiddlewareInterface;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Shlinkio\Shlink\Common\Exception\RuntimeException;
use Shlinkio\Shlink\Rest\Exception\RuntimeException;
class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterface
{
@@ -27,7 +27,7 @@ class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterfac
$currentParams = $request->getParsedBody();
// In requests that do not allow body or if the body has already been parsed, continue to next middleware
if (! empty($currentParams) || in_array($method, [
if (! empty($currentParams) || \in_array($method, [
self::METHOD_GET,
self::METHOD_HEAD,
self::METHOD_OPTIONS,
@@ -37,7 +37,7 @@ class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterfac
// If the accepted content is JSON, try to parse the body from JSON
$contentType = $this->getRequestContentType($request);
if (in_array($contentType, ['application/json', 'text/json', 'application/x-json'], true)) {
if (\in_array($contentType, ['application/json', 'text/json', 'application/x-json'], true)) {
return $delegate->process($this->parseFromJson($request));
}
@@ -48,27 +48,28 @@ class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterfac
* @param Request $request
* @return string
*/
protected function getRequestContentType(Request $request)
private function getRequestContentType(Request $request): string
{
$contentType = $request->getHeaderLine('Content-type');
$contentTypes = explode(';', $contentType);
return trim(array_shift($contentTypes));
$contentTypes = \explode(';', $contentType);
return \trim(\array_shift($contentTypes));
}
/**
* @param Request $request
* @return Request
* @throws RuntimeException
*/
protected function parseFromJson(Request $request)
private function parseFromJson(Request $request): Request
{
$rawBody = (string) $request->getBody();
if (empty($rawBody)) {
return $request;
}
$parsedJson = json_decode($rawBody, true);
if (json_last_error() !== JSON_ERROR_NONE) {
throw new RuntimeException(sprintf('Error when parsing JSON request body: %s', json_last_error_msg()));
$parsedJson = \json_decode($rawBody, true);
if (\json_last_error() !== JSON_ERROR_NONE) {
throw new RuntimeException(\sprintf('Error when parsing JSON request body: %s', \json_last_error_msg()));
}
return $request->withParsedBody($parsedJson);
@@ -78,7 +79,7 @@ class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterfac
* @param Request $request
* @return Request
*/
protected function parseFromUrlEncoded(Request $request)
private function parseFromUrlEncoded(Request $request): Request
{
$rawBody = (string) $request->getBody();
if (empty($rawBody)) {