Pass ErrorHandler to the RouteHandler.

clue · Sep 27, 2023 · 63328e5 · 63328e5
1 parent 7f64e51
commit 63328e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/App.php b/src/App.php
@@ -101,8 +101,10 @@ public function __construct(...$middleware)
         if ($needsAccessLog instanceof Container) {
             \array_unshift($handlers, $needsAccessLog->getAccessLogHandler());
         }
-
-        $this->router = new RouteHandler($container);
+        $errorHandler = \array_reduce($handlers, function ($carry, $handler) {
+            return $carry ?? ($handler instanceof ErrorHandler ? $handler : null);
+        });
+        $this->router = new RouteHandler($container, $errorHandler);
         $handlers[] = $this->router;
         $this->handler = new MiddlewareHandler($handlers);
         $this->sapi = \PHP_SAPI === 'cli' ? new ReactiveHandler($container->getEnv('X_LISTEN')) : new SapiHandler();

diff --git a/src/Io/RouteHandler.php b/src/Io/RouteHandler.php
@@ -30,10 +30,10 @@ class RouteHandler
     /** @var Container */
     private $container;
 
-    public function __construct(Container $container = null)
+    public function __construct(Container $container = null, ErrorHandler $errorHandler = null)
     {
         $this->routeCollector = new RouteCollector(new RouteParser(), new RouteGenerator());
-        $this->errorHandler = new ErrorHandler();
+        $this->errorHandler = $errorHandler ?? new ErrorHandler();
         $this->container = $container ?? new Container();
     }