Replace MiddlewareInterface implementation by ServerRequestHandlerInterface

It makes no sense implementing the middleware inteface as the Endpoint
is not a middleware but a request handler.

Author: usox

README.md

@@ -50,7 +50,7 @@ $endpoint->serve(
 
 #### Optional: PSR15 Middleware
 
-The endpoint class implements the [PSR15](https://www.php-fig.org/psr/psr-15/) `MiddlewareInterface`.
+The endpoint class implements the [PSR15](https://www.php-fig.org/psr/psr-15/) `RequestHandlerInterface`.
 
 ### MethodProvider
 

composer.json

@@ -16,7 +16,7 @@
     "php-http/discovery": "^1.13",
     "psr/http-factory": "^1.0",
     "psr/http-message": "^1.0",
-    "psr/http-server-middleware": "^1.0",
+    "psr/http-server-handler": "^1.0",
     "psr/log": "^1.1||^3",
     "ramsey/uuid": "^4.1",
     "shrikeh/teapot": "^2.3"

composer.lock

@@ -7,25 +7,25 @@
 use Http\Discovery\Psr17FactoryDiscovery;
 use Opis\JsonSchema\Errors\ErrorFormatter;
 use Opis\JsonSchema\Validator;
+use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Ramsey\Uuid\UuidFactory;
 use Ramsey\Uuid\UuidFactoryInterface;
 use Ramsey\Uuid\UuidInterface;
 use Teapot\StatusCode;
 use Throwable;
 use Usox\JsonSchemaApi\Contract\MethodProviderInterface;
-use Usox\JsonSchemaApi\Exception\ApiException;
-use Usox\JsonSchemaApi\Exception\InternalException;
 use Usox\JsonSchemaApi\Dispatch\MethodDispatcher;
 use Usox\JsonSchemaApi\Dispatch\MethodDispatcherInterface;
 use Usox\JsonSchemaApi\Dispatch\MethodValidator;
 use Usox\JsonSchemaApi\Dispatch\RequestValidator;
 use Usox\JsonSchemaApi\Dispatch\RequestValidatorInterface;
 use Usox\JsonSchemaApi\Dispatch\SchemaLoader;
+use Usox\JsonSchemaApi\Exception\ApiException;
+use Usox\JsonSchemaApi\Exception\InternalException;
 use Usox\JsonSchemaApi\Response\ResponseBuilder;
 use Usox\JsonSchemaApi\Response\ResponseBuilderInterface;
 
@@ -41,16 +41,16 @@ public function __construct(
         private ResponseBuilderInterface $responseBuilder,
         private UuidFactoryInterface $uuidFactory,
         private StreamFactoryInterface $streamFactory,
+        private ResponseFactoryInterface $responseFactory,
         private ?LoggerInterface $logger = null
     ) {
     }
 
     /**
-     * Try to execute the api handler and build the response
+     * Execute the api handler and build the response
      */
     public function serve(
         ServerRequestInterface $request,
-        ResponseInterface $response
     ): ResponseInterface {
         $statusCode = StatusCode::OK;
         $responseData = null;
@@ -89,6 +89,8 @@ public function serve(
             $statusCode = StatusCode::INTERNAL_SERVER_ERROR;
         }
 
+        $response = $this->responseFactory->createResponse($statusCode);
+
         if ($responseData !== null) {
             $response = $response->withBody(
                 $this->streamFactory->createStream(
@@ -99,7 +101,7 @@ public function serve(
 
         return $response
             ->withHeader('Content-Type', 'application/json')
-            ->withStatus($statusCode);
+            ;
     }
 
     /**
@@ -123,12 +125,13 @@ private function logError(
 
     /**
      * Builds the endpoint.
-     * The StreamFactory may be omitted, the endpoint will try to autodetect
-     * an existing PSR17 implementations
+     *
+     * The factories may be omitted, the endpoint will try to autodetect existing PSR17 implementations
      */
     public static function factory(
         MethodProviderInterface $methodProvider,
         ?StreamFactoryInterface $streamFactory = null,
+        ?ResponseFactoryInterface $responseFactory = null,
         ?LoggerInterface $logger = null
     ): EndpointInterface {
         $schemaValidator = new Validator();
@@ -137,6 +140,9 @@ public static function factory(
         if ($streamFactory === null) {
             $streamFactory = Psr17FactoryDiscovery::findStreamFactory();
         }
+        if ($responseFactory === null) {
+            $responseFactory = Psr17FactoryDiscovery::findResponseFactory();
+        }
 
         return new self(
             new RequestValidator(
@@ -155,17 +161,16 @@ public static function factory(
             new ResponseBuilder(),
             new UuidFactory(),
             $streamFactory,
+            $responseFactory,
             $logger
         );
     }
 
-    public function process(
+    public function handle(
         ServerRequestInterface $request,
-        RequestHandlerInterface $handler
     ): ResponseInterface {
         return $this->serve(
             $request,
-            $handler->handle($request)
         );
     }
 }

src/Endpoint.php

@@ -4,13 +4,12 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 interface EndpointInterface extends
-    MiddlewareInterface
+   RequestHandlerInterface
 {
     public function serve(
         ServerRequestInterface $request,
-        ResponseInterface $response
     ): ResponseInterface;
 }