改名

http-helper/Context/Context.php

@@ -81,11 +81,7 @@ class Context extends BaseContext
 	 */
 	private static function loadByContext($id, $default = null, $coroutineId = null): mixed
 	{
-		$data = Coroutine::getContext($coroutineId)[$id] ?? null;
+		return Coroutine::getContext($coroutineId)[$id] ?? $default;
-		if ($data === null) {
-			return $default;
-		}
-		return $data;
 	}
 
 
@@ -96,11 +92,7 @@ class Context extends BaseContext
 	 */
 	private static function loadByStatic($id, $default = null): mixed
 	{
-		$data = static::$_contents[$id] ?? null;
+		return static::$_contents[$id] ?? $default;
-		if ($data === null) {
-			return $default;
-		}
-		return $data;
 	}
 
 

http-server/Constrict/Request.php

@@ -21,7 +21,7 @@ class Request implements RequestInterface
 	 */
 	private function __call__(): RequestInterface
 	{
-		return Context::getContext(RequestMessage::class);
+		return Context::getContext(RequestMessage::class, new RequestMessage());
 	}
 
 

http-server/Constrict/Response.php

@@ -5,8 +5,8 @@ namespace Server\Constrict;
 
 
 use Http\Context\Context;
-use Server\ResponseInterface;
 use Server\Message\Response as Psr7Response;
+use Server\ResponseInterface;
 
 
 /**
@@ -50,6 +50,6 @@ class Response implements ResponseInterface
 	 */
 	public function __call__(): Psr7Response
 	{
-        return Context::getContext(Psr7Response::class);
+		return Context::getContext(Psr7Response::class, new Psr7Response());
 	}
 }