swooletw / laravel-swoole

src/Websocket/Pusher.php

Spacing +4 added lines, -4 removed lines

@@ -209,7 +209,7 @@ 
      */
     public function shouldBroadcast(): bool
     {
-        return $this->broadcast && empty($this->descriptors) && ! $this->assigned;
+        return $this->broadcast && empty($this->descriptors) && !$this->assigned;
     }
 
     /**
@@ -221,7 +221,7 @@ 
      */
     protected function getWebsocketConnections(): array
     {
-        return array_filter(iterator_to_array($this->server->connections), function ($fd) {
+        return array_filter(iterator_to_array($this->server->connections), function($fd) {
             return $this->server->isEstablished($fd);
         });
     }
@@ -233,7 +233,7 @@ 
      */
     public function shouldPushToDescriptor(int $fd): bool
     {
-        if (! $this->server->isEstablished($fd)) {
+        if (!$this->server->isEstablished($fd)) {
             return false;
         }
 
@@ -250,7 +250,7 @@ 
     public function push($payload): void
     {
         // attach sender if not broadcast
-        if (! $this->broadcast && $this->sender && ! $this->hasDescriptor($this->sender)) {
+        if (!$this->broadcast && $this->sender && !$this->hasDescriptor($this->sender)) {
             $this->addDescriptor($this->sender);
         }
 

src/Server/PidManager.php

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
      */
     public function write(int $masterPid, int $managerPid): void
     {
-        if (! is_writable($this->pidFile)
-            && ! is_writable(dirname($this->pidFile))
+        if (!is_writable($this->pidFile)
+            && !is_writable(dirname($this->pidFile))
         ) {
             throw new \RuntimeException(
                 sprintf('Pid file "%s" is not writable', $this->pidFile)

src/Commands/HttpServerCommand.php

Spacing +12 added lines, -12 removed lines

@@ -133,7 +133,7 @@ 
      */
     protected function stop()
     {
-        if (! $this->isRunning()) {
+        if (!$this->isRunning()) {
             $this->error("Failed! There is no swoole_http_server process running.");
 
             return;
@@ -173,7 +173,7 @@ 
      */
     protected function reload()
     {
-        if (! $this->isRunning()) {
+        if (!$this->isRunning()) {
             $this->error("Failed! There is no swoole_http_server process running.");
 
             return;
@@ -181,7 +181,7 @@ 
 
         $this->info('Reloading swoole_http_server...');
 
-        if (! $this->killProcess(SIGUSR1)) {
+        if (!$this->killProcess(SIGUSR1)) {
             $this->error('> failure');
 
             return;
@@ -241,7 +241,7 @@ 
     {
         $this->action = $this->argument('action');
 
-        if (! in_array($this->action, ['start', 'stop', 'restart', 'reload', 'infos'], true)) {
+        if (!in_array($this->action, ['start', 'stop', 'restart', 'reload', 'infos'], true)) {
             $this->error(
                 "Invalid argument '{$this->action}'. Expected 'start', 'stop', 'restart', 'reload' or 'infos'."
             );
@@ -262,7 +262,7 @@ 
         $filter = Arr::get($this->config, 'hot_reload.filter');
         $log = Arr::get($this->config, 'hot_reload.log');
 
-        $cb = function (FSEvent $event) use ($server, $log) {
+        $cb = function(FSEvent $event) use ($server, $log) {
             $log ? $this->info(FSOutput::format($event)) : null;
             $server->reload();
         };
@@ -281,7 +281,7 @@ 
     {
         $pids = $this->laravel->make(PidManager::class)->read();
 
-        if (! count($pids)) {
+        if (!count($pids)) {
             return false;
         }
 
@@ -315,7 +315,7 @@ 
             $start = time();
 
             do {
-                if (! $this->isRunning()) {
+                if (!$this->isRunning()) {
                     break;
                 }
 
@@ -345,13 +345,13 @@ 
             exit(1);
         }
 
-        if (! extension_loaded('swoole')) {
+        if (!extension_loaded('swoole')) {
             $this->error('Can\'t detect Swoole extension installed.');
 
             exit(1);
         }
 
-        if (! version_compare(swoole_version(), '4.3.1', 'ge')) {
+        if (!version_compare(swoole_version(), '4.3.1', 'ge')) {
             $this->error('Your Swoole version must be higher than `4.3.1`.');
 
             exit(1);
@@ -363,15 +363,15 @@ 
      */
     protected function registerAccessLog()
     {
-        $this->laravel->singleton(OutputStyle::class, function () {
+        $this->laravel->singleton(OutputStyle::class, function() {
             return new OutputStyle($this->input, $this->output);
         });
 
-        $this->laravel->singleton(AccessOutput::class, function () {
+        $this->laravel->singleton(AccessOutput::class, function() {
             return new AccessOutput(new ConsoleOutput);
         });
 
-        $this->laravel->singleton(AccessLog::class, function (Container $container) {
+        $this->laravel->singleton(AccessLog::class, function(Container $container) {
             return new AccessLog($container->make(AccessOutput::class));
         });
     }

src/Concerns/InteractsWithWebsocket.php

Spacing +10 added lines, -10 removed lines

@@ -88,11 +88,11 @@ 
             // enable sandbox
             $sandbox->enable();
             // call customized handshake handler
-            if ($response && ! $this->app->make($handshakeHandler)->handle($swooleRequest, $response)) {
+            if ($response && !$this->app->make($handshakeHandler)->handle($swooleRequest, $response)) {
                 return;
             }
             // check if socket.io connection established
-            if (! $this->websocketHandler->onOpen($swooleRequest->fd, $illuminateRequest)) {
+            if (!$this->websocketHandler->onOpen($swooleRequest->fd, $illuminateRequest)) {
                 return;
             }
             // trigger 'connect' websocket event
@@ -156,7 +156,7 @@ 
      */
     public function onClose($server, $fd, $reactorId)
     {
-        if (! $this->isServerWebsocket($fd) || ! $server instanceof WebsocketServer) {
+        if (!$this->isServerWebsocket($fd) || !$server instanceof WebsocketServer) {
             return;
         }
 
@@ -186,7 +186,7 @@ 
      */
     protected function isWebsocketPushPacket($packet)
     {
-        if (! is_array($packet)) {
+        if (!is_array($packet)) {
             return false;
         }
 
@@ -241,7 +241,7 @@ 
         $config = $this->container->make('config');
         $parser = $config->get('swoole_websocket.parser');
 
-        if (! $this->isServerWebsocket = $config->get('swoole_http.websocket.enabled')) {
+        if (!$this->isServerWebsocket = $config->get('swoole_http.websocket.enabled')) {
             return;
         }
 
@@ -279,7 +279,7 @@ 
     {
         $handlerClass = $this->container->make('config')->get('swoole_websocket.handler');
 
-        if (! $handlerClass) {
+        if (!$handlerClass) {
             throw new WebsocketNotSetInConfigException;
         }
 
@@ -340,7 +340,7 @@ 
      */
     protected function bindRoom(): void
     {
-        $this->app->singleton(RoomContract::class, function () {
+        $this->app->singleton(RoomContract::class, function() {
             return $this->websocketRoom;
         });
 
@@ -352,7 +352,7 @@ 
      */
     protected function bindWebsocket()
     {
-        $this->app->singleton(Websocket::class, function (Container $app) {
+        $this->app->singleton(Websocket::class, function(Container $app) {
             return new Websocket($app->make(RoomContract::class), new Pipeline($app));
         });
 
@@ -367,7 +367,7 @@ 
         $routePath = $this->container->make('config')
             ->get('swoole_websocket.route_file');
 
-        if (! file_exists($routePath)) {
+        if (!file_exists($routePath)) {
             $routePath = __DIR__ . '/../../routes/websocket.php';
         }
 
@@ -383,7 +383,7 @@ 
      */
     public function isWebsocketPushPayload($payload): bool
     {
-        if (! is_array($payload)) {
+        if (!is_array($payload)) {
             return false;
         }
 

src/Websocket/Middleware/Authenticate.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         try {
             $this->auth->setRequest($request);
             if ($user = $this->auth->authenticate()) {
-                $request->setUserResolver(function () use ($user) {
+                $request->setUserResolver(function() use ($user) {
                     return $user;
                 });
             }

src/Server/Manager.php

Spacing +4 added lines, -4 removed lines

@@ -115,7 +115,7 @@ 
         $this->createTables();
         $this->prepareWebsocket();
 
-        if (! $this->container->make(Server::class)->taskworker) {
+        if (!$this->container->make(Server::class)->taskworker) {
             $this->setSwooleServerListeners();
         }
     }
@@ -128,7 +128,7 @@ 
         $server = $this->container->make(Server::class);
         foreach ($this->events as $event) {
             $listener = Str::camel("on_$event");
-            $callback = method_exists($this, $listener) ? [$this, $listener] : function () use ($event) {
+            $callback = method_exists($this, $listener) ? [$this, $listener] : function() use ($event) {
                 $this->container->make('events')->dispatch("swoole.$event", func_get_args());
             };
 
@@ -322,7 +322,7 @@ 
      */
     protected function bindSandbox()
     {
-        $this->app->singleton(Sandbox::class, function ($app) {
+        $this->app->singleton(Sandbox::class, function($app) {
             return new Sandbox($app, $this->framework);
         });
 
@@ -410,7 +410,7 @@ 
      */
     protected function normalizeException(Throwable $e)
     {
-        if (! $e instanceof Exception) {
+        if (!$e instanceof Exception) {
             $e = new FatalThrowableError($e);
         }
 

src/Websocket/Rooms/RedisRoom.php

Indentation +204 added lines, -204 removed lines

@@ -10,214 +10,214 @@
  */
 class RedisRoom implements RoomContract
 {
-	/**
+    /**
      * The Redis factory implementation.
      *
      * @var \Illuminate\Contracts\Redis\Factory
      */
     public $redis;
 
-	/**
-	 * @var array
-	 */
-	protected $config;
-
-	/**
-	 * RedisRoom constructor.
-	 *
-	 * @param array $config
-	 */
-	public function __construct(array $config, RedisFactory $redis)
-	{
-		$this->config = $config;
-		$this->redis = $redis;
-	}
-
-	/**
-	 * @param \Illuminate\Contracts\Redis\Factory|null $redis
-	 *
-	 * @return \Ofcold\HttpSwoole\Websocket\Rooms\RoomContract
-	 */
-	public function prepare(RedisFactory $redis = null): RoomContract
-	{
-		$this->cleanRooms();
-
-		return $this;
-	}
-
-	/**
-	 * Get redis client.
-	 */
-	public function getRedis()
-	{
-		return $this->connection();
-	}
-
-	/**
-	 * Add multiple socket fds to a room.
-	 *
-	 * @param int fd
-	 * @param array|string rooms
-	 */
-	public function add(int $fd, $rooms)
-	{
-		$rooms = is_array($rooms) ? $rooms : [$rooms];
-
-		$this->addValue($fd, $rooms, RoomContract::DESCRIPTORS_KEY);
-
-		foreach ($rooms as $room) {
-			$this->addValue($room, [$fd], RoomContract::ROOMS_KEY);
-		}
-	}
-
-	/**
-	 * Delete multiple socket fds from a room.
-	 *
-	 * @param int fd
-	 * @param array|string rooms
-	 */
-	public function delete(int $fd, $rooms)
-	{
-		$rooms = is_array($rooms) ? $rooms : [$rooms];
-		$rooms = count($rooms) ? $rooms : $this->getRooms($fd);
-
-		$this->removeValue($fd, $rooms, RoomContract::DESCRIPTORS_KEY);
-
-		foreach ($rooms as $room) {
-			$this->removeValue($room, [$fd], RoomContract::ROOMS_KEY);
-		}
-	}
-
-	/**
-	 * Add value to redis.
-	 *
-	 * @param $key
-	 * @param array $values
-	 * @param string $table
-	 *
-	 * @return $this
-	 */
-	public function addValue($key, array $values, string $table)
-	{
-		$this->checkTable($table);
-		$redisKey = $this->getKey($key, $table);
-
-		$this->connection()->pipeline(function ($pipe) use ($redisKey, $values) {
-			foreach ($values as $value) {
-				$pipe->sadd($redisKey, $value);
-			}
-		});
-
-		return $this;
-	}
-
-	/**
-	 * Remove value from reddis.
-	 *
-	 * @param $key
-	 * @param array $values
-	 * @param string $table
-	 *
-	 * @return $this
-	 */
-	public function removeValue($key, array $values, string $table)
-	{
-		$this->checkTable($table);
-		$redisKey = $this->getKey($key, $table);
-
-		$this->connection()->pipeline(function ($pipe) use ($redisKey, $values) {
-			foreach ($values as $value) {
-				$pipe->srem($redisKey, $value);
-			}
-		});
-
-		return $this;
-	}
-
-	/**
-	 * Get all sockets by a room key.
-	 *
-	 * @param string room
-	 *
-	 * @return array
-	 */
-	public function getClients(string $room)
-	{
-		return $this->getValue($room, RoomContract::ROOMS_KEY) ?? [];
-	}
-
-	/**
-	 * Get all rooms by a fd.
-	 *
-	 * @param int fd
-	 *
-	 * @return array
-	 */
-	public function getRooms(int $fd)
-	{
-		return $this->getValue($fd, RoomContract::DESCRIPTORS_KEY) ?? [];
-	}
-
-	/**
-	 * Check table for rooms and descriptors.
-	 *
-	 * @param string $table
-	 */
-	protected function checkTable(string $table)
-	{
-		if (! in_array($table, [RoomContract::ROOMS_KEY, RoomContract::DESCRIPTORS_KEY])) {
-			throw new \InvalidArgumentException("Invalid table name: `{$table}`.");
-		}
-	}
-
-	/**
-	 * Get value.
-	 *
-	 * @param string $key
-	 * @param string $table
-	 *
-	 * @return array
-	 */
-	public function getValue(string $key, string $table)
-	{
-		$this->checkTable($table);
-
-		$result = $this->connection()->smembers($this->getKey($key, $table));
-
-		// Try to fix occasional non-array returned result
-		return is_array($result) ? $result : [];
-	}
-
-	/**
-	 * Get key.
-	 *
-	 * @param string $key
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	public function getKey(string $key, string $table)
-	{
-		return "{$table}:{$key}";
-	}
-
-	/**
-	 * Clean all rooms.
-	 */
-	protected function cleanRooms(): void
-	{
-		if (count($keys = $this->connection()->keys("*"))) {
-			$this->connection()->del($keys);
-		}
-	}
-
-	/**
-	 * Get the Redis connection instance.
-	 *
-	 * @return \Illuminate\Redis\Connections\Connection
-	 */
-	public function connection()
-	{
-		return $this->redis->connection('swoole');
-	}
+    /**
+     * @var array
+     */
+    protected $config;
+
+    /**
+     * RedisRoom constructor.
+     *
+     * @param array $config
+     */
+    public function __construct(array $config, RedisFactory $redis)
+    {
+        $this->config = $config;
+        $this->redis = $redis;
+    }
+
+    /**
+     * @param \Illuminate\Contracts\Redis\Factory|null $redis
+     *
+     * @return \Ofcold\HttpSwoole\Websocket\Rooms\RoomContract
+     */
+    public function prepare(RedisFactory $redis = null): RoomContract
+    {
+        $this->cleanRooms();
+
+        return $this;
+    }
+
+    /**
+     * Get redis client.
+     */
+    public function getRedis()
+    {
+        return $this->connection();
+    }
+
+    /**
+     * Add multiple socket fds to a room.
+     *
+     * @param int fd
+     * @param array|string rooms
+     */
+    public function add(int $fd, $rooms)
+    {
+        $rooms = is_array($rooms) ? $rooms : [$rooms];
+
+        $this->addValue($fd, $rooms, RoomContract::DESCRIPTORS_KEY);
+
+        foreach ($rooms as $room) {
+            $this->addValue($room, [$fd], RoomContract::ROOMS_KEY);
+        }
+    }
+
+    /**
+     * Delete multiple socket fds from a room.
+     *
+     * @param int fd
+     * @param array|string rooms
+     */
+    public function delete(int $fd, $rooms)
+    {
+        $rooms = is_array($rooms) ? $rooms : [$rooms];
+        $rooms = count($rooms) ? $rooms : $this->getRooms($fd);
+
+        $this->removeValue($fd, $rooms, RoomContract::DESCRIPTORS_KEY);
+
+        foreach ($rooms as $room) {
+            $this->removeValue($room, [$fd], RoomContract::ROOMS_KEY);
+        }
+    }
+
+    /**
+     * Add value to redis.
+     *
+     * @param $key
+     * @param array $values
+     * @param string $table
+     *
+     * @return $this
+     */
+    public function addValue($key, array $values, string $table)
+    {
+        $this->checkTable($table);
+        $redisKey = $this->getKey($key, $table);
+
+        $this->connection()->pipeline(function ($pipe) use ($redisKey, $values) {
+            foreach ($values as $value) {
+                $pipe->sadd($redisKey, $value);
+            }
+        });
+
+        return $this;
+    }
+
+    /**
+     * Remove value from reddis.
+     *
+     * @param $key
+     * @param array $values
+     * @param string $table
+     *
+     * @return $this
+     */
+    public function removeValue($key, array $values, string $table)
+    {
+        $this->checkTable($table);
+        $redisKey = $this->getKey($key, $table);
+
+        $this->connection()->pipeline(function ($pipe) use ($redisKey, $values) {
+            foreach ($values as $value) {
+                $pipe->srem($redisKey, $value);
+            }
+        });
+
+        return $this;
+    }
+
+    /**
+     * Get all sockets by a room key.
+     *
+     * @param string room
+     *
+     * @return array
+     */
+    public function getClients(string $room)
+    {
+        return $this->getValue($room, RoomContract::ROOMS_KEY) ?? [];
+    }
+
+    /**
+     * Get all rooms by a fd.
+     *
+     * @param int fd
+     *
+     * @return array
+     */
+    public function getRooms(int $fd)
+    {
+        return $this->getValue($fd, RoomContract::DESCRIPTORS_KEY) ?? [];
+    }
+
+    /**
+     * Check table for rooms and descriptors.
+     *
+     * @param string $table
+     */
+    protected function checkTable(string $table)
+    {
+        if (! in_array($table, [RoomContract::ROOMS_KEY, RoomContract::DESCRIPTORS_KEY])) {
+            throw new \InvalidArgumentException("Invalid table name: `{$table}`.");
+        }
+    }
+
+    /**
+     * Get value.
+     *
+     * @param string $key
+     * @param string $table
+     *
+     * @return array
+     */
+    public function getValue(string $key, string $table)
+    {
+        $this->checkTable($table);
+
+        $result = $this->connection()->smembers($this->getKey($key, $table));
+
+        // Try to fix occasional non-array returned result
+        return is_array($result) ? $result : [];
+    }
+
+    /**
+     * Get key.
+     *
+     * @param string $key
+     * @param string $table
+     *
+     * @return string
+     */
+    public function getKey(string $key, string $table)
+    {
+        return "{$table}:{$key}";
+    }
+
+    /**
+     * Clean all rooms.
+     */
+    protected function cleanRooms(): void
+    {
+        if (count($keys = $this->connection()->keys("*"))) {
+            $this->connection()->del($keys);
+        }
+    }
+
+    /**
+     * Get the Redis connection instance.
+     *
+     * @return \Illuminate\Redis\Connections\Connection
+     */
+    public function connection()
+    {
+        return $this->redis->connection('swoole');
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
 		$this->checkTable($table);
 		$redisKey = $this->getKey($key, $table);
 
-		$this->connection()->pipeline(function ($pipe) use ($redisKey, $values) {
+		$this->connection()->pipeline(function($pipe) use ($redisKey, $values) {
 			foreach ($values as $value) {
 				$pipe->sadd($redisKey, $value);
 			}
@@ -125,7 +125,7 @@ 
 		$this->checkTable($table);
 		$redisKey = $this->getKey($key, $table);
 
-		$this->connection()->pipeline(function ($pipe) use ($redisKey, $values) {
+		$this->connection()->pipeline(function($pipe) use ($redisKey, $values) {
 			foreach ($values as $value) {
 				$pipe->srem($redisKey, $value);
 			}
@@ -165,7 +165,7 @@ 
 	 */
 	protected function checkTable(string $table)
 	{
-		if (! in_array($table, [RoomContract::ROOMS_KEY, RoomContract::DESCRIPTORS_KEY])) {
+		if (!in_array($table, [RoomContract::ROOMS_KEY, RoomContract::DESCRIPTORS_KEY])) {
 			throw new \InvalidArgumentException("Invalid table name: `{$table}`.");
 		}
 	}