diff --git a/HttpServer/Controller.php b/HttpServer/Controller.php index 21eb95dd..87cd73f3 100644 --- a/HttpServer/Controller.php +++ b/HttpServer/Controller.php @@ -59,7 +59,7 @@ class Controller * * @var Response|null */ - #[Inject('response')] + #[Inject(\Server\Response::class)] public ?Response $response = null; diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php index 92d8bc93..41d1475e 100644 --- a/HttpServer/Http/Response.php +++ b/HttpServer/Http/Response.php @@ -159,9 +159,19 @@ class Response extends HttpService */ public function getBuilder(mixed $data, SResponse $response = null): static { - if ($response === null) { - return $this->setContent($data); + if ($response != null) { + $this->configure($response); } + return $this->setContent($data); + } + + + /** + * @param \Swoole\Http\Response|null $response + * @throws \Exception + */ + public function configure(SResponse $response = null): static + { $response->setStatusCode($this->statusCode); if (!isset($response->header['Content-Type'])) { $response->header('Content-Type', $this->getResponseFormat()); @@ -177,7 +187,7 @@ class Response extends HttpService $response->setCookie(...$header); } } - return $this->setContent($data); + return $this; } @@ -202,9 +212,11 @@ class Response extends HttpService /** * @param mixed $content */ - public function setContent(mixed $content): static + public function setContent(mixed $content, $statusCode = 200, $format = self::JSON): static { $this->endData = $content; + $this->setStatusCode($statusCode); + $this->setFormat($format); return $this; } diff --git a/Server/HTTPServerListener.php b/Server/HTTPServerListener.php index dea6c629..e904e4c7 100644 --- a/Server/HTTPServerListener.php +++ b/Server/HTTPServerListener.php @@ -36,9 +36,10 @@ class HTTPServerListener extends Abstracts\Server #[Inject('router')] public Router $router; - /** @var \HttpServer\Http\Response|mixed */ - #[Inject(\HttpServer\Http\Response::class)] - public \HttpServer\Http\Response $response; + + /** @var \Server\Response|mixed */ + #[Inject(\Server\Response::class)] + public \Server\Response $response; /** @var EventDispatch */ @@ -96,32 +97,20 @@ class HTTPServerListener extends Abstracts\Server if (!($node instanceof Node)) { throw new RequestException('