diff --git a/src/Base/AbstractHandler.php b/src/Base/AbstractHandler.php index 61e4f8c..69bcd4a 100644 --- a/src/Base/AbstractHandler.php +++ b/src/Base/AbstractHandler.php @@ -34,12 +34,11 @@ abstract class AbstractHandler if (!isset($this->middlewares[$this->offset])) { return $this->handler->handle($request); } - - /** @var MiddlewareInterface $middleware */ - $middleware = \Kiri::getDi()->get($this->middlewares[$this->offset]); + + $middleware = $this->middlewares[$this->offset]; $this->offset += 1; - return $middleware->process($request, $this); + return ($middleware instanceof MiddlewareInterface ? $middleware : di($middleware))->process($request, $this); } }