fix shouldPushToDescriptor in pusher

swooletw · Mar 9, 2019 · 4d28803 · 4d28803
1 parent 06ad668
commit 4d28803
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/Websocket/Pusher.php b/src/Websocket/Pusher.php
@@ -245,8 +245,11 @@ protected function getWebsocketConnections(): array
      */
     public function shouldPushToDescriptor(int $fd): bool
     {
-        return $this->server->exist($fd)
-            && ($this->broadcast && $this->sender !== (int) $fd);
+        if (! $this->server->exist($fd)) {
+            return false;
+        }
+
+        return $this->broadcast ? $this->sender !== (int) $fd : true;
     }
 
     /**

diff --git a/tests/Websocket/PusherTest.php b/tests/Websocket/PusherTest.php
@@ -115,7 +115,7 @@ public function testShouldPushToDescriptor()
         $server = m::mock(Server::class);
         $server->shouldReceive('exist')
             ->with($fd = 1)
-            ->twice()
+            ->times(3)
             ->andReturn(true);
 
         $pusher = Pusher::make([
@@ -141,5 +141,17 @@ public function testShouldPushToDescriptor()
         ], $server);
 
         $this->assertFalse($pusher->shouldPushToDescriptor($fd));
+
+        $pusher = Pusher::make([
+            'opcode' => 1,
+            'sender' => 1,
+            'fds' => [],
+            'broadcast' => false,
+            'assigned' => false,
+            'event' => 'event',
+            'message' => 'message'
+        ], $server);
+
+        $this->assertTrue($pusher->shouldPushToDescriptor($fd));
     }
 }