From 3d6099ea6e857a8f09ce11b8dba5c88c3aa1d678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 15 Sep 2023 15:58:24 +0800 Subject: [PATCH] eee --- src/Base/NotFoundController.php | 6 ++---- src/Handler.php | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Base/NotFoundController.php b/src/Base/NotFoundController.php index 1a23559..38dec60 100644 --- a/src/Base/NotFoundController.php +++ b/src/Base/NotFoundController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace Kiri\Router\Base; -use Kiri\Di\Context; use Psr\Http\Message\ResponseInterface; class NotFoundController extends Controller @@ -16,11 +15,10 @@ class NotFoundController extends Controller */ public function fail(): ResponseInterface { - $response = Context::get(ResponseInterface::class); if ($this->request->getMethod() == 'OPTIONS') { - return $response->withStatus(200, ""); + return \response()->withStatus(200, "empty content"); } else { - return $response->withStatus(404, "not found page."); + return \response()->withStatus(404, "not found page."); } } diff --git a/src/Handler.php b/src/Handler.php index 46101fd..55f6e3a 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace Kiri\Router; use Closure; +use Kiri\Di\Context; use Kiri\Router\Constrict\Stream; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -84,7 +85,7 @@ class Handler implements RequestHandlerInterface return $this->typeEncode(); } call_user_func($this->handler, ...$this->parameter); - return response(); + return \response(); } @@ -102,7 +103,7 @@ class Handler implements RequestHandlerInterface } else if (is_array($result)) { $result = json_encode($result, JSON_UNESCAPED_UNICODE); } - return response()->withBody(new Stream($result)); + return \response()->withBody(new Stream($result)); } }