diff --git a/Server/Constrict/Request.php b/Server/Constrict/Request.php index 248f695b..e97c6a4e 100644 --- a/Server/Constrict/Request.php +++ b/Server/Constrict/Request.php @@ -25,8 +25,12 @@ class Request implements RequestInterface */ public function __call($name, $args) { - $request = Context::getContext(HttpResponse::class); - if (property_exists($request, $name)) { + if (!Context::hasContext(HttpResponse::class)) { + $request = Context::setContext(HttpResponse::class, new HttpResponse()); + } else { + $request = Context::getContext(HttpResponse::class); + } + if (property_exists($request, $name)) { return $request->{$name}; } return $request->{$name}(...$args); diff --git a/Server/Constrict/Response.php b/Server/Constrict/Response.php index 06fb67db..89775a6d 100644 --- a/Server/Constrict/Response.php +++ b/Server/Constrict/Response.php @@ -29,7 +29,12 @@ class Response implements ResponseInterface */ public function __call($name, $args) { - return Context::getContext(HttpResponse::class)->{$name}(...$args); + if (!Context::hasContext(HttpResponse::class)) { + $context = Context::setContext(HttpResponse::class, new HttpResponse()); + } else { + $context = Context::getContext(HttpResponse::class); + } + return $context->{$name}(...$args); } }