From e47952934774aac166e0d44259d33d6214dbb072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 4 Aug 2021 14:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HttpServer/Controller.php           |  8 ++++----
 Server/{ => Constrict}/Response.php |  2 +-
 Server/HTTPServerListener.php       | 12 +++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)
 rename Server/{ => Constrict}/Response.php (93%)

diff --git a/HttpServer/Controller.php b/HttpServer/Controller.php
index 0ed24bea..c908b442 100644
--- a/HttpServer/Controller.php
+++ b/HttpServer/Controller.php
@@ -8,9 +8,9 @@ use Annotation\Inject;
 use HttpServer\Http\HttpHeaders;
 use HttpServer\Http\HttpParams;
 use HttpServer\Http\Request;
-use HttpServer\Http\Response;
 use Snowflake\Abstracts\TraitApplication;
 use Snowflake\Application;
+use Server\Constrict\Response as CrResponse;
 
 /**
  * Class WebController
@@ -57,10 +57,10 @@ class Controller
 	/**
 	 * inject response
 	 *
-	 * @var Response|null
+	 * @var CrResponse|null
 	 */
-	#[Inject(\Server\Response::class)]
-	public ?\Server\Response $response = null;
+	#[Inject(CrResponse::class)]
+	public ?CrResponse $response = null;
 
 
 }
diff --git a/Server/Response.php b/Server/Constrict/Response.php
similarity index 93%
rename from Server/Response.php
rename to Server/Constrict/Response.php
index ff7fecbd..88323d3a 100644
--- a/Server/Response.php
+++ b/Server/Constrict/Response.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server;
+namespace Server\Constrict;
 
 
 use HttpServer\Http\Context;
diff --git a/Server/HTTPServerListener.php b/Server/HTTPServerListener.php
index e904e4c7..c54419c3 100644
--- a/Server/HTTPServerListener.php
+++ b/Server/HTTPServerListener.php
@@ -5,14 +5,12 @@ namespace Server;
 use Annotation\Inject;
 use Exception;
 use HttpServer\Exception\RequestException;
-use HttpServer\Http\Context;
 use HttpServer\Http\Request as HSRequest;
+use Server\Constrict\Response as CResponse;
 use HttpServer\Route\Node;
 use HttpServer\Route\Router;
 use Server\Events\OnAfterRequest;
-use Snowflake\Event;
 use Snowflake\Events\EventDispatch;
-use Snowflake\Snowflake;
 use Swoole\Error;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
@@ -37,9 +35,9 @@ class HTTPServerListener extends Abstracts\Server
     public Router $router;
 
 
-    /** @var \Server\Response|mixed */
-    #[Inject(\Server\Response::class)]
-    public \Server\Response $response;
+    /** @var CResponse|mixed */
+    #[Inject(CResponse::class)]
+    public CResponse $response;
 
 
     /** @var EventDispatch */
@@ -102,7 +100,7 @@ class HTTPServerListener extends Abstracts\Server
             $code = $exception->getCode() == 0 ? 500 : $exception->getCode();
             $data = $code ? $exception->getMessage() : jTraceEx($exception);
 
-            $responseData = $this->response->setContent($data, $code, \Server\Response::HTML);
+            $responseData = $this->response->setContent($data, $code, CResponse::HTML);
         } finally {
             $response->end($responseData->configure($response)->getContent());