Merge pull request #1 from deviouspk/analysis-z3nD5L

Apply fixes from StyleCI

Author: anthonyvancauwenberghe

src/Console/StartWebSocketServer.php

@@ -116,6 +116,7 @@ protected function registerEchoRoutes()
     protected function registerCustomRoutes()
     {
         WebSocketsRouter::customRoutes();
+
         return $this;
     }
 

src/PubSub/Drivers/EmptyClient.php

@@ -10,7 +10,6 @@
 
 class EmptyClient implements ReplicationInterface
 {
-
     /**
      * Boot the pub/sub provider (open connections, initial subscriptions, etc).
      *
@@ -70,7 +69,6 @@ public function unsubscribe(string $appId, string $channel) : bool
      */
     public function joinChannel(string $appId, string $channel, string $socketId, string $data)
     {
-    
     }
 
     /**
@@ -83,7 +81,6 @@ public function joinChannel(string $appId, string $channel, string $socketId, st
      */
     public function leaveChannel(string $appId, string $channel, string $socketId)
     {
-
     }
 
     /**

src/WebSockets/Channels/Channel.php

@@ -52,7 +52,7 @@ protected function verifySignature(ConnectionInterface $connection, stdClass $pa
             $signature .= ":{$payload->channel_data}";
         }
 
-        if (!hash_equals(
+        if (! hash_equals(
             hash_hmac('sha256', $signature, $connection->app->secret),
             Str::after($payload->auth, ':'))
         ) {
@@ -83,7 +83,7 @@ public function unsubscribe(ConnectionInterface $connection)
         // Unsubscribe from the pub/sub backend
         $this->pubSub->unsubscribe($connection->app->id, $this->channelName);
 
-        if (!$this->hasConnections()) {
+        if (! $this->hasConnections()) {
             DashboardLogger::vacated($connection, $this->channelName);
         }
     }
@@ -94,7 +94,7 @@ protected function saveConnection(ConnectionInterface $connection)
 
         $this->subscribedConnections[$connection->socketId] = $connection;
 
-        if (!$hadConnectionsPreviously) {
+        if (! $hadConnectionsPreviously) {
             DashboardLogger::occupied($connection, $this->channelName);
         }
 

src/WebSocketsServiceProvider.php

@@ -2,10 +2,6 @@
 
 namespace BeyondCode\LaravelWebSockets;
 
-use BeyondCode\LaravelWebSockets\PubSub\Broadcasters\RedisPusherBroadcaster;
-use BeyondCode\LaravelWebSockets\PubSub\Drivers\EmptyClient;
-use BeyondCode\LaravelWebSockets\PubSub\Drivers\RedisClient;
-use BeyondCode\LaravelWebSockets\PubSub\ReplicationInterface;
 use Pusher\Pusher;
 use Psr\Log\LoggerInterface;
 use Illuminate\Support\Facades\Gate;
@@ -14,9 +10,13 @@
 use Illuminate\Broadcasting\BroadcastManager;
 use BeyondCode\LaravelWebSockets\Server\Router;
 use BeyondCode\LaravelWebSockets\Apps\AppProvider;
+use BeyondCode\LaravelWebSockets\PubSub\Drivers\EmptyClient;
+use BeyondCode\LaravelWebSockets\PubSub\Drivers\RedisClient;
+use BeyondCode\LaravelWebSockets\PubSub\ReplicationInterface;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\SendMessage;
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowDashboard;
+use BeyondCode\LaravelWebSockets\PubSub\Broadcasters\RedisPusherBroadcaster;
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\AuthenticateDashboard;
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\DashboardApiController;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManagers\ArrayChannelManager;
@@ -29,36 +29,36 @@ class WebSocketsServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->publishes([
-            __DIR__ . '/../config/websockets.php' => base_path('config/websockets.php'),
+            __DIR__.'/../config/websockets.php' => base_path('config/websockets.php'),
         ], 'config');
 
-        if (!class_exists('CreateWebSocketsStatisticsEntries')) {
+        if (! class_exists('CreateWebSocketsStatisticsEntries')) {
             $this->publishes([
-                __DIR__ . '/../database/migrations/create_websockets_statistics_entries_table.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_create_websockets_statistics_entries_table.php'),
+                __DIR__.'/../database/migrations/create_websockets_statistics_entries_table.php.stub' => database_path('migrations/'.date('Y_m_d_His', time()).'_create_websockets_statistics_entries_table.php'),
             ], 'migrations');
         }
 
         $this
             ->registerRoutes()
             ->registerDashboardGate();
 
-        $this->loadViewsFrom(__DIR__ . '/../resources/views/', 'websockets');
+        $this->loadViewsFrom(__DIR__.'/../resources/views/', 'websockets');
 
         $this->commands([
             Console\StartWebSocketServer::class,
             Console\CleanStatistics::class,
         ]);
 
         $this->configurePubSub();
-
     }
 
     protected function configurePubSub()
     {
         if (config('websockets.replication.enabled') !== true || config('websockets.replication.driver') !== 'redis') {
             $this->app->singleton(ReplicationInterface::class, function () {
-                return (new EmptyClient());
+                return new EmptyClient();
             });
+
             return;
         }
 
@@ -87,7 +87,7 @@ protected function configurePubSub()
 
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__ . '/../config/websockets.php', 'websockets');
+        $this->mergeConfigFrom(__DIR__.'/../config/websockets.php', 'websockets');
 
         $this->app->singleton('websockets.router', function () {
             return new Router();

tests/TestsReplication.php

@@ -2,10 +2,10 @@
 
 namespace BeyondCode\LaravelWebSockets\Tests;
 
-use BeyondCode\LaravelWebSockets\Tests\Mocks\FakeReplicationClient;
-use Illuminate\Support\Facades\Config;
 use React\EventLoop\Factory;
+use Illuminate\Support\Facades\Config;
 use BeyondCode\LaravelWebSockets\PubSub\ReplicationInterface;
+use BeyondCode\LaravelWebSockets\Tests\Mocks\FakeReplicationClient;
 
 trait TestsReplication
 {