This commit is contained in:
2021-09-06 17:46:03 +08:00
parent 93c0fc88d5
commit c4e60ede3d
3 changed files with 31 additions and 39 deletions
+2 -10
View File
@@ -81,11 +81,7 @@ class Context extends BaseContext
*/
private static function loadByContext($id, $default = null, $coroutineId = null): mixed
{
$data = Coroutine::getContext($coroutineId)[$id] ?? null;
if ($data === null) {
return $default;
}
return $data;
return Coroutine::getContext($coroutineId)[$id] ?? $default;
}
@@ -96,11 +92,7 @@ class Context extends BaseContext
*/
private static function loadByStatic($id, $default = null): mixed
{
$data = static::$_contents[$id] ?? null;
if ($data === null) {
return $default;
}
return $data;
return static::$_contents[$id] ?? $default;
}
+1 -1
View File
@@ -21,7 +21,7 @@ class Request implements RequestInterface
*/
private function __call__(): RequestInterface
{
return Context::getContext(RequestMessage::class);
return Context::getContext(RequestMessage::class, new RequestMessage());
}
+2 -2
View File
@@ -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());
}
}