Change exception throwing in BodyParamsMiddleware

Author: devanych

src/Middleware/BodyParamsMiddleware.php

@@ -4,26 +4,31 @@
 
 namespace HttpSoft\Basis\Middleware;
 
-use JsonException;
+use HttpSoft\Basis\Exception\BadRequestHttpException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 use function json_decode;
+use function json_last_error;
+use function json_last_error_msg;
 use function in_array;
 use function parse_str;
 use function preg_match;
+use function sprintf;
+
+use const JSON_ERROR_NONE;
 
 final class BodyParamsMiddleware implements MiddlewareInterface
 {
     /**
      * {@inheritDoc}
      *
-     * @throws JsonException
+     * @throws BadRequestHttpException
      * @link https://tools.ietf.org/html/rfc7231
-     * @psalm-suppress MixedAssignment
      * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
@@ -34,7 +39,14 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $contentType = $request->getHeaderLine('content-type');
 
         if (preg_match('#^application/(|[\S]+\+)json($|[ ;])#', $contentType)) {
-            $parsedBody = json_decode((string) $request->getBody(), true, 512, JSON_THROW_ON_ERROR);
+            $parsedBody = json_decode((string) $request->getBody(), true);
+
+            if (JSON_ERROR_NONE !== json_last_error()) {
+                throw new BadRequestHttpException(sprintf(
+                    'Error when parsing JSON request body: %s',
+                    json_last_error_msg()
+                ));
+            }
         } elseif (preg_match('#^application/x-www-form-urlencoded($|[ ;])#', $contentType)) {
             parse_str((string) $request->getBody(), $parsedBody);
         }

tests/Middleware/BodyParamsMiddlewareTest.php

@@ -4,10 +4,10 @@
 
 namespace HttpSoft\Tests\Basis\Middleware;
 
+use HttpSoft\Basis\Exception\BadRequestHttpException;
 use HttpSoft\Basis\Middleware\BodyParamsMiddleware;
 use HttpSoft\Message\Response;
 use HttpSoft\Message\ServerRequest;
-use JsonException;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -101,7 +101,7 @@ public function matchDataProvider(): array
      * @param string $contentType
      * @param string $requestBody
      * @param string $expectedBody
-     * @throws JsonException
+     * @throws BadRequestHttpException
      */
     public function testProcessWithMatchData(string $contentType, string $requestBody, string $expectedBody)
     {
@@ -156,7 +156,7 @@ public function mismatchDataProvider(): array
      * @dataProvider mismatchDataProvider
      * @param string $contentType
      * @param string $requestBody
-     * @throws JsonException
+     * @throws BadRequestHttpException
      */
     public function testProcessWithMismatchData(string $contentType, string $requestBody)
     {
@@ -166,11 +166,11 @@ public function testProcessWithMismatchData(string $contentType, string $request
         $this->assertSame('', (string) $response->getBody());
     }
 
-    public function testProcessThrowJsonExceptionForInvalidJsonBody(): void
+    public function testProcessThrowBadRequestHttpExceptionForInvalidJsonBody(): void
     {
         $request = $this->createServerRequest('POST', 'application/json');
         $request->getBody()->write('{"name"}/value');
-        $this->expectException(JsonException::class);
+        $this->expectException(BadRequestHttpException::class);
         $this->middleware->process($request, $this->createRequestHandler());
     }