From 9f9d19415db863f1e0e55a0179e8f3331ca4441d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Wed, 4 Aug 2021 15:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Http/Response.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php index 04458056..6e01ece4 100644 --- a/HttpServer/Http/Response.php +++ b/HttpServer/Http/Response.php @@ -194,10 +194,13 @@ class Response extends HttpService /** * @param mixed $content - * @return Response + * @return Response|\Server\Constrict\Response */ - public function setContent(mixed $content): static + public function setContent(mixed $content): Response|\Server\Constrict\Response { + if ($content instanceof \Server\Constrict\Response) { + return $content; + } $this->endData = $content; return $this; } @@ -213,12 +216,8 @@ class Response extends HttpService if (empty($this->endData) || is_string($this->endData)) { return $this->endData; } - var_dump($this->endData); - if (!($this->endData instanceof Response)) { - $class = Response::FORMAT_MAPS[$this->format] ?? HtmlFormatter::class; - return \di($class)->send($this->endData)->getData(); - } - return $this->endData->getContent(); + $class = Response::FORMAT_MAPS[$this->format] ?? HtmlFormatter::class; + return \di($class)->send($this->endData)->getData(); }