merge master back to develop

src/Websocket/Facades/Room.php

@@ -5,9 +5,9 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static this prepare()
- * @method static this add($fd, $rooms)
- * @method static this delete($fd, $rooms)
+ * @method static $this prepare()
+ * @method static $this add($fd, $rooms)
+ * @method static $this delete($fd, $rooms)
  * @method static array getClients($room)
  * @method static array getRooms($fd)
  *
@@ -24,4 +24,4 @@ protected static function getFacadeAccessor()
     {
         return 'swoole.room';
     }
-}
+}

src/Websocket/Facades/Websocket.php

@@ -5,30 +5,30 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static this broadcast()
- * @method static this to($values)
- * @method static this join($rooms)
- * @method static this leave($rooms)
+ * @method static $this broadcast()
+ * @method static $this to($values)
+ * @method static $this join($rooms)
+ * @method static $this leave($rooms)
  * @method static boolean emit($event, $data)
- * @method static this in($room)
- * @method static this on($event, $callback)
+ * @method static $this in($room)
+ * @method static $this on($event, $callback)
  * @method static boolean eventExists($event)
  * @method static mixed call($event, $data)
  * @method static boolean close($fd)
- * @method static this setSender($fd)
+ * @method static $this setSender($fd)
  * @method static int getSender()
  * @method static boolean getIsBroadcast()
  * @method static array getTo()
- * @method static this reset()
- * @method static this middleware($middleware)
- * @method static this setContainer($container)
- * @method static this setPipeline($pipeline)
+ * @method static $this reset()
+ * @method static $this middleware($middleware)
+ * @method static $this setContainer($container)
+ * @method static $this setPipeline($pipeline)
  * @method static \Illuminate\Contracts\Pipeline\Pipeline getPipeline()
  * @method static mixed loginUsing($user)
- * @method static this loginUsingId($userId)
- * @method static this logout()
- * @method static this toUser($users)
- * @method static this toUserId($userIds)
+ * @method static $this loginUsingId($userId)
+ * @method static $this logout()
+ * @method static $this toUser($users)
+ * @method static $this toUserId($userIds)
  * @method static string getUserId()
  * @method static boolean isUserIdOnline($userId)
  *
@@ -45,4 +45,4 @@ protected static function getFacadeAccessor()
     {
         return 'swoole.websocket';
     }
-}
+}