From c35129be5d3864eeddf1efe6149ada33cb5251f1 Mon Sep 17 00:00:00 2001
From: xl <as2252258@163.com>
Date: Fri, 26 May 2023 10:16:21 +0800
Subject: [PATCH] qqq

---
 src/Base/Controller.php | 6 +++---
 src/RouterCollector.php | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Base/Controller.php b/src/Base/Controller.php
index 91d60e4..937ba6b 100644
--- a/src/Base/Controller.php
+++ b/src/Base/Controller.php
@@ -11,7 +11,7 @@ use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Kiri\Di\Inject\Service;
+use Kiri\Di\Inject\Container;
 use ReflectionException;
 
 /**
@@ -27,14 +27,14 @@ abstract class Controller
 	/**
 	 * @var Request
 	 */
-	#[Service('request')]
+	#[Container(RequestInterface::class)]
 	public RequestInterface $request;
 
 
 	/**
 	 * @var Response
 	 */
-	#[Service('response')]
+	#[Container(ResponseInterface::class)]
 	public ResponseInterface $response;
 
 
diff --git a/src/RouterCollector.php b/src/RouterCollector.php
index 151869b..02d60f2 100644
--- a/src/RouterCollector.php
+++ b/src/RouterCollector.php
@@ -163,12 +163,11 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
 	 * @param string $class
 	 * @param string $method
 	 * @return void
-	 * @throws ReflectionException
 	 * @throws Exception
 	 */
 	public function registerMiddleware(string $class, string $method): void
 	{
-		$middlewares = Kiri::service()->get('request')->middlewares;
+		$middlewares = \request()->middlewares;
 		if (count($middlewares) > 0) {
 			$this->appendMiddleware($middlewares, $class, $method);
 		}