modify: 更新 Swoole onRequest 回调中 Response 类型

Author: anoxia

src/Http/Runtime/Swoole/EventHandler.php

@@ -20,13 +20,10 @@ class EventHandler extends RuntimeEventHandler
      */
     public function onRequest(SwooleRequest $swRequest, SwooleResponse $swResponse): void
     {
-        /** @var Response $response */
-        $response = $this->createResponse($swResponse);
-
         try {
             $response = call_user_func(
                 $this->handleRequest,
-                $this->createContext($this->createServerRequest($swRequest), $response)
+                $this->createContext($this->createServerRequest($swRequest), $this->createResponse($swResponse))
             );
         } catch (Throwable $e) {
             $response = $response->withStatus(500);
@@ -35,7 +32,16 @@ public function onRequest(SwooleRequest $swRequest, SwooleResponse $swResponse):
             );
         }
 
-        $response->send();
+        /** @var Response $response */
+        // 设置响应 header 信息
+        foreach ($response->getHeaders() as $name => $value) {
+            $swResponse->header($name, implode(', ', $value));
+        }
+
+        // HTTP statusCode
+        $swResponse->status($response->getStatusCode());
+        // 响应数据给客户端
+        $swResponse->end($response->getBody()->__toString());
     }
 
     public function onTask(SwooleServer $server, ServerTask $task)

src/Http/Runtime/Swoole/MessageHelperTrait.php

@@ -7,8 +7,6 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Swoole\Http\Request as SwooleRequest;
-use Swoole\Http\Response as SwooleResponse;
-
 
 trait MessageHelperTrait
 {
@@ -36,8 +34,8 @@ protected function createServerRequest(SwooleRequest $request): ServerRequestInt
     /**
      * 生成 Response 对象
      */
-    protected function createResponse(SwooleResponse $response): ResponseInterface
+    protected function createResponse(): ResponseInterface
     {
-        return (new Response())->withSwooleResponse($response);
+        return new Response();
     }
 }