改名

2021-08-04 15:33:42 +08:00
parent 3c0e687a6d
commit 9f9d19415d
1 changed files with 7 additions and 8 deletions
@@ -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();
 	}