From a279e2d28d3b28fd7d968f80568062f9fa2727f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Wed, 19 Apr 2023 13:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Handler.php | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Handler.php b/src/Handler.php
index 2d360df..ae70e8d 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -5,6 +5,7 @@ namespace Kiri\Router;
 
 use Closure;
 use Kiri\Di\Context;
+use Kiri\Router\Base\Controller;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -28,6 +29,22 @@ class Handler implements RequestHandlerInterface
 	public function __construct(public array|Closure $handler, public array $parameter)
 	{
 		$this->request = \Kiri::service()->get('request');
+		if (is_array($this->handler)) {
+			[$controller, $action, $parameter] = [...$this->handler, $this->parameter];
+			$this->handler = static function (RequestInterface $request) use ($controller, $action, $parameter) {
+				/** @var Controller $controller */
+				if ($controller->beforeAction($request)) {
+					$response = call_user_func([$controller, $action], ...$parameter);
+					$controller->afterAction($response);
+					return $response;
+				} else {
+					/** @var Response $response */
+					$response = \Kiri::service()->get('response');
+					return $response->withStatus(500, 'BeforeAction error');
+				}
+			};
+			$this->parameter = [$this->request];
+		}
 	}
 
 
@@ -72,19 +89,7 @@ class Handler implements RequestHandlerInterface
 	public function handle(ServerRequestInterface $request): ResponseInterface
 	{
 		// TODO: Implement handle() method.
-		if ($this->handler instanceof Closure) {
-			return call_user_func($this->handler, ...$this->parameter);
-		}
-		[$controller, $action] = $this->handler;
-		if ($controller->beforeAction($this->request)) {
-			$response = call_user_func($this->handler, ...$this->parameter);
-	        $controller->afterAction($response);
-		} else {
-			/** @var Response $response */
-			$response = \Kiri::service()->get('response');
-			$response->withStatus(500,'BeforeAction error');
-		}
-		return $response;
+		return call_user_func($this->handler, ...$this->parameter);
 	}
 
 }