改名

http-server/Constrict/Request.php

@@ -3,10 +3,11 @@
 namespace Server\Constrict;
 
 use Http\Context\Context;
-use Http\Context\Response;
 use Kiri\Kiri;
 use Server\Message\Request as RequestMessage;
 use Server\RequestInterface;
+use Server\Message\Response;
+use Server\ResponseInterface;
 
 
 /**
@@ -53,7 +54,7 @@ class Request implements RequestInterface
 	 */
 	public static function create(\Swoole\Http\Request $request): RequestInterface
 	{
-		Context::setContext(Response::class, new Response());
+		Context::setContext(ResponseInterface::class, new Response());
 
 		Context::setContext(RequestMessage::class, RequestMessage::parseRequest($request));
 

http-server/Constrict/Response.php

@@ -29,10 +29,7 @@ class Response implements ResponseInterface
 	 */
 	public function __call($name, $args)
 	{
-		if (!method_exists($this, $name)) {
-			return $this->__call__()->{$name}(...$args);
-		}
-		return $this->{$name}(...$args);
+		return $this->__call__()->{$name}(...$args);
 	}
 
 	/**
@@ -50,6 +47,6 @@ class Response implements ResponseInterface
 	 */
 	public function __call__(): Psr7Response
 	{
-		return Context::getContext(Psr7Response::class, new Psr7Response());
+		return Context::getContext(ResponseInterface::class, new Psr7Response());
 	}
 }

http-server/Message/Response.php

@@ -87,9 +87,9 @@ class Response implements ResponseInterface, \Server\ResponseInterface
 
 	/**
 	 * @param $value
-	 * @return ResponseInterface
+	 * @return Response
 	 */
-	public function withAccessControlAllowHeaders($value): ResponseInterface
+	public function withAccessControlAllowHeaders($value): static
 	{
 		return $this->withHeader('Access-Control-Allow-Headers', $value);
 	}
@@ -97,9 +97,9 @@ class Response implements ResponseInterface, \Server\ResponseInterface
 
 	/**
 	 * @param $value
-	 * @return ResponseInterface
+	 * @return Response
 	 */
-	public function withAccessControlRequestMethod($value): ResponseInterface
+	public function withAccessControlRequestMethod($value): static
 	{
 		return $this->withHeader('Access-Control-Request-Method', $value);
 	}
@@ -107,9 +107,9 @@ class Response implements ResponseInterface, \Server\ResponseInterface
 
 	/**
 	 * @param $value
-	 * @return ResponseInterface
+	 * @return Response
 	 */
-	public function withAccessControlAllowOrigin($value): ResponseInterface
+	public function withAccessControlAllowOrigin($value): static
 	{
 		return $this->withHeader('Access-Control-Allow-Origin', $value);
 	}