Apply fixes from StyleCI (#3)

config/websockets.php

@@ -64,7 +64,7 @@
          * When the clean-command is executed, all recorded statistics older than
          * the number of days specified here will be deleted.
          */
-        'delete_statistics_older_than_days' => 60
+        'delete_statistics_older_than_days' => 60,
     ],
 
     /*
@@ -89,6 +89,6 @@
         /*
          * Passphrase for your local_cert file.
          */
-        'passphrase' => null
+        'passphrase' => null,
     ],
 ];

src/Apps/App.php

@@ -29,12 +29,12 @@ public static function findById($appId)
         return app(AppProvider::class)->findById($appId);
     }
 
-    public static function findByKey(string $appKey): ?App
+    public static function findByKey(string $appKey): ?self
     {
         return app(AppProvider::class)->findByKey($appKey);
     }
 
-    public static function findBySecret(string $appSecret): ?App
+    public static function findBySecret(string $appSecret): ?self
     {
         return app(AppProvider::class)->findBySecret($appSecret);
     }

src/Apps/AppProvider.php

@@ -12,4 +12,4 @@ public function findById($appId): ?App;
     public function findByKey(string $appKey): ?App;
 
     public function findBySecret(string $appSecret): ?App;
-}
+}

src/Apps/ConfigAppProvider.php

@@ -53,7 +53,7 @@ public function findBySecret(string $appSecret): ?App
 
     protected function instanciate(?array $appAttributes): ?App
     {
-        if (!$appAttributes) {
+        if (! $appAttributes) {
             return null;
         }
 
@@ -71,7 +71,6 @@ protected function instanciate(?array $appAttributes): ?App
             ->enableClientMessages($appAttributes['enable_client_messages'])
             ->enableStatistics($appAttributes['enable_statistics']);
 
-
         return $app;
     }
-}
+}

src/Console/CleanStatistics.php

@@ -8,7 +8,6 @@
 
 class CleanStatistics extends Command
 {
-
     protected $signature = 'websockets:clean
                             {appId? : (optional) The app id that will be cleaned.}';
 
@@ -36,4 +35,4 @@ public function handle()
 
         $this->comment('All done!');
     }
-}
+}

src/Console/StartWebSocketServer.php

@@ -2,23 +2,21 @@
 
 namespace BeyondCode\LaravelWebSockets\Console;
 
+use React\Socket\Connector;
+use Clue\React\Buzz\Browser;
+use Illuminate\Console\Command;
+use React\EventLoop\Factory as LoopFactory;
+use BeyondCode\LaravelWebSockets\Statistics\DnsResolver;
 use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger;
 use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter;
-use BeyondCode\LaravelWebSockets\Server\Logger\ConnectionLogger;
 use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger;
+use BeyondCode\LaravelWebSockets\Server\WebSocketServerFactory;
+use BeyondCode\LaravelWebSockets\Server\Logger\ConnectionLogger;
 use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger;
-use BeyondCode\LaravelWebSockets\Statistics\DnsResolver;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use BeyondCode\LaravelWebSockets\Statistics\Logger\HttpStatisticsLogger;
 use BeyondCode\LaravelWebSockets\Statistics\Logger\StatisticsLogger as StatisticsLoggerInterface;
 
-use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
-use Clue\React\Buzz\Browser;
-use Illuminate\Console\Command;
-use BeyondCode\LaravelWebSockets\Server\WebSocketServerFactory;
-
-use React\EventLoop\Factory as LoopFactory;
-use React\Socket\Connector;
-
 class StartWebSocketServer extends Command
 {
     protected $signature = 'websockets:serve {--host=0.0.0.0} {--port=6001} ';
@@ -49,16 +47,16 @@ public function handle()
     protected function configureStatisticsLogger()
     {
         $connector = new Connector($this->loop, [
-            'dns' => new DnsResolver()
+            'dns' => new DnsResolver(),
         ]);
 
         $browser = new Browser($this->loop, $connector);
 
-        app()->singleton(StatisticsLoggerInterface::class, function() use ($browser) {
+        app()->singleton(StatisticsLoggerInterface::class, function () use ($browser) {
             return new HttpStatisticsLogger(app(ChannelManager::class), $browser);
         });
 
-        $this->loop->addPeriodicTimer(config('websockets.statistics.interval_in_seconds'), function() {
+        $this->loop->addPeriodicTimer(config('websockets.statistics.interval_in_seconds'), function () {
             StatisticsLogger::save();
         });
 
@@ -67,7 +65,7 @@ protected function configureStatisticsLogger()
 
     protected function configureHttpLogger()
     {
-        app()->singleton(HttpLogger::class, function() {
+        app()->singleton(HttpLogger::class, function () {
             return (new HttpLogger($this->output))
                 ->enable(config('app.debug'))
                 ->verbose($this->output->isVerbose());
@@ -78,7 +76,7 @@ protected function configureHttpLogger()
 
     protected function configureMessageLogger()
     {
-        app()->singleton(WebsocketsLogger::class, function() {
+        app()->singleton(WebsocketsLogger::class, function () {
             return (new WebsocketsLogger($this->output))
                 ->enable(config('app.debug'))
                 ->verbose($this->output->isVerbose());
@@ -89,7 +87,7 @@ protected function configureMessageLogger()
 
     protected function configureConnectionLogger()
     {
-        app()->bind(ConnectionLogger::class, function() {
+        app()->bind(ConnectionLogger::class, function () {
             return (new ConnectionLogger($this->output))
                 ->enable(config('app.debug'))
                 ->verbose($this->output->isVerbose());
@@ -111,7 +109,7 @@ protected function startWebSocketServer()
 
         $routes = WebSocketsRouter::getRoutes();
 
-        /** 🛰 Start the server 🛰  */
+        /* 🛰 Start the server 🛰  */
         (new WebSocketServerFactory())
             ->setLoop($this->loop)
             ->useRoutes($routes)

src/Dashboard/DashboardLogger.php

@@ -2,9 +2,9 @@
 
 namespace BeyondCode\LaravelWebSockets\Dashboard;
 
+use stdClass;
 use Ratchet\ConnectionInterface;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
-use stdClass;
 
 class DashboardLogger
 {
@@ -76,7 +76,7 @@ public static function apiMessage($appId, string $channel, string $event, string
 
     public static function log($appId, string $type, array $attributes = [])
     {
-        $channelName = static::LOG_CHANNEL_PREFIX . $type;
+        $channelName = static::LOG_CHANNEL_PREFIX.$type;
 
         $channel = app(ChannelManager::class)->find($appId, $channelName);
 
@@ -85,9 +85,8 @@ public static function log($appId, string $type, array $attributes = [])
             'channel' => $channelName,
             'data' => [
                 'type' => $type,
-                'time' => strftime("%H:%M:%S")
+                'time' => strftime('%H:%M:%S'),
             ] + $attributes,
         ]);
     }
-
-}
+}

src/Dashboard/Http/Controllers/AuthenticateDashboard.php

@@ -16,4 +16,4 @@ public function __invoke(Request $request, Broadcaster $broadcaster)
          */
         return $broadcaster->validAuthenticationResponse($request, []);
     }
-}
+}

src/Dashboard/Http/Controllers/DashboardApiController.php

@@ -11,7 +11,7 @@ public function getStatistics($appId)
 
         $statisticData = $statistics->map(function ($statistic) {
             return [
-                'timestamp' => (string)$statistic->created_at,
+                'timestamp' => (string) $statistic->created_at,
                 'peak_connection_count' => $statistic->peak_connection_count,
                 'websocket_message_count' => $statistic->websocket_message_count,
                 'api_message_count' => $statistic->api_message_count,
@@ -30,7 +30,7 @@ public function getStatistics($appId)
             'api_message_count' => [
                 'x' => $statisticData->pluck('timestamp'),
                 'y' => $statisticData->pluck('api_message_count'),
-            ]
+            ],
         ];
     }
-}
+}

src/Dashboard/Http/Controllers/SendMessage.php

@@ -2,9 +2,9 @@
 
 namespace BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers;
 
-use BeyondCode\LaravelWebSockets\Statistics\Rules\AppId;
 use Pusher\Pusher;
 use Illuminate\Http\Request;
+use BeyondCode\LaravelWebSockets\Statistics\Rules\AppId;
 use Illuminate\Broadcasting\Broadcasters\PusherBroadcaster;
 
 class SendMessage

src/Dashboard/Http/Controllers/ShowDashboard.php

@@ -13,4 +13,4 @@ public function __invoke(Request $request, AppProvider $apps)
             'apps' => $apps->all(),
         ]);
     }
-}
+}

src/Dashboard/Http/Middleware/Authorize.php

@@ -10,4 +10,4 @@ public function handle($request, $next)
     {
         return Gate::check('viewWebSocketsDashboard') ? $next($request) : abort(403);
     }
-}
+}

src/Exceptions/InvalidApp.php

@@ -15,4 +15,4 @@ public static function valueIsRequired($name, $appId)
     {
         return new static("{$name} is required but was empty for app id `{$appId}`.");
     }
-}
+}

src/Exceptions/InvalidWebSocketController.php

@@ -12,4 +12,4 @@ public static function withController(string $controllerClass)
 
         return new static("Invalid WebSocket Controller provided. Expected instance of `{$messageComponentInterfaceClass}`, but received `{$controllerClass}`.");
     }
-}
+}

src/Facades/StatisticsLogger.php

@@ -2,9 +2,9 @@
 
 namespace BeyondCode\LaravelWebSockets\Facades;
 
+use Illuminate\Support\Facades\Facade;
 use BeyondCode\LaravelWebSockets\Statistics\Logger\FakeStatisticsLogger;
 use BeyondCode\LaravelWebSockets\Statistics\Logger\StatisticsLogger as StatisticsLoggerInterface;
-use Illuminate\Support\Facades\Facade;
 
 /** @see \BeyondCode\LaravelWebSockets\Statistics\Logger\HttpStatisticsLogger */
 class StatisticsLogger extends Facade

src/HttpApi/Controllers/Controller.php

@@ -2,10 +2,6 @@
 
 namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers;
 
-use BeyondCode\LaravelWebSockets\Apps\App;
-use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger;
-use BeyondCode\LaravelWebSockets\Events\ExceptionThrown;
-use BeyondCode\LaravelWebSockets\QueryParameters;
 use Exception;
 use Illuminate\Http\Request;
 use GuzzleHttp\Psr7\Response;
@@ -14,6 +10,8 @@
 use GuzzleHttp\Psr7\ServerRequest;
 use Ratchet\Http\HttpServerInterface;
 use Psr\Http\Message\RequestInterface;
+use BeyondCode\LaravelWebSockets\Apps\App;
+use BeyondCode\LaravelWebSockets\QueryParameters;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
@@ -50,24 +48,24 @@ public function onOpen(ConnectionInterface $connection, RequestInterface $reques
         $connection->close();
     }
 
-    function onMessage(ConnectionInterface $from, $msg)
+    public function onMessage(ConnectionInterface $from, $msg)
     {
     }
 
-    function onClose(ConnectionInterface $connection)
+    public function onClose(ConnectionInterface $connection)
     {
     }
 
-    function onError(ConnectionInterface $connection, Exception $exception)
+    public function onError(ConnectionInterface $connection, Exception $exception)
     {
         if (! $exception instanceof HttpException) {
             return;
         }
 
         $response = new Response($exception->getStatusCode(), [
-            'Content-Type' => 'application/json'
+            'Content-Type' => 'application/json',
         ], json_encode([
-            'error' => $exception->getMessage()
+            'error' => $exception->getMessage(),
         ]));
 
         $connection->send(\GuzzleHttp\Psr7\str($response));
@@ -86,11 +84,10 @@ public function ensureValidAppId(string $appId)
 
     protected function ensureValidSignature(Request $request)
     {
-
         $signature =
-            "{$request->getMethod()}\n/{$request->path()}\n" .
-            "auth_key={$request->get('auth_key')}" .
-            "&auth_timestamp={$request->get('auth_timestamp')}" .
+            "{$request->getMethod()}\n/{$request->path()}\n".
+            "auth_key={$request->get('auth_key')}".
+            "&auth_timestamp={$request->get('auth_timestamp')}".
             "&auth_version={$request->get('auth_version')}";
 
         if ($request->getContent() !== '') {
@@ -109,4 +106,4 @@ protected function ensureValidSignature(Request $request)
     }
 
     abstract public function __invoke(Request $request);
-}
+}

src/HttpApi/Controllers/FetchChannelController.php

@@ -2,7 +2,6 @@
 
 namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers;
 
-use BeyondCode\LaravelWebSockets\HttpApi\Controllers\Controller;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
@@ -18,4 +17,4 @@ public function __invoke(Request $request)
 
         return $channel->toArray();
     }
-}
+}

src/HttpApi/Controllers/FetchChannelsController.php

@@ -2,7 +2,6 @@
 
 namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers;
 
-use BeyondCode\LaravelWebSockets\HttpApi\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel;
@@ -26,7 +25,7 @@ public function __invoke(Request $request)
                 return [
                     'user_count' => count($channel->getUsers()),
                 ];
-            })->toArray()
+            })->toArray(),
         ];
     }
-}
+}

src/HttpApi/Controllers/FetchUsersController.php

@@ -2,7 +2,6 @@
 
 namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers;
 
-use BeyondCode\LaravelWebSockets\HttpApi\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -25,7 +24,7 @@ public function __invoke(Request $request)
         return [
             'users' => Collection::make($channel->getUsers())->map(function ($user) {
                 return ['id' => $user->user_id];
-            })->values()
+            })->values(),
         ];
     }
-}
+}