This commit is contained in:
2021-08-27 17:22:08 +08:00
parent daef261403
commit 24bf2405a3
2 changed files with 43 additions and 9 deletions
+7 -7
View File
@@ -3,7 +3,7 @@
namespace Server\Constrict;
use Http\Context\Context;
use Server\Message\Request as Psr7Request;
use Server\Message\Request as RequestMessage;
use Http\Context\Response;
use Kiri\Kiri;
use ReflectionException;
@@ -11,7 +11,7 @@ use Server\RequestInterface;
/**
* @mixin Psr7Request
* @mixin RequestMessage
*/
class Request implements RequestInterface
{
@@ -24,10 +24,10 @@ class Request implements RequestInterface
*/
public function __call($name, $args)
{
if (!Context::hasContext(Psr7Request::class)) {
$request = Context::setContext(Psr7Request::class, new Psr7Request());
if (!Context::hasContext(RequestMessage::class)) {
$request = Context::setContext(RequestMessage::class, new RequestMessage());
} else {
$request = Context::getContext(Psr7Request::class);
$request = Context::getContext(RequestMessage::class);
}
if (property_exists($request, $name)) {
return $request->{$name};
@@ -43,7 +43,7 @@ class Request implements RequestInterface
public function __get($name): mixed
{
// TODO: Change the autogenerated stub
return Context::getContext(Psr7Request::class)->{$name};
return Context::getContext(RequestMessage::class)->{$name};
}
@@ -56,7 +56,7 @@ class Request implements RequestInterface
{
Context::setContext(Response::class, new Response());
Context::setContext(Psr7Request::class, Psr7Request::parseRequest($request));
Context::setContext(RequestMessage::class, RequestMessage::parseRequest($request));
return Kiri::getDi()->get(Request::class);
}