wip

api.php

@@ -247,6 +247,22 @@ interface UriInterface
     public function __toString();
 }
 
+// file: src/Psr/Http/Server/MiddlewareInterface.php
+
+interface MiddlewareInterface
+{
+    
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface;
+}
+
+// file: src/Psr/Http/Server/RequestHandlerInterface.php
+
+interface RequestHandlerInterface
+{
+    
+    public function handle(ServerRequestInterface $request): ResponseInterface;
+}
+
 // file: src/Nyholm/Psr7/Factory/Psr17Factory.php
 
 final class Psr17Factory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
@@ -4419,16 +4435,9 @@ class TypeConverter
     }
 }
 
-// file: src/Tqdev/PhpCrudApi/Middleware/Base/Handler.php
-
-interface Handler
-{
-    public function handle(ServerRequestInterface $request): ResponseInterface;
-}
-
 // file: src/Tqdev/PhpCrudApi/Middleware/Base/Middleware.php
 
-abstract class Middleware implements Handler
+abstract class Middleware implements MiddlewareInterface
 {
     protected $next;
     protected $responder;
@@ -4441,11 +4450,6 @@ abstract class Middleware implements Handler
         $this->properties = $properties;
     }
 
-    public function setNext(Handler $handler) /*: void*/
-    {
-        $this->next = $handler;
-    }
-
     protected function getArrayProperty(string $key, string $default): array
     {
         return array_filter(array_map('trim', explode(',', $this->getProperty($key, $default))));
@@ -4479,7 +4483,7 @@ class VariableStore
 
 // file: src/Tqdev/PhpCrudApi/Middleware/Router/Router.php
 
-interface Router extends Handler
+interface Router extends RequestHandlerInterface
 {
     public function register(string $method, string $path, array $handler);
 
@@ -4538,13 +4542,7 @@ class SimpleRouter implements Router
 
     public function load(Middleware $middleware) /*: void*/
     {
-        if (count($this->middlewares) > 0) {
-            $next = $this->middlewares[0];
-        } else {
-            $next = $this;
-        }
-        $middleware->setNext($next);
-        array_unshift($this->middlewares, $middleware);
+        array_push($this->middlewares, $middleware);
     }
 
     public function route(ServerRequestInterface $request): ResponseInterface
@@ -4553,11 +4551,7 @@ class SimpleRouter implements Router
             $data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));
             $this->cache->set('PathTree', $data, $this->ttl);
         }
-        $obj = $this;
-        if (count($this->middlewares) > 0) {
-            $obj = $this->middlewares[0];
-        }
-        return $obj->handle($request);
+        return $this->handle($request);
     }
 
     private function getRouteNumbers(ServerRequestInterface $request): array
@@ -4570,6 +4564,11 @@ class SimpleRouter implements Router
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
+        if (count($this->middlewares)) {
+            $handler = array_pop($this->middlewares);
+            return $handler->process($request, $this);
+        }
+
         $routeNumbers = $this->getRouteNumbers($request);
         if (count($routeNumbers) == 0) {
             return $this->responder->error(ErrorCode::ROUTE_NOT_FOUND, $request->getRequestTarget());
@@ -4599,7 +4598,7 @@ class SimpleRouter implements Router
 
 class AjaxOnlyMiddleware extends Middleware
 {
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $method = $request->getMethod();
         $excludeMethods = $this->getArrayProperty('excludeMethods', 'OPTIONS,GET');
@@ -4610,7 +4609,7 @@ class AjaxOnlyMiddleware extends Middleware
                 return $this->responder->error(ErrorCode::ONLY_AJAX_REQUESTS_ALLOWED, $method);
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -4673,7 +4672,7 @@ class AuthorizationMiddleware extends Middleware
         }
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $path = RequestUtils::getPathSegment($request, 1);
         $operation = RequestUtils::getOperation($request);
@@ -4688,7 +4687,7 @@ class AuthorizationMiddleware extends Middleware
             VariableStore::set('authorization.tableHandler', $this->getProperty('tableHandler', ''));
             VariableStore::set('authorization.columnHandler', $this->getProperty('columnHandler', ''));
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -4761,7 +4760,7 @@ class BasicAuthMiddleware extends Middleware
         return base64_decode(strtr($parts[1], '-_', '+/'));
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         if (session_status() == PHP_SESSION_NONE) {
             session_start();
@@ -4791,7 +4790,7 @@ class BasicAuthMiddleware extends Middleware
                 return $response;
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -4813,7 +4812,7 @@ class CorsMiddleware extends Middleware
         return $found;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $method = $request->getMethod();
         $origin = count($request->getHeader('Origin')) ? $request->getHeader('Origin')[0] : '';
@@ -4843,7 +4842,7 @@ class CorsMiddleware extends Middleware
                 $response = $response->withHeader('Access-Control-Expose-Headers', $exposeHeaders);
             }
         } else {
-            $response = $this->next->handle($request);
+            $response = $next->handle($request);
         }
         if ($origin) {
             $allowCredentials = $this->getProperty('allowCredentials', 'true');
@@ -4868,7 +4867,7 @@ class CustomizationMiddleware extends Middleware
         $this->reflection = $reflection;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         $tableName = RequestUtils::getPathSegment($request, 2);
@@ -4878,7 +4877,7 @@ class CustomizationMiddleware extends Middleware
             $result = call_user_func($beforeHandler, $operation, $tableName, $request, $environment);
             $request = $result ?: $request;
         }
-        $response = $this->next->handle($request);
+        $response = $next->handle($request);
         $afterHandler = $this->getProperty('afterHandler', '');
         if ($afterHandler !== '') {
             $result = call_user_func($afterHandler, $operation, $tableName, $response, $environment);
@@ -4917,7 +4916,7 @@ class FirewallMiddleware extends Middleware
         return false;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $reverseProxy = $this->getProperty('reverseProxy', '');
         if ($reverseProxy) {
@@ -4931,7 +4930,7 @@ class FirewallMiddleware extends Middleware
         if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {
             $response = $this->responder->error(ErrorCode::TEMPORARY_OR_PERMANENTLY_BLOCKED, '');
         } else {
-            $response = $this->next->handle($request);
+            $response = $next->handle($request);
         }
         return $response;
     }
@@ -4967,7 +4966,7 @@ class IpAddressMiddleware extends Middleware
         return (object) $context;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if (in_array($operation, ['create', 'update', 'increment'])) {
@@ -4990,7 +4989,7 @@ class IpAddressMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -5006,7 +5005,7 @@ class JoinLimitsMiddleware extends Middleware
         $this->reflection = $reflection;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         $params = RequestUtils::getParams($request);
@@ -5035,7 +5034,7 @@ class JoinLimitsMiddleware extends Middleware
             $request = RequestUtils::setParams($request, $params);
             VariableStore::set("joinLimits.maxRecords", $maxRecords);
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -5154,7 +5153,7 @@ class JwtAuthMiddleware extends Middleware
         return $parts[1];
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         if (session_status() == PHP_SESSION_NONE) {
             session_start();
@@ -5176,7 +5175,7 @@ class JwtAuthMiddleware extends Middleware
                 return $this->responder->error(ErrorCode::AUTHENTICATION_REQUIRED, '');
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -5237,7 +5236,7 @@ class MultiTenancyMiddleware extends Middleware
         return $request->withParsedBody($multi ? $records : $records[0]);
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $handler = $this->getProperty('handler', '');
         if ($handler !== '') {
@@ -5260,7 +5259,7 @@ class MultiTenancyMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -5276,7 +5275,7 @@ class PageLimitsMiddleware extends Middleware
         $this->reflection = $reflection;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if ($operation == 'list') {
@@ -5300,7 +5299,7 @@ class PageLimitsMiddleware extends Middleware
             }
             $request = RequestUtils::setParams($request, $params);
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -5329,7 +5328,7 @@ class SanitationMiddleware extends Middleware
         return (object) $context;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if (in_array($operation, ['create', 'update', 'increment'])) {
@@ -5352,7 +5351,7 @@ class SanitationMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -5388,7 +5387,7 @@ class ValidationMiddleware extends Middleware
         return null;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if (in_array($operation, ['create', 'update', 'increment'])) {
@@ -5416,7 +5415,7 @@ class ValidationMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 
@@ -5439,7 +5438,7 @@ class XsrfMiddleware extends Middleware
         return $token;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $token = $this->getToken();
         $method = $request->getMethod();
@@ -5450,7 +5449,7 @@ class XsrfMiddleware extends Middleware
                 return $this->responder->error(ErrorCode::BAD_OR_MISSING_XSRF_TOKEN, '');
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }
 

src/Nyholm/Psr7/ServerRequest.php

@@ -1,13 +1,10 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace Nyholm\Psr7;
 
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\{ServerRequestInterface, StreamInterface, UploadedFileInterface, UriInterface};
 
 /**
  * @author Michael Dowling and contributors to guzzlehttp/psr7

src/Tqdev/PhpCrudApi/Middleware/AjaxOnlyMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
@@ -10,7 +11,7 @@ use Tqdev\PhpCrudApi\RequestUtils;
 
 class AjaxOnlyMiddleware extends Middleware
 {
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $method = $request->getMethod();
         $excludeMethods = $this->getArrayProperty('excludeMethods', 'OPTIONS,GET');
@@ -21,6 +22,6 @@ class AjaxOnlyMiddleware extends Middleware
                 return $this->responder->error(ErrorCode::ONLY_AJAX_REQUESTS_ALLOWED, $method);
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/AuthorizationMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
@@ -68,7 +69,7 @@ class AuthorizationMiddleware extends Middleware
         }
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $path = RequestUtils::getPathSegment($request, 1);
         $operation = RequestUtils::getOperation($request);
@@ -83,6 +84,6 @@ class AuthorizationMiddleware extends Middleware
             VariableStore::set('authorization.tableHandler', $this->getProperty('tableHandler', ''));
             VariableStore::set('authorization.columnHandler', $this->getProperty('columnHandler', ''));
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/Base/Handler.php

@@ -1,10 +0,0 @@
-<?php
-namespace Tqdev\PhpCrudApi\Middleware\Base;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-interface Handler
-{
-    public function handle(ServerRequestInterface $request): ResponseInterface;
-}

src/Tqdev/PhpCrudApi/Middleware/Base/Middleware.php

@@ -1,10 +1,11 @@
 <?php
 namespace Tqdev\PhpCrudApi\Middleware\Base;
 
+use Psr\Http\Server\MiddlewareInterface;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;
 
-abstract class Middleware implements Handler
+abstract class Middleware implements MiddlewareInterface
 {
     protected $next;
     protected $responder;
@@ -17,11 +18,6 @@ abstract class Middleware implements Handler
         $this->properties = $properties;
     }
 
-    public function setNext(Handler $handler) /*: void*/
-    {
-        $this->next = $handler;
-    }
-
     protected function getArrayProperty(string $key, string $default): array
     {
         return array_filter(array_map('trim', explode(',', $this->getProperty($key, $default))));

src/Tqdev/PhpCrudApi/Middleware/BasicAuthMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
@@ -75,7 +76,7 @@ class BasicAuthMiddleware extends Middleware
         return base64_decode(strtr($parts[1], '-_', '+/'));
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         if (session_status() == PHP_SESSION_NONE) {
             session_start();
@@ -105,6 +106,6 @@ class BasicAuthMiddleware extends Middleware
                 return $response;
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
@@ -24,7 +25,7 @@ class CorsMiddleware extends Middleware
         return $found;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $method = $request->getMethod();
         $origin = count($request->getHeader('Origin')) ? $request->getHeader('Origin')[0] : '';
@@ -54,7 +55,7 @@ class CorsMiddleware extends Middleware
                 $response = $response->withHeader('Access-Control-Expose-Headers', $exposeHeaders);
             }
         } else {
-            $response = $this->next->handle($request);
+            $response = $next->handle($request);
         }
         if ($origin) {
             $allowCredentials = $this->getProperty('allowCredentials', 'true');

src/Tqdev/PhpCrudApi/Middleware/CustomizationMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
@@ -19,7 +20,7 @@ class CustomizationMiddleware extends Middleware
         $this->reflection = $reflection;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         $tableName = RequestUtils::getPathSegment($request, 2);
@@ -29,7 +30,7 @@ class CustomizationMiddleware extends Middleware
             $result = call_user_func($beforeHandler, $operation, $tableName, $request, $environment);
             $request = $result ?: $request;
         }
-        $response = $this->next->handle($request);
+        $response = $next->handle($request);
         $afterHandler = $this->getProperty('afterHandler', '');
         if ($afterHandler !== '') {
             $result = call_user_func($afterHandler, $operation, $tableName, $response, $environment);

src/Tqdev/PhpCrudApi/Middleware/FirewallMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
@@ -34,7 +35,7 @@ class FirewallMiddleware extends Middleware
         return false;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $reverseProxy = $this->getProperty('reverseProxy', '');
         if ($reverseProxy) {
@@ -48,7 +49,7 @@ class FirewallMiddleware extends Middleware
         if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {
             $response = $this->responder->error(ErrorCode::TEMPORARY_OR_PERMANENTLY_BLOCKED, '');
         } else {
-            $response = $this->next->handle($request);
+            $response = $next->handle($request);
         }
         return $response;
     }

src/Tqdev/PhpCrudApi/Middleware/IpAddressMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
 use Tqdev\PhpCrudApi\Controller\Responder;
@@ -38,7 +39,7 @@ class IpAddressMiddleware extends Middleware
         return (object) $context;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if (in_array($operation, ['create', 'update', 'increment'])) {
@@ -61,6 +62,6 @@ class IpAddressMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/JoinLimitsMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
@@ -20,7 +21,7 @@ class JoinLimitsMiddleware extends Middleware
         $this->reflection = $reflection;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         $params = RequestUtils::getParams($request);
@@ -49,6 +50,6 @@ class JoinLimitsMiddleware extends Middleware
             $request = RequestUtils::setParams($request, $params);
             VariableStore::set("joinLimits.maxRecords", $maxRecords);
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/JwtAuthMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
@@ -121,7 +122,7 @@ class JwtAuthMiddleware extends Middleware
         return $parts[1];
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         if (session_status() == PHP_SESSION_NONE) {
             session_start();
@@ -143,6 +144,6 @@ class JwtAuthMiddleware extends Middleware
                 return $this->responder->error(ErrorCode::AUTHENTICATION_REQUIRED, '');
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/MultiTenancyMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
@@ -68,7 +69,7 @@ class MultiTenancyMiddleware extends Middleware
         return $request->withParsedBody($multi ? $records : $records[0]);
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $handler = $this->getProperty('handler', '');
         if ($handler !== '') {
@@ -91,6 +92,6 @@ class MultiTenancyMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/PageLimitsMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
@@ -20,7 +21,7 @@ class PageLimitsMiddleware extends Middleware
         $this->reflection = $reflection;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if ($operation == 'list') {
@@ -44,6 +45,6 @@ class PageLimitsMiddleware extends Middleware
             }
             $request = RequestUtils::setParams($request, $params);
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/Router/Router.php

@@ -3,10 +3,10 @@ namespace Tqdev\PhpCrudApi\Middleware\Router;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Tqdev\PhpCrudApi\Middleware\Base\Handler;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 
-interface Router extends Handler
+interface Router extends RequestHandlerInterface
 {
     public function register(string $method, string $path, array $handler);
 

src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php

@@ -58,13 +58,7 @@ class SimpleRouter implements Router
 
     public function load(Middleware $middleware) /*: void*/
     {
-        if (count($this->middlewares) > 0) {
-            $next = $this->middlewares[0];
-        } else {
-            $next = $this;
-        }
-        $middleware->setNext($next);
-        array_unshift($this->middlewares, $middleware);
+        array_push($this->middlewares, $middleware);
     }
 
     public function route(ServerRequestInterface $request): ResponseInterface
@@ -73,11 +67,7 @@ class SimpleRouter implements Router
             $data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));
             $this->cache->set('PathTree', $data, $this->ttl);
         }
-        $obj = $this;
-        if (count($this->middlewares) > 0) {
-            $obj = $this->middlewares[0];
-        }
-        return $obj->handle($request);
+        return $this->handle($request);
     }
 
     private function getRouteNumbers(ServerRequestInterface $request): array
@@ -90,6 +80,11 @@ class SimpleRouter implements Router
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
+        if (count($this->middlewares)) {
+            $handler = array_pop($this->middlewares);
+            return $handler->process($request, $this);
+        }
+
         $routeNumbers = $this->getRouteNumbers($request);
         if (count($routeNumbers) == 0) {
             return $this->responder->error(ErrorCode::ROUTE_NOT_FOUND, $request->getRequestTarget());

src/Tqdev/PhpCrudApi/Middleware/SanitationMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
 use Tqdev\PhpCrudApi\Controller\Responder;
@@ -33,7 +34,7 @@ class SanitationMiddleware extends Middleware
         return (object) $context;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if (in_array($operation, ['create', 'update', 'increment'])) {
@@ -56,6 +57,6 @@ class SanitationMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/ValidationMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
 use Tqdev\PhpCrudApi\Controller\Responder;
@@ -41,7 +42,7 @@ class ValidationMiddleware extends Middleware
         return null;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $operation = RequestUtils::getOperation($request);
         if (in_array($operation, ['create', 'update', 'increment'])) {
@@ -69,6 +70,6 @@ class ValidationMiddleware extends Middleware
                 }
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/Tqdev/PhpCrudApi/Middleware/XsrfMiddleware.php

@@ -3,6 +3,7 @@ namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
@@ -24,7 +25,7 @@ class XsrfMiddleware extends Middleware
         return $token;
     }
 
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $token = $this->getToken();
         $method = $request->getMethod();
@@ -35,6 +36,6 @@ class XsrfMiddleware extends Middleware
                 return $this->responder->error(ErrorCode::BAD_OR_MISSING_XSRF_TOKEN, '');
             }
         }
-        return $this->next->handle($request);
+        return $next->handle($request);
     }
 }

src/clone.sh

@@ -8,6 +8,16 @@ mkdir -p Psr/Http/Message
 cp -R http-factory/src/* Psr/Http/Message
 rm -Rf http-factory
 
+git clone git@github.com:php-fig/http-server-handler
+mkdir -p Psr/Http/Server
+cp -R http-server-handler/src/* Psr/Http/Server
+rm -Rf http-server-handler
+
+git clone git@github.com:php-fig/http-server-middleware
+mkdir -p Psr/Http/Server
+cp -R http-server-middleware/src/* Psr/Http/Server
+rm -Rf http-server-middleware
+
 git clone git@github.com:Nyholm/psr7.git
 mkdir -p Nyholm/Psr7
 cp -R psr7/src/* Nyholm/Psr7