改名

http-server/Message/Response.php

@@ -122,7 +122,10 @@ class Response implements ResponseInterface, \Server\ResponseInterface
 	 */
 	public function json($data): ResponseInterface
 	{
-		return $this->withBody(static::parser($data, self::CONTENT_TYPE_JSON))
+		if (!is_array($data = $this->_toArray($data))) {
+			throw new Exception('Json data format error.');
+		}
+		return $this->withBody(new Stream(json_encode($this->_toArray($data))))
 			->withContentType(self::CONTENT_TYPE_JSON);
 	}
 
@@ -134,7 +137,7 @@ class Response implements ResponseInterface, \Server\ResponseInterface
 	 */
 	public function html($data): ResponseInterface
 	{
-		return $this->withBody(static::parser($data, self::CONTENT_TYPE_HTML))
+		return $this->withBody(new Stream((string)$this->_toArray($data)))
 			->withContentType(self::CONTENT_TYPE_HTML);
 	}
 
@@ -146,29 +149,24 @@ class Response implements ResponseInterface, \Server\ResponseInterface
 	 */
 	public function xml($data): ResponseInterface
 	{
-		return $this->withBody(static::parser($data, self::CONTENT_TYPE_XML))
+		if (!is_array($data = $this->_toArray($data))) {
+			throw new Exception('Xml data format error.');
+		}
+		return $this->withBody(new Stream(Help::toXml($data)))
 			->withContentType(self::CONTENT_TYPE_XML);
 	}
 
 
 	/**
 	 * @param $responseData
-	 * @param string $contentType
+	 * @return string|array|bool|int|null
-	 * @return Stream
-	 * @throws Exception
 	 */
-	public static function parser($responseData, $contentType = self::CONTENT_TYPE_JSON): Stream
+	public function _toArray($responseData): string|array|null|bool|int
 	{
 		if (is_object($responseData)) {
 			$responseData = $responseData instanceof ToArray ? $responseData->toArray() : get_object_vars($responseData);
 		}
-		if ($contentType == self::CONTENT_TYPE_JSON) {
+		return $responseData;
-			return new Stream(json_encode($responseData));
-		}
-		if ($contentType == self::CONTENT_TYPE_XML) {
-			return new Stream(Help::toXml($responseData));
-		}
-		return new Stream((string)($responseData));
 	}
 
 }

http-server/Service/Http.php

@@ -6,7 +6,7 @@ namespace Server\Service;
 use Exception;
 use Http\Exception\RequestException;
 use Http\Route\Node;
-use Kiri\ToArray;
+use Kiri\Core\Help;
 use Server\Events\OnAfterRequest;
 use Server\Message\Stream;
 use Server\ResponseInterface;
@@ -16,6 +16,7 @@ use Swoole\Error;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\Server;
+use Server\Message\Response as MsgResponse;
 
 /**
  *
@@ -66,21 +67,18 @@ class Http extends \Server\Abstracts\Http implements OnClose, OnConnect
 	private function transferToResponse($responseData): ResponseInterface
 	{
 		$interface = $this->response->withStatus(200);
-        if (is_object($responseData)) {
+		if (!$interface->hasHeader('Content-Type')) {
-            if (!($responseData instanceof ToArray)) {
+			$interface->withContentType(MsgResponse::CONTENT_TYPE_JSON);
-                $responseData = get_object_vars($responseData);
-            } else {
-                $responseData = $responseData->toArray();
 		}
+		$responseData = $interface->_toArray($responseData);
+		if ($interface->getHeader('Content-Type') == MsgResponse::CONTENT_TYPE_XML) {
+			$responseData = Help::toXml($responseData);
 		}
 		if (is_array($responseData)) {
 			$responseData = new Stream(json_encode($responseData, JSON_UNESCAPED_UNICODE));
 		} else {
 			$responseData = new Stream((string)$responseData);
 		}
-        if (!$interface->hasHeader('Content-Type')) {
-            $interface->withContentType(\Server\Message\Response::CONTENT_TYPE_JSON);
-        }
 		return $interface->withBody($responseData);
 	}