merge addAll and deleteAll to singular methods of room class

Author: albertcht

src/Websocket/Rooms/RedisRoom.php

@@ -63,28 +63,22 @@ public function getRedis()
         return $this->redis;
     }
 
-    public function add(int $fd, string $room)
+    public function add(int $fd, $roomNames)
     {
-        $this->addAll($fd, [$room]);
-    }
+        $roomNames = is_array($roomNames) ? $roomNames : [$roomNames];
 
-    public function addAll(int $fd, array $roomNames)
-    {
         $this->addValue($fd, $roomNames, 'fds');
 
         foreach ($roomNames as $room) {
             $this->addValue($room, [$fd], 'rooms');
         }
     }
 
-    public function delete(int $fd, string $room)
-    {
-        $this->deleteAll($fd, [$room]);
-    }
-
-    public function deleteAll(int $fd, array $roomNames = [])
+    public function delete(int $fd, $roomNames = [])
     {
+        $roomNames = is_array($roomNames) ? $roomNames : [$roomNames];
         $roomNames = count($roomNames) ? $roomNames : $this->getRooms($fd);
+
         $this->removeValue($fd, $roomNames, 'fds');
 
         foreach ($roomNames as $room) {

src/Websocket/Rooms/RoomContract.php

@@ -13,33 +13,17 @@ public function prepare();
      * Add a socket to a room.
      *
      * @int fd
-     * @string room
+     * @string|array rooms
      */
-    public function add(int $fd, string $room);
-
-    /**
-     * Add a socket to multiple rooms.
-     *
-     * @int fd
-     * @array room
-     */
-    public function addAll(int $fd, array $rooms);
+    public function add(int $fd, $rooms);
 
     /**
      * Delete a socket from a room.
      *
      * @int fd
-     * @string room
-     */
-    public function delete(int $fd, string $room);
-
-    /**
-     * Delete a socket from all rooms.
-     *
-     * @int fd
-     * @string room
+     * @string|array rooms
      */
-    public function deleteAll(int $fd);
+    public function delete(int $fd, $rooms);
 
     /**
      * Get all sockets by a room key.

src/Websocket/Rooms/TableRoom.php

@@ -24,14 +24,10 @@ public function prepare()
         $this->initFdsTable();
     }
 
-    public function add(int $fd, string $room)
-    {
-        $this->addAll($fd, [$room]);
-    }
-
-    public function addAll(int $fd, array $roomNames)
+    public function add(int $fd, $roomNames)
     {
         $rooms = $this->getRooms($fd);
+        $roomNames = is_array($roomNames) ? $roomNames : [$roomNames];
 
         foreach ($roomNames as $room) {
             $fds = $this->getClients($room);
@@ -49,14 +45,10 @@ public function addAll(int $fd, array $roomNames)
         $this->setRooms($fd, $rooms);
     }
 
-    public function delete(int $fd, string $room)
-    {
-        $this->deleteAll($fd, [$room]);
-    }
-
-    public function deleteAll(int $fd, array $roomNames = [])
+    public function delete(int $fd, $roomNames = [])
     {
         $allRooms = $this->getRooms($fd);
+        $roomNames = is_array($roomNames) ? $roomNames : [$roomNames];
         $rooms = count($roomNames) ? $roomNames : $allRooms;
 
         $removeRooms = [];

tests/Websocket/RedisRoomTest.php

@@ -51,7 +51,7 @@ public function testAddAll()
             ->times(3);
         $redisRoom = $this->getRedisRoom($redis);
 
-        $redisRoom->addAll(1, ['foo', 'bar']);
+        $redisRoom->add(1, ['foo', 'bar']);
     }
 
     public function testAdd()
@@ -71,7 +71,7 @@ public function testDeleteAll()
             ->times(3);
         $redisRoom = $this->getRedisRoom($redis);
 
-        $redisRoom->deleteAll(1, ['foo', 'bar']);
+        $redisRoom->delete(1, ['foo', 'bar']);
     }
 
     public function testDelete()

tests/Websocket/TableRoomTest.php

@@ -54,7 +54,7 @@ public function testSetValue()
 
     public function testAddAll()
     {
-        $this->tableRoom->addAll($key = 1, $values = ['foo', 'bar']);
+        $this->tableRoom->add($key = 1, $values = ['foo', 'bar']);
 
         $this->assertSame($values, $this->tableRoom->getValue($key, $table = 'fds'));
         $this->assertSame([$key], $this->tableRoom->getValue('foo', 'rooms'));
@@ -71,8 +71,8 @@ public function testAdd()
 
     public function testDeleteAll()
     {
-        $this->tableRoom->addAll($key = 1, $values = ['foo', 'bar']);
-        $this->tableRoom->deleteAll($key);
+        $this->tableRoom->add($key = 1, $values = ['foo', 'bar']);
+        $this->tableRoom->delete($key);
 
         $this->assertSame([], $this->tableRoom->getValue($key, $table = 'fds'));
         $this->assertSame([], $this->tableRoom->getValue('foo', 'rooms'));
@@ -81,7 +81,7 @@ public function testDeleteAll()
 
     public function testDelete()
     {
-        $this->tableRoom->addAll($key = 1, $values = ['foo', 'bar']);
+        $this->tableRoom->add($key = 1, $values = ['foo', 'bar']);
         $this->tableRoom->delete($key, 'foo');
 
         $this->assertSame(['bar'], $this->tableRoom->getValue($key, $table = 'fds'));
@@ -91,7 +91,7 @@ public function testDelete()
 
     public function testGetRooms()
     {
-        $this->tableRoom->addAll($key = 1, $values = ['foo', 'bar']);
+        $this->tableRoom->add($key = 1, $values = ['foo', 'bar']);
 
         $this->assertSame(
             $this->tableRoom->getValue($key, $table = 'fds'),