Merge pull request #18 from swooletw/develop

Develop

Author: albertcht

routes/websocket.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Http\Request
+use Illuminate\Http\Request;
 use SwooleTW\Http\Websocket\Facades\Websocket;
 
 /*

src/Websocket/CanWebsocket.php

@@ -119,7 +119,7 @@ public function onClose(Server $server, $fd, $reactorId)
 
         try {
             // leave all rooms
-            $this->websocket->reset(true)->setSender($fd)->leaveAll();
+            $this->websocket->reset(true)->setSender($fd)->leave();
             // trigger 'disconnect' websocket event
             if ($this->websocket->eventExists('disconnect')) {
                 $this->websocket->call('disconnect');

src/Websocket/Websocket.php

@@ -116,7 +116,7 @@ public function join($rooms)
     {
         $rooms = is_string($rooms) || is_integer($rooms) ? func_get_args() : $rooms;
 
-        $this->room->addAll($this->sender, $rooms);
+        $this->room->add($this->sender, $rooms);
 
         return $this;
     }
@@ -126,11 +126,11 @@ public function join($rooms)
      *
      * @param string, array
      */
-    public function leave($rooms)
+    public function leave($rooms = [])
     {
         $rooms = is_string($rooms) || is_integer($rooms) ? func_get_args() : $rooms;
 
-        $this->room->deleteAll($this->sender, $rooms);
+        $this->room->delete($this->sender, $rooms);
 
         return $this;
     }
@@ -175,7 +175,7 @@ public function emit(string $event, $data)
      *
      * @param string
      */
-    public function in(string $room)
+    public function in($room)
     {
         $this->join($room);
 

tests/Websocket/WebsocketTest.php

@@ -40,7 +40,7 @@ public function testSetSender()
     public function testJoin()
     {
         $room = m::mock(RoomContract::class);
-        $room->shouldReceive('addAll')
+        $room->shouldReceive('add')
             ->with($sender = 1, $name = ['room'])
             ->once();
 
@@ -52,7 +52,7 @@ public function testJoin()
     public function testJoinAll()
     {
         $room = m::mock(RoomContract::class);
-        $room->shouldReceive('addAll')
+        $room->shouldReceive('add')
             ->with($sender = 1, $names = ['room1', 'room2'])
             ->once();
 
@@ -64,7 +64,7 @@ public function testJoinAll()
     public function testLeave()
     {
         $room = m::mock(RoomContract::class);
-        $room->shouldReceive('deleteAll')
+        $room->shouldReceive('delete')
             ->with($sender = 1, $name = ['room'])
             ->once();
 
@@ -76,7 +76,7 @@ public function testLeave()
     public function testLeaveAll()
     {
         $room = m::mock(RoomContract::class);
-        $room->shouldReceive('deleteAll')
+        $room->shouldReceive('delete')
             ->with($sender = 1, $names = ['room1', 'room2'])
             ->once();
 
@@ -108,7 +108,7 @@ public function testLoginUsing()
             ->andReturn($id = 1);
 
         $room = m::mock(RoomContract::class);
-        $room->shouldReceive('addAll')
+        $room->shouldReceive('add')
             ->with($sender = 1, ['uid_1'])
             ->once();
 
@@ -120,7 +120,7 @@ public function testLoginUsing()
     public function testLoginUsingId()
     {
         $room = m::mock(RoomContract::class);
-        $room->shouldReceive('addAll')
+        $room->shouldReceive('add')
             ->with($sender = 1, ['uid_1'])
             ->once();