fix: swoft-cloud/swoft/issues/1127 swoole push 4th params error

swoft-cloud · Dec 1, 2019 · d724a94 · d724a94
1 parent 8f5a0db
commit d724a94
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/websocket-server/src/Message/Response.php b/src/websocket-server/src/Message/Response.php
@@ -70,9 +70,9 @@ class Response implements ResponseInterface
     private $sendToAll = false;
 
     /**
-     * @var bool
+     * @var int
      */
-    private $finish = true;
+    private $finish = 1;
 
     /**
      * @var int WebSocket opcode value
@@ -364,18 +364,26 @@ public function setOpcode(int $opcode): self
      * @return bool
      */
     public function isFinish(): bool
+    {
+        return $this->finish === 1;
+    }
+
+    /**
+     * @return int
+     */
+    public function getFinish(): int
     {
         return $this->finish;
     }
 
     /**
-     * @param bool $finish
+     * @param bool|int $finish
      *
      * @return self
      */
-    public function setFinish(bool $finish): self
+    public function setFinish($finish): self
     {
-        $this->finish = $finish;
+        $this->finish = (int)$finish;
         return $this;
     }
 

diff --git a/src/websocket-server/test/unit/Message/ResponseTest.php b/src/websocket-server/test/unit/Message/ResponseTest.php
@@ -28,6 +28,7 @@ public function testBasic(): void
         $this->assertSame(7, $w->getOpcode());
         $this->assertFalse($w->isSent());
         $this->assertFalse($w->isFinish());
+        $this->assertSame(1, $w->getFinish());
 
         $this->assertFalse($w->isSendToAll());
         $w->toAll();