beyondcode / laravel-websockets

src/Helpers.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         // and the values are on odd indexes. This way, we know which
         // ones are keys and which ones are values and their get combined
         // later to form the key => value array.
-        [$keys, $values] = collect($list)->partition(function ($value, $key) {
+        [$keys, $values] = collect($list)->partition(function($value, $key) {
             return $key % 2 === 0;
         });
 

src/API/FetchUsers.php

Spacing +3 added lines, -3 removed lines

@@ -16,14 +16,14 @@
      */
     public function __invoke(Request $request)
     {
-        if (! Str::startsWith($request->channelName, 'presence-')) {
+        if (!Str::startsWith($request->channelName, 'presence-')) {
             return new HttpException(400, "Invalid presence channel `{$request->channelName}`");
         }
 
         return $this->channelManager
             ->getChannelMembers($request->appId, $request->channelName)
-            ->then(function ($members) {
-                $users = collect($members)->map(function ($user) {
+            ->then(function($members) {
+                $users = collect($members)->map(function($user) {
                     return ['id' => $user->user_id];
                 })->values()->toArray();
 

src/API/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -85,7 +85,7 @@ 
 
         $this->requestBuffer = (string) $request->getBody();
 
-        if (! $this->verifyContentLength()) {
+        if (!$this->verifyContentLength()) {
             return;
         }
 
@@ -103,7 +103,7 @@ 
     {
         $this->requestBuffer .= $msg;
 
-        if (! $this->verifyContentLength()) {
+        if (!$this->verifyContentLength()) {
             return;
         }
 
@@ -130,7 +130,7 @@ 
      */
     public function onError(ConnectionInterface $connection, Exception $exception)
     {
-        if (! $exception instanceof HttpException) {
+        if (!$exception instanceof HttpException) {
             return;
         }
 
@@ -151,7 +151,7 @@ 
      */
     protected function findContentLength(array $headers): int
     {
-        return Collection::make($headers)->first(function ($values, $header) {
+        return Collection::make($headers)->first(function($values, $header) {
             return strtolower($header) === 'content-length';
         })[0] ?? 0;
     }
@@ -192,7 +192,7 @@ 
 
         // Allow for async IO in the controller action
         if ($response instanceof PromiseInterface) {
-            $response->then(function ($response) use ($connection) {
+            $response->then(function($response) use ($connection) {
                 $this->sendAndClose($connection, $response);
             });
 
@@ -228,7 +228,7 @@ 
      */
     public function ensureValidAppId($appId)
     {
-        if (! $appId || ! $this->app = App::findById($appId)) {
+        if (!$appId || !$this->app = App::findById($appId)) {
             throw new HttpException(401, "Unknown app id `{$appId}` provided.");
         }
 

src/API/FetchChannel.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
 
         return $this->channelManager
             ->getGlobalConnectionsCount($request->appId, $request->channelName)
-            ->then(function ($connectionsCount) use ($request) {
+            ->then(function($connectionsCount) use ($request) {
                 // For the presence channels, we need a slightly different response
                 // that need an additional call.
                 if (Str::startsWith($request->channelName, 'presence-')) {
                     return $this->channelManager
                         ->getChannelsMembersCount($request->appId, [$request->channelName])
-                        ->then(function ($channelMembers) use ($connectionsCount, $request) {
+                        ->then(function($channelMembers) use ($connectionsCount, $request) {
                             return [
                                 'occupied' => $connectionsCount > 0,
                                 'subscription_count' => $connectionsCount,

src/Statistics/Collectors/RedisCollector.php

Spacing +13 added lines, -13 removed lines

@@ -85,7 +85,7 @@ 
                 $this->channelManager->getStatsRedisHash($appId, null),
                 'current_connections_count', 1
             )
-            ->then(function ($currentConnectionsCount) use ($appId) {
+            ->then(function($currentConnectionsCount) use ($appId) {
                 // Get the peak connections count from Redis.
                 $this->channelManager
                     ->getPublishClient()
@@ -93,7 +93,7 @@ 
                         $this->channelManager->getStatsRedisHash($appId, null),
                         'peak_connections_count'
                     )
-                    ->then(function ($currentPeakConnectionCount) use ($currentConnectionsCount, $appId) {
+                    ->then(function($currentPeakConnectionCount) use ($currentConnectionsCount, $appId) {
                         // Extract the greatest number between the current peak connection count
                         // and the current connection number.
                         $peakConnectionsCount = is_null($currentPeakConnectionCount)
@@ -122,12 +122,12 @@ 
         // Decrement the current connections count by 1.
         $this->ensureAppIsInSet($appId)
             ->hincrby($this->channelManager->getStatsRedisHash($appId, null), 'current_connections_count', -1)
-            ->then(function ($currentConnectionsCount) use ($appId) {
+            ->then(function($currentConnectionsCount) use ($appId) {
                 // Get the peak connections count from Redis.
                 $this->channelManager
                     ->getPublishClient()
                     ->hget($this->channelManager->getStatsRedisHash($appId, null), 'peak_connections_count')
-                    ->then(function ($currentPeakConnectionCount) use ($currentConnectionsCount, $appId) {
+                    ->then(function($currentPeakConnectionCount) use ($currentConnectionsCount, $appId) {
                         // Extract the greatest number between the current peak connection count
                         // and the current connection number.
                         $peakConnectionsCount = is_null($currentPeakConnectionCount)
@@ -152,17 +152,17 @@ 
      */
     public function save()
     {
-        $this->lock()->get(function () {
+        $this->lock()->get(function() {
             $this->channelManager
                 ->getPublishClient()
                 ->smembers(static::$redisSetName)
-                ->then(function ($members) {
+                ->then(function($members) {
                     foreach ($members as $appId) {
                         $this->channelManager
                             ->getPublishClient()
                             ->hgetall($this->channelManager->getStatsRedisHash($appId, null))
-                            ->then(function ($list) use ($appId) {
-                                if (! $list) {
+                            ->then(function($list) use ($appId) {
+                                if (!$list) {
                                     return;
                                 }
 
@@ -178,7 +178,7 @@ 
 
                                 $this->channelManager
                                     ->getGlobalConnectionsCount($appId)
-                                    ->then(function ($currentConnectionsCount) use ($appId) {
+                                    ->then(function($currentConnectionsCount) use ($appId) {
                                         $currentConnectionsCount === 0 || is_null($currentConnectionsCount)
                                             ? $this->resetAppTraces($appId)
                                             : $this->resetStatistics($appId, $currentConnectionsCount);
@@ -196,7 +196,7 @@ 
      */
     public function flush()
     {
-        $this->getStatistics()->then(function ($statistics) {
+        $this->getStatistics()->then(function($statistics) {
             foreach ($statistics as $appId => $statistic) {
                 $this->resetAppTraces($appId);
             }
@@ -213,14 +213,14 @@ 
         return $this->channelManager
             ->getPublishClient()
             ->smembers(static::$redisSetName)
-            ->then(function ($members) {
+            ->then(function($members) {
                 $appsWithStatistics = [];
 
                 foreach ($members as $appId) {
                     $this->channelManager
                         ->getPublishClient()
                         ->hgetall($this->channelManager->getStatsRedisHash($appId, null))
-                        ->then(function ($list) use ($appId, &$appsWithStatistics) {
+                        ->then(function($list) use ($appId, &$appsWithStatistics) {
                             $appsWithStatistics[$appId] = $this->arrayToStatisticInstance(
                                 $appId, Helpers::redisListToArray($list)
                             );
@@ -242,7 +242,7 @@ 
         return $this->channelManager
             ->getPublishClient()
             ->hgetall($this->channelManager->getStatsRedisHash($appId, null))
-            ->then(function ($list) use ($appId) {
+            ->then(function($list) use ($appId) {
                 return $this->arrayToStatisticInstance(
                     $appId, Helpers::redisListToArray($list)
                 );

src/Statistics/Collectors/MemoryCollector.php

Spacing +4 added lines, -4 removed lines

@@ -90,9 +90,9 @@ 
      */
     public function save()
     {
-        $this->getStatistics()->then(function ($statistics) {
+        $this->getStatistics()->then(function($statistics) {
             foreach ($statistics as $appId => $statistic) {
-                if (! $statistic->isEnabled()) {
+                if (!$statistic->isEnabled()) {
                     continue;
                 }
 
@@ -106,7 +106,7 @@ 
 
                 $this->channelManager
                     ->getGlobalConnectionsCount($appId)
-                    ->then(function ($connections) use ($statistic) {
+                    ->then(function($connections) use ($statistic) {
                         $statistic->reset(
                             is_null($connections) ? 0 : $connections
                         );
@@ -168,7 +168,7 @@ 
      */
     protected function findOrMake($appId): Statistic
     {
-        if (! isset($this->statistics[$appId])) {
+        if (!isset($this->statistics[$appId])) {
             $this->statistics[$appId] = Statistic::new($appId);
         }
 

src/Statistics/Stores/DatabaseStore.php

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
     public static function delete(Carbon $moment, $appId = null): int
     {
         return static::$model::where('created_at', '<', $moment->toDateTimeString())
-            ->when(! is_null($appId), function ($query) use ($appId) {
+            ->when(!is_null($appId), function($query) use ($appId) {
                 return $query->whereAppId($appId);
             })
             ->delete();
@@ -55,9 +55,9 @@ 
     public function getRawRecords(callable $processQuery = null)
     {
         return static::$model::query()
-            ->when(! is_null($processQuery), function ($query) use ($processQuery) {
+            ->when(!is_null($processQuery), function($query) use ($processQuery) {
                 return call_user_func($processQuery, $query);
-            }, function ($query) {
+            }, function($query) {
                 return $query->latest()->limit(120);
             })->get();
     }
@@ -72,10 +72,10 @@ 
     public function getRecords(callable $processQuery = null, callable $processCollection = null): array
     {
         return $this->getRawRecords($processQuery)
-            ->when(! is_null($processCollection), function ($collection) use ($processCollection) {
+            ->when(!is_null($processCollection), function($collection) use ($processCollection) {
                 return call_user_func($processCollection, $collection);
             })
-            ->map(function (Model $statistic) {
+            ->map(function(Model $statistic) {
                 return $this->statisticToArray($statistic);
             })
             ->toArray();

src/Console/Commands/StartServer.php

Spacing +13 added lines, -13 removed lines

@@ -106,7 +106,7 @@ 
      */
     protected function configureManagers()
     {
-        $this->laravel->singleton(ChannelManager::class, function ($app) {
+        $this->laravel->singleton(ChannelManager::class, function($app) {
             $config = $app['config']['websockets'];
             $mode = $config['replication']['mode'] ?? 'local';
 
@@ -124,10 +124,10 @@ 
      */
     protected function configureStatistics()
     {
-        if (! $this->option('disable-statistics')) {
+        if (!$this->option('disable-statistics')) {
             $intervalInSeconds = $this->option('statistics-interval') ?: config('websockets.statistics.interval_in_seconds', 3600);
 
-            $this->loop->addPeriodicTimer($intervalInSeconds, function () {
+            $this->loop->addPeriodicTimer($intervalInSeconds, function() {
                 $this->line('Saving statistics...');
 
                 StatisticsCollectorFacade::save();
@@ -144,7 +144,7 @@ 
     {
         $this->lastRestart = $this->getLastRestart();
 
-        $this->loop->addPeriodicTimer(10, function () {
+        $this->loop->addPeriodicTimer(10, function() {
             if ($this->getLastRestart() !== $this->lastRestart) {
                 $this->triggerSoftShutdown();
             }
@@ -173,17 +173,17 @@ 
         // to receive new connections, close the current connections,
         // then stopping the loop.
 
-        if (! extension_loaded('pcntl')) {
+        if (!extension_loaded('pcntl')) {
             return;
         }
 
-        $this->loop->addSignal(SIGTERM, function () {
+        $this->loop->addSignal(SIGTERM, function() {
             $this->line('Closing existing connections...');
 
             $this->triggerSoftShutdown();
         });
 
-        $this->loop->addSignal(SIGINT, function () {
+        $this->loop->addSignal(SIGINT, function() {
             $this->line('Closing existing connections...');
 
             $this->triggerSoftShutdown();
@@ -198,7 +198,7 @@ 
      */
     protected function configurePongTracker()
     {
-        $this->loop->addPeriodicTimer(10, function () {
+        $this->loop->addPeriodicTimer(10, function() {
             $this->laravel
                 ->make(ChannelManager::class)
                 ->removeObsoleteConnections();
@@ -212,7 +212,7 @@ 
      */
     protected function configureHttpLogger()
     {
-        $this->laravel->singleton(HttpLogger::class, function ($app) {
+        $this->laravel->singleton(HttpLogger::class, function($app) {
             return (new HttpLogger($this->output))
                 ->enable($this->option('debug') ?: ($app['config']['app']['debug'] ?? false))
                 ->verbose($this->output->isVerbose());
@@ -226,7 +226,7 @@ 
      */
     protected function configureMessageLogger()
     {
-        $this->laravel->singleton(WebSocketsLogger::class, function ($app) {
+        $this->laravel->singleton(WebSocketsLogger::class, function($app) {
             return (new WebSocketsLogger($this->output))
                 ->enable($this->option('debug') ?: ($app['config']['app']['debug'] ?? false))
                 ->verbose($this->output->isVerbose());
@@ -240,7 +240,7 @@ 
      */
     protected function configureConnectionLogger()
     {
-        $this->laravel->bind(ConnectionLogger::class, function ($app) {
+        $this->laravel->bind(ConnectionLogger::class, function($app) {
             return (new ConnectionLogger($this->output))
                 ->enable($app['config']['app']['debug'] ?? false)
                 ->verbose($this->output->isVerbose());
@@ -310,12 +310,12 @@ 
         // Get all local connections and close them. They will
         // be automatically be unsubscribed from all channels.
         $channelManager->getLocalConnections()
-            ->then(function ($connections) {
+            ->then(function($connections) {
                 foreach ($connections as $connection) {
                     $connection->close();
                 }
             })
-            ->then(function () {
+            ->then(function() {
                 $this->loop->stop();
             });
     }

src/ChannelManagers/RedisChannelManager.php

Spacing +28 added lines, -28 removed lines

@@ -71,7 +71,7 @@ 
         $this->publishClient = $factory->createLazyClient($connectionUri);
         $this->subscribeClient = $factory->createLazyClient($connectionUri);
 
-        $this->subscribeClient->on('message', function ($channel, $payload) {
+        $this->subscribeClient->on('message', function($channel, $payload) {
             $this->onMessage($channel, $payload);
         });
     }
@@ -99,12 +99,12 @@ 
     public function unsubscribeFromAllChannels(ConnectionInterface $connection): PromiseInterface
     {
         return $this->getGlobalChannels($connection->app->id)
-            ->then(function ($channels) use ($connection) {
+            ->then(function($channels) use ($connection) {
                 foreach ($channels as $channel) {
                     $this->unsubscribeFromChannel($connection, $channel, new stdClass);
                 }
             })
-            ->then(function () use ($connection) {
+            ->then(function() use ($connection) {
                 return parent::unsubscribeFromAllChannels($connection);
             });
     }
@@ -120,16 +120,16 @@ 
     public function subscribeToChannel(ConnectionInterface $connection, string $channelName, stdClass $payload): PromiseInterface
     {
         return $this->subscribeToTopic($connection->app->id, $channelName)
-            ->then(function () use ($connection) {
+            ->then(function() use ($connection) {
                 return $this->addConnectionToSet($connection, Carbon::now());
             })
-            ->then(function () use ($connection, $channelName) {
+            ->then(function() use ($connection, $channelName) {
                 return $this->addChannelToSet($connection->app->id, $channelName);
             })
-            ->then(function () use ($connection, $channelName) {
+            ->then(function() use ($connection, $channelName) {
                 return $this->incrementSubscriptionsCount($connection->app->id, $channelName, 1);
             })
-            ->then(function () use ($connection, $channelName, $payload) {
+            ->then(function() use ($connection, $channelName, $payload) {
                 return parent::subscribeToChannel($connection, $channelName, $payload);
             });
     }
@@ -145,10 +145,10 @@ 
     public function unsubscribeFromChannel(ConnectionInterface $connection, string $channelName, stdClass $payload): PromiseInterface
     {
         return parent::unsubscribeFromChannel($connection, $channelName, $payload)
-            ->then(function () use ($connection, $channelName) {
+            ->then(function() use ($connection, $channelName) {
                 return $this->decrementSubscriptionsCount($connection->app->id, $channelName);
             })
-            ->then(function ($count) use ($connection, $channelName) {
+            ->then(function($count) use ($connection, $channelName) {
                 $this->removeConnectionFromSet($connection);
                 // If the total connections count gets to 0 after unsubscribe,
                 // try again to check & unsubscribe from the PubSub topic if needed.
@@ -169,7 +169,7 @@ 
     public function subscribeToApp($appId): PromiseInterface
     {
         return $this->subscribeToTopic($appId)
-            ->then(function () use ($appId) {
+            ->then(function() use ($appId) {
                 return $this->incrementSubscriptionsCount($appId);
             });
     }
@@ -184,7 +184,7 @@ 
     public function unsubscribeFromApp($appId): PromiseInterface
     {
         return $this->unsubscribeFromTopic($appId)
-            ->then(function () use ($appId) {
+            ->then(function() use ($appId) {
                 return $this->decrementSubscriptionsCount($appId);
             });
     }
@@ -201,7 +201,7 @@ 
     {
         return $this->publishClient
             ->hget($this->getStatsRedisHash($appId, $channelName), 'connections')
-            ->then(function ($count) {
+            ->then(function($count) {
                 return is_null($count) ? 0 : (int) $count;
             });
     }
@@ -224,7 +224,7 @@ 
 
         return $this->publishClient
             ->publish($this->getRedisTopicName($appId, $channel), json_encode($payload))
-            ->then(function () use ($appId, $socketId, $channel, $payload, $serverId) {
+            ->then(function() use ($appId, $socketId, $channel, $payload, $serverId) {
                 return parent::broadcastAcrossServers($appId, $socketId, $channel, $payload, $serverId);
             });
     }
@@ -241,10 +241,10 @@ 
     public function userJoinedPresenceChannel(ConnectionInterface $connection, stdClass $user, string $channel, stdClass $payload): PromiseInterface
     {
         return $this->storeUserData($connection->app->id, $channel, $connection->socketId, json_encode($user))
-            ->then(function () use ($connection, $channel, $user) {
+            ->then(function() use ($connection, $channel, $user) {
                 return $this->addUserSocket($connection->app->id, $channel, $user, $connection->socketId);
             })
-            ->then(function () use ($connection, $user, $channel, $payload) {
+            ->then(function() use ($connection, $user, $channel, $payload) {
                 return parent::userJoinedPresenceChannel($connection, $user, $channel, $payload);
             });
     }
@@ -261,10 +261,10 @@ 
     public function userLeftPresenceChannel(ConnectionInterface $connection, stdClass $user, string $channel): PromiseInterface
     {
         return $this->removeUserData($connection->app->id, $channel, $connection->socketId)
-            ->then(function () use ($connection, $channel, $user) {
+            ->then(function() use ($connection, $channel, $user) {
                 return $this->removeUserSocket($connection->app->id, $channel, $user, $connection->socketId);
             })
-            ->then(function () use ($connection, $user, $channel) {
+            ->then(function() use ($connection, $user, $channel) {
                 return parent::userLeftPresenceChannel($connection, $user, $channel);
             });
     }
@@ -280,8 +280,8 @@ 
     {
         return $this->publishClient
             ->hgetall($this->getUsersRedisHash($appId, $channel))
-            ->then(function ($list) {
-                return collect(Helpers::redisListToArray($list))->map(function ($user) {
+            ->then(function($list) {
+                return collect(Helpers::redisListToArray($list))->map(function($user) {
                     return json_decode($user);
                 })->unique('user_id')->toArray();
             });
@@ -319,7 +319,7 @@ 
         }
 
         return $this->publishClient->exec()
-            ->then(function ($data) use ($channelNames) {
+            ->then(function($data) use ($channelNames) {
                 return array_combine($channelNames, $data);
             });
     }
@@ -349,7 +349,7 @@ 
     {
         // This will update the score with the current timestamp.
         return $this->addConnectionToSet($connection, Carbon::now())
-            ->then(function () use ($connection) {
+            ->then(function() use ($connection) {
                 $payload = [
                     'socketId' => $connection->socketId,
                     'appId' => $connection->app->id,
@@ -359,7 +359,7 @@ 
                 return $this->publishClient
                     ->publish($this->getPongRedisHash($connection->app->id), json_encode($payload));
             })
-            ->then(function () use ($connection) {
+            ->then(function() use ($connection) {
                 return parent::connectionPonged($connection);
             });
     }
@@ -373,9 +373,9 @@ 
     {
         $lock = $this->lock();
         try {
-            $lock->get(function () {
+            $lock->get(function() {
                 $this->getConnectionsFromSet(0, now()->subMinutes(2)->format('U'))
-                    ->then(function ($connections) {
+                    ->then(function($connections) {
                         foreach ($connections as $socketId => $appId) {
                             $connection = $this->fakeConnectionForApp($appId, $socketId);
 
@@ -413,7 +413,7 @@ 
 
         $payload->channel = Str::after($redisChannel, "{$payload->appId}:");
 
-        if (! $channel = $this->find($payload->appId, $payload->channel)) {
+        if (!$channel = $this->find($payload->appId, $payload->channel)) {
             return;
         }
 
@@ -438,7 +438,7 @@ 
 
     public function find($appId, string $channel)
     {
-        if (! $channelInstance = parent::find($appId, $channel)) {
+        if (!$channelInstance = parent::find($appId, $channel)) {
             $class = $this->getChannelClassName($channel);
             $this->channels[$appId][$channel] = new $class($channel);
         }
@@ -581,8 +581,8 @@ 
 
         return $this->publishClient
             ->zrangebyscore($this->getSocketsRedisHash(), $start, $stop)
-            ->then(function ($list) {
-                return collect($list)->mapWithKeys(function ($appWithSocket) {
+            ->then(function($list) {
+                return collect($list)->mapWithKeys(function($appWithSocket) {
                     [$appId, $socketId] = explode(':', $appWithSocket);
 
                     return [$socketId => $appId];