From daa02a6408a430590d7b832bd892f4010b81b198 Mon Sep 17 00:00:00 2001
From: whwyy <as2252258@163.com>
Date: Mon, 16 Dec 2024 16:05:01 +0800
Subject: [PATCH] eee

---
 src/Annotate/ResponseContentType.php | 19 ----------
 src/Base/AbstractHandler.php         | 55 ++++++++++++++++------------
 2 files changed, 31 insertions(+), 43 deletions(-)
 delete mode 100644 src/Annotate/ResponseContentType.php

diff --git a/src/Annotate/ResponseContentType.php b/src/Annotate/ResponseContentType.php
deleted file mode 100644
index e0742a1..0000000
--- a/src/Annotate/ResponseContentType.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Kiri\Router\Annotate;
-
-use Kiri\Router\ContentType;
-
-#[\Attribute(\Attribute::TARGET_METHOD)]
-class ResponseContentType
-{
-
-
-	/**
-	 * @param ContentType $contentType
-	 */
-	public function __construct(public ContentType $contentType = ContentType::JSON)
-	{
-	}
-
-}
\ No newline at end of file
diff --git a/src/Base/AbstractHandler.php b/src/Base/AbstractHandler.php
index 69bcd4a..1a8b726 100644
--- a/src/Base/AbstractHandler.php
+++ b/src/Base/AbstractHandler.php
@@ -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);
+	}
 
 }