Update Http Server to use new WritableConnection implementation (#5572)

Co-authored-by: 李铭昕 <[email protected]>

Author: huangdijia

composer.json

@@ -11,6 +11,7 @@
     ],
     "require": {
         "php": ">=8.0",
+        "hyperf/engine": "^1.9|^2.7",
         "hyperf/utils": "~3.0.0",
         "laminas/laminas-mime": "^2.7",
         "psr/http-message": "^1.0"

src/Server/Chunk/HasChunk.php

@@ -11,11 +11,13 @@
  */
 namespace Hyperf\HttpMessage\Server\Chunk;
 
+use Hyperf\Engine\Contract\Http\Writable;
+
 trait HasChunk
 {
     public function write(string $content): bool
     {
-        if (isset($this->connection) && $this->connection instanceof Chunkable) {
+        if (isset($this->connection) && $this->connection instanceof Writable) {
             return $this->connection->write($content);
         }
 

src/Server/Connection/SwooleConnection.php

@@ -11,23 +11,13 @@
  */
 namespace Hyperf\HttpMessage\Server\Connection;
 
+use Hyperf\Engine\Http\WritableConnection;
 use Hyperf\HttpMessage\Server\Chunk\Chunkable;
 use Hyperf\HttpMessage\Server\ConnectionInterface;
-use Swoole\Http\Response;
 
-class SwooleConnection implements ConnectionInterface, Chunkable
+/**
+ * @deprecated since 3.1.0, please use `Hyperf\Engine\Http\WritableConnection` instead.
+ */
+class SwooleConnection extends WritableConnection implements ConnectionInterface, Chunkable
 {
-    public function __construct(protected Response $response)
-    {
-    }
-
-    public function write(string $data): bool
-    {
-        return $this->response->write($data);
-    }
-
-    public function getSocket(): mixed
-    {
-        return $this->response;
-    }
 }

src/Server/ConnectionInterface.php

@@ -11,6 +11,9 @@
  */
 namespace Hyperf\HttpMessage\Server;
 
+/**
+ * @deprecated since 3.1.0, please use `Hyperf\Engine\Contract\Http\Writable` instead.
+ */
 interface ConnectionInterface
 {
     /**

src/Server/Response.php

@@ -11,6 +11,7 @@
  */
 namespace Hyperf\HttpMessage\Server;
 
+use Hyperf\Engine\Contract\Http\Writable;
 use Hyperf\HttpMessage\Cookie\Cookie;
 use Hyperf\HttpMessage\Server\Chunk\Chunkable;
 use Hyperf\HttpMessage\Server\Chunk\HasChunk;
@@ -24,7 +25,7 @@ class Response extends \Hyperf\HttpMessage\Base\Response implements Chunkable
 
     protected array $trailers = [];
 
-    protected ?ConnectionInterface $connection = null;
+    protected ?Writable $connection = null;
 
     /**
      * Returns an instance with body content.
@@ -81,13 +82,13 @@ public function getTrailers(): array
         return $this->trailers;
     }
 
-    public function setConnection(ConnectionInterface $connection)
+    public function setConnection(ConnectionInterface|Writable $connection)
     {
         $this->connection = $connection;
         return $this;
     }
 
-    public function getConnection(): ?ConnectionInterface
+    public function getConnection(): ConnectionInterface|Writable|null
     {
         return $this->connection;
     }