eee

src/Annotate/ResponseContentType.php

@@ -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)
-	{
-	}
-
-}

src/Base/AbstractHandler.php

@@ -18,14 +18,17 @@ abstract class AbstractHandler
 	/**
 	 * @param array   $middlewares
 	 * @param Handler $handler
+	 *
 	 * @throws
 	 */
 	public function __construct(public array $middlewares, public Handler $handler)
 	{
 	}
 
+
 	/**
 	 * @param ServerRequestInterface $request
+	 *
 	 * @return ResponseInterface
 	 * @throws
 	 */
@@ -38,7 +41,11 @@ abstract class AbstractHandler
 		$middleware   = $this->middlewares[$this->offset];
 		$this->offset += 1;
 
-        return ($middleware instanceof MiddlewareInterface ? $middleware : di($middleware))->process($request, $this);
+		if (!($middleware instanceof MiddlewareInterface)) {
+			$middleware = \Kiri::getDi()->get($middleware);
+		}
+
+		return $middleware->process($request, $this);
 	}
 
 }