From 5024ca250407f1e033cfbd1eb553845768a4b419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Tue, 17 Oct 2023 20:32:26 +0800 Subject: [PATCH] eee --- Handler/OnRequest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Handler/OnRequest.php b/Handler/OnRequest.php index 558857d..083c1ab 100644 --- a/Handler/OnRequest.php +++ b/Handler/OnRequest.php @@ -16,7 +16,6 @@ use Kiri\Router\Constrict\ConstrictRequest; use Kiri\Router\Constrict\ConstrictResponse; use Kiri\Router\Constrict\Uri; use Kiri\Router\DataGrip; -use Kiri\Router\HttpRequestHandler; use Kiri\Router\Interface\ExceptionHandlerInterface; use Kiri\Router\Interface\OnRequestInterface; use Kiri\Router\RouterCollector; @@ -98,8 +97,10 @@ class OnRequest implements OnRequestInterface /** @var ConstrictRequest $PsrRequest */ $PsrRequest = $this->initPsr7RequestAndPsr7Response($request); + /** @var $dispatcher */ $dispatcher = $this->router->query($request->server['path_info'], $request->getMethod()); + /** @var $PsrResponse */ $PsrResponse = $dispatcher->run($PsrRequest); } catch (\Throwable $throwable) { $PsrResponse = $this->exception->emit($throwable, di(ConstrictResponse::class)); @@ -119,7 +120,6 @@ class OnRequest implements OnRequestInterface /** @var ConstrictResponse $PsrResponse */ $PsrResponse = Context::set(ResponseInterface::class, new ConstrictResponse()); $PsrResponse->withContentType($this->response->contentType); - $serverRequest = (new ConstrictRequest())->withHeaders($request->header ?? []) ->withUri(new Uri($request)) ->withProtocolVersion($request->server['server_protocol'])