eee

2024-12-16 16:05:01 +08:00
parent 34ab8f145c
commit daa02a6408
2 changed files with 31 additions and 43 deletions
@@ -12,33 +12,40 @@ abstract class AbstractHandler
 {


-    public int $offset = 0;
+	public int $offset = 0;


-    /**
-     * @param array $middlewares
-     * @param Handler $handler
-     * @throws
-     */
-    public function __construct(public array $middlewares, public Handler $handler)
-    {
-    }
+	/**
+	 * @param array   $middlewares
+	 * @param Handler $handler
+	 *
+	 * @throws
+	 */
+	public function __construct(public array $middlewares, public Handler $handler)
+	{
+	}

-    /**
-     * @param ServerRequestInterface $request
-     * @return ResponseInterface
-     * @throws
-     */
-    public function execute(ServerRequestInterface $request): ResponseInterface
-    {
-        if (!isset($this->middlewares[$this->offset])) {
-            return $this->handler->handle($request);
-        }
-        
-        $middleware   = $this->middlewares[$this->offset];
-        $this->offset += 1;

-        return ($middleware instanceof MiddlewareInterface ? $middleware : di($middleware))->process($request, $this);
-    }
+	/**
+	 * @param ServerRequestInterface $request
+	 *
+	 * @return ResponseInterface
+	 * @throws
+	 */
+	public function execute(ServerRequestInterface $request): ResponseInterface
+	{
+		if (!isset($this->middlewares[$this->offset])) {
+			return $this->handler->handle($request);
+		}
+
+		$middleware   = $this->middlewares[$this->offset];
+		$this->offset += 1;
+
+		if (!($middleware instanceof MiddlewareInterface)) {
+			$middleware = \Kiri::getDi()->get($middleware);
+		}
+
+		return $middleware->process($request, $this);
+	}

 }