Merge pull request #124 from sunrise-php/release/v3.1.0

- Improved payload decoding;
- Improved OpenAPI document generation;
- Improved localization capabilities.

Author: fenric

src/Middleware/PayloadDecodingMiddleware.php

@@ -13,7 +13,6 @@
 
 namespace Sunrise\Http\Router\Middleware;
 
-use LogicException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -26,7 +25,6 @@
 use Sunrise\Http\Router\StringableMediaType;
 
 use function array_map;
-use function sprintf;
 
 /**
  * @since 3.0.0
@@ -48,11 +46,10 @@ public function __construct(
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $serverRequest = ServerRequest::create($request);
-        $route = $serverRequest->getRoute();
-        $serverConsumedMediaTypes = $route->getConsumedMediaTypes();
 
-        // The server expects nothing from the client, just keep going...
+        $serverConsumedMediaTypes = $serverRequest->getRoute()->getConsumedMediaTypes();
         if ($serverConsumedMediaTypes === []) {
+            // The server expects nothing from the client, just keep going...
             return $handler->handle($request);
         }
 
@@ -70,11 +67,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         }
 
         if (!$this->codecManager->supportsMediaType($clientProducedMediaType)) {
-            throw new LogicException(sprintf(
-                'The route "%s" expects the media type "%s" that is not supported by the codec manager.',
-                $route->getName(),
-                $clientProducedMediaType->getIdentifier(),
-            ));
+            return $handler->handle($request);
         }
 
         try {

tests/Middleware/PayloadDecodingMiddlewareTest.php

@@ -4,7 +4,6 @@
 
 namespace Sunrise\Http\Router\Tests\Middleware;
 
-use LogicException;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
@@ -144,15 +143,11 @@ public function testUnsupportedMediaTypeByCodecManager(): void
         $this->mockedRoute->expects(self::exactly(2))->method('getConsumedMediaTypes')->willReturn([$this->mockMediaType('application/json')]);
         $this->mockedRequest->expects(self::once())->method('getHeaderLine')->with('Content-Type')->willReturn('application/json');
         $this->mockedCodecManager->expects(self::once())->method('supportsMediaType')->withAnyParameters()->willReturn(false);
-        $this->mockedRoute->expects(self::once())->method('getName')->willReturn('foo');
         $this->mockedRequestBody->expects(self::never())->method('__toString');
         $this->mockedCodecManager->expects(self::never())->method('decode');
         $this->mockedRequest->expects(self::never())->method('withParsedBody');
-        $this->mockedRequestHandler->expects(self::never())->method('handle');
-        $middleware = new PayloadDecodingMiddleware($this->mockedCodecManager);
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The route "foo" expects the media type "application/json" that is not supported by the codec manager.');
-        $middleware->process($this->mockedRequest, $this->mockedRequestHandler);
+        $this->mockedRequestHandler->expects(self::once())->method('handle')->with($this->mockedRequest)->willReturn($this->mockedResponse);
+        self::assertSame($this->mockedResponse, (new PayloadDecodingMiddleware($this->mockedCodecManager))->process($this->mockedRequest, $this->mockedRequestHandler));
     }
 
     public function testInvalidBody(): void