update after PR 711

README.md

@@ -619,8 +619,6 @@ You can enable the following middleware using the "middlewares" config parameter
 - "joinLimits": Restricts join parameters to prevent database scraping
 - "customization": Provides handlers for request and response customization
 - "xml": Translates all input and output from JSON to XML
-- "errors": Catches throwables and returns an error response instead of throwing  (enabled by default)\
-  Should always be applied after cors middleware, otherwise errors will not have CORS headers sent to the client.
 
 The "middlewares" config parameter is a comma separated list of enabled middlewares.
 You can tune the middleware behavior using middleware specific configuration parameters:

api.php

@@ -6893,17 +6893,6 @@ namespace Tqdev\PhpCrudApi\Middleware\Base {
             $this->properties = $properties;
         }
 
-        /**
-         * allows to load middlewares in a specific order
-         * The higher the priority, the earlier the middleware will be called
-         *
-         * @return int
-         */
-        public function getPriority() /* : int */
-        {
-            return 1;
-        }
-
         protected function getArrayProperty(string $key, string $default): array
         {
             return array_filter(array_map('trim', explode(',', $this->getProperty($key, $default))));
@@ -7068,10 +7057,6 @@ namespace Tqdev\PhpCrudApi\Middleware\Router {
                 $this->cache->set('PathTree', $data, $this->ttl);
             }
 
-            uasort($this->middlewares, function (Middleware $a, Middleware $b) {
-                return $a->getPriority() > $b->getPriority() ? 1 : ($a->getPriority() === $b->getPriority() ? 0 : -1);
-            });
-
             return $this->handle($request);
         }
 
@@ -7392,7 +7377,7 @@ namespace Tqdev\PhpCrudApi\Middleware {
     }
 }
 
-// file: src/Tqdev/PhpCrudApi/Middleware/CatchErrorsMiddleware.php
+// file: src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php
 namespace Tqdev\PhpCrudApi\Middleware {
 
     use Psr\Http\Message\ResponseInterface;
@@ -7402,9 +7387,10 @@ namespace Tqdev\PhpCrudApi\Middleware {
     use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
     use Tqdev\PhpCrudApi\Middleware\Router\Router;
     use Tqdev\PhpCrudApi\Record\ErrorCode;
+    use Tqdev\PhpCrudApi\ResponseFactory;
     use Tqdev\PhpCrudApi\ResponseUtils;
 
-    class CatchErrorsMiddleware extends Middleware
+    class CorsMiddleware extends Middleware
     {
         private $debug;
 
@@ -7414,45 +7400,6 @@ namespace Tqdev\PhpCrudApi\Middleware {
             $this->debug = $debug;
         }
 
-        public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
-        {
-            $response = null;
-            try {
-                $response = $next->handle($request);
-            } catch (\Throwable $e) {
-                $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, $e->getMessage());
-                if ($this->debug) {
-                    $response = ResponseUtils::addExceptionHeaders($response, $e);
-                }
-            }
-            return $response;
-        }
-
-        /**
-         * High priority, should always be one of the very first middlewares to be loaded
-         * Only cors middleware should be loaded earlier
-         *
-         * @return int
-         */
-        public function getPriority()
-        {
-            return 998;
-        }
-    }
-}
-
-// file: src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php
-namespace Tqdev\PhpCrudApi\Middleware {
-
-    use Psr\Http\Message\ResponseInterface;
-    use Psr\Http\Message\ServerRequestInterface;
-    use Psr\Http\Server\RequestHandlerInterface;
-    use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
-    use Tqdev\PhpCrudApi\Record\ErrorCode;
-    use Tqdev\PhpCrudApi\ResponseFactory;
-
-    class CorsMiddleware extends Middleware
-    {
         private function isOriginAllowed(string $origin, string $allowedOrigins): bool
         {
             $found = false;
@@ -7497,7 +7444,15 @@ namespace Tqdev\PhpCrudApi\Middleware {
                     $response = $response->withHeader('Access-Control-Expose-Headers', $exposeHeaders);
                 }
             } else {
-                $response = $next->handle($request);
+                $response = null;
+                try {
+                    $response = $next->handle($request);
+                } catch (\Throwable $e) {
+                    $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, $e->getMessage());
+                    if ($this->debug) {
+                        $response = ResponseUtils::addExceptionHeaders($response, $e);
+                    }
+                }
             }
             if ($origin) {
                 $allowCredentials = $this->getProperty('allowCredentials', 'true');
@@ -7508,16 +7463,6 @@ namespace Tqdev\PhpCrudApi\Middleware {
             }
             return $response;
         }
-
-        /**
-         * load early in the routing stack. should be loaded before catc herrors middleware,
-         * otherwise cors headers will be missing
-         * @return int
-         */
-        public function getPriority()
-        {
-            return 999;
-        }
     }
 }
 
@@ -10716,7 +10661,6 @@ namespace Tqdev\PhpCrudApi {
     use Tqdev\PhpCrudApi\GeoJson\GeoJsonService;
     use Tqdev\PhpCrudApi\Middleware\AuthorizationMiddleware;
     use Tqdev\PhpCrudApi\Middleware\BasicAuthMiddleware;
-    use Tqdev\PhpCrudApi\Middleware\CatchErrorsMiddleware;
     use Tqdev\PhpCrudApi\Middleware\CorsMiddleware;
     use Tqdev\PhpCrudApi\Middleware\CustomizationMiddleware;
     use Tqdev\PhpCrudApi\Middleware\DbAuthMiddleware;
@@ -10760,14 +10704,13 @@ namespace Tqdev\PhpCrudApi {
             $reflection = new ReflectionService($db, $cache, $config->getCacheTime());
             $responder = new JsonResponder();
             $router = new SimpleRouter($config->getBasePath(), $responder, $cache, $config->getCacheTime(), $config->getDebug());
-            new CatchErrorsMiddleware($router, $responder, [], $config->getDebug());
             foreach ($config->getMiddlewares() as $middleware => $properties) {
                 switch ($middleware) {
                     case 'sslRedirect':
                         new SslRedirectMiddleware($router, $responder, $properties);
                         break;
                     case 'cors':
-                        new CorsMiddleware($router, $responder, $properties);
+                        new CorsMiddleware($router, $responder, $properties, $config->getDebug());
                         break;
                     case 'firewall':
                         new FirewallMiddleware($router, $responder, $properties);
@@ -10814,9 +10757,6 @@ namespace Tqdev\PhpCrudApi {
                     case 'xml':
                         new XmlMiddleware($router, $responder, $properties, $reflection);
                         break;
-                    case 'errors':
-                        new CatchErrorsMiddleware($router, $responder, [], $config->getDebug());
-                        break;
                 }
             }
             foreach ($config->getControllers() as $controller) {

src/Tqdev/PhpCrudApi/Api.php

@@ -18,7 +18,6 @@ use Tqdev\PhpCrudApi\Database\GenericDB;
 use Tqdev\PhpCrudApi\GeoJson\GeoJsonService;
 use Tqdev\PhpCrudApi\Middleware\AuthorizationMiddleware;
 use Tqdev\PhpCrudApi\Middleware\BasicAuthMiddleware;
-use Tqdev\PhpCrudApi\Middleware\CatchErrorsMiddleware;
 use Tqdev\PhpCrudApi\Middleware\CorsMiddleware;
 use Tqdev\PhpCrudApi\Middleware\CustomizationMiddleware;
 use Tqdev\PhpCrudApi\Middleware\DbAuthMiddleware;
@@ -62,14 +61,13 @@ class Api implements RequestHandlerInterface
         $reflection = new ReflectionService($db, $cache, $config->getCacheTime());
         $responder = new JsonResponder();
         $router = new SimpleRouter($config->getBasePath(), $responder, $cache, $config->getCacheTime(), $config->getDebug());
-        new CatchErrorsMiddleware($router, $responder, [], $config->getDebug());
         foreach ($config->getMiddlewares() as $middleware => $properties) {
             switch ($middleware) {
                 case 'sslRedirect':
                     new SslRedirectMiddleware($router, $responder, $properties);
                     break;
                 case 'cors':
-                    new CorsMiddleware($router, $responder, $properties);
+                    new CorsMiddleware($router, $responder, $properties, $config->getDebug());
                     break;
                 case 'firewall':
                     new FirewallMiddleware($router, $responder, $properties);
@@ -116,9 +114,6 @@ class Api implements RequestHandlerInterface
                 case 'xml':
                     new XmlMiddleware($router, $responder, $properties, $reflection);
                     break;
-                case 'errors':
-                    new CatchErrorsMiddleware($router, $responder, $properties, $config->getDebug());
-                    break;
             }
         }
         foreach ($config->getControllers() as $controller) {

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

@@ -19,17 +19,6 @@ abstract class Middleware implements MiddlewareInterface
         $this->properties = $properties;
     }
 
-    /**
-     * allows to load middlewares in a specific order
-     * The higher the priority, the earlier the middleware will be called
-     *
-     * @return int
-     */
-    public function getPriority() /* : int */
-    {
-        return 1;
-    }
-
     protected function getArrayProperty(string $key, string $default): array
     {
         return array_filter(array_map('trim', explode(',', $this->getProperty($key, $default))));

src/Tqdev/PhpCrudApi/Middleware/CatchErrorsMiddleware.php

@@ -1,49 +0,0 @@
-<?php
-
-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\Middleware\Router\Router;
-use Tqdev\PhpCrudApi\Record\ErrorCode;
-use Tqdev\PhpCrudApi\ResponseUtils;
-
-
-class CatchErrorsMiddleware extends Middleware
-{
-    private $debug;
-
-    public function __construct(Router $router, Responder $responder, array $properties, bool $debug)
-    {
-        parent::__construct($router, $responder, $properties);
-        $this->debug = $debug;
-    }
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
-    {
-        $response = null;
-        try {
-            $response = $next->handle($request);
-        } catch (\Throwable $e) {
-            $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, $e->getMessage());
-            if ($this->debug) {
-                $response = ResponseUtils::addExceptionHeaders($response, $e);
-            }
-        }
-        return $response;
-    }
-
-    /**
-     * High priority, should always be one of the very first middlewares to be loaded
-     * Only cors middleware should be loaded earlier
-     *
-     * @return int
-     */
-    public function getPriority()
-    {
-        return 998;
-    }
-}

src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php

@@ -5,12 +5,23 @@ 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\Middleware\Router\Router;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
 use Tqdev\PhpCrudApi\ResponseFactory;
+use Tqdev\PhpCrudApi\ResponseUtils;
 
 class CorsMiddleware extends Middleware
 {
+    private $debug;
+
+    public function __construct(Router $router, Responder $responder, array $properties, bool $debug)
+    {
+        parent::__construct($router, $responder, $properties);
+        $this->debug = $debug;
+    }
+
     private function isOriginAllowed(string $origin, string $allowedOrigins): bool
     {
         $found = false;
@@ -55,7 +66,15 @@ class CorsMiddleware extends Middleware
                 $response = $response->withHeader('Access-Control-Expose-Headers', $exposeHeaders);
             }
         } else {
-            $response = $next->handle($request);
+            $response = null;
+            try {
+                $response = $next->handle($request);
+            } catch (\Throwable $e) {
+                $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, $e->getMessage());
+                if ($this->debug) {
+                    $response = ResponseUtils::addExceptionHeaders($response, $e);
+                }
+            }
         }
         if ($origin) {
             $allowCredentials = $this->getProperty('allowCredentials', 'true');
@@ -66,14 +85,4 @@ class CorsMiddleware extends Middleware
         }
         return $response;
     }
-
-    /**
-     * load early in the routing stack. should be loaded before catc herrors middleware,
-     * otherwise cors headers will be missing
-     * @return int
-     */
-    public function getPriority()
-    {
-        return 999;
-    }
 }

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

@@ -96,10 +96,6 @@ class SimpleRouter implements Router
             $this->cache->set('PathTree', $data, $this->ttl);
         }
 
-        uasort($this->middlewares, function (Middleware $a, Middleware $b) {
-            return $a->getPriority() > $b->getPriority() ? 1 : ($a->getPriority() === $b->getPriority() ? 0 : -1);
-        });
-
         return $this->handle($request);
     }