From dc87bfb221540724387712cdeb39b5f783efd6c0 Mon Sep 17 00:00:00 2001 From: freek Date: Fri, 30 Nov 2018 15:52:11 +0100 Subject: [PATCH] nitpick --- src/Console/StartWebSocketServer.php | 6 +++--- src/Server/Logger/Logger.php | 2 +- .../Logger/{WebsocketLogger.php => WebsocketsLogger.php} | 6 +++--- src/Server/Router.php | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename src/Server/Logger/{WebsocketLogger.php => WebsocketsLogger.php} (92%) diff --git a/src/Console/StartWebSocketServer.php b/src/Console/StartWebSocketServer.php index b2508bb..1e9acea 100644 --- a/src/Console/StartWebSocketServer.php +++ b/src/Console/StartWebSocketServer.php @@ -5,7 +5,7 @@ namespace BeyondCode\LaravelWebSockets\Console; use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter; use BeyondCode\LaravelWebSockets\Server\Logger\ConnectionLogger; use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger; -use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketLogger; +use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger; use Illuminate\Console\Command; use BeyondCode\LaravelWebSockets\Server\WebSocketServerFactory; @@ -40,8 +40,8 @@ class StartWebSocketServer extends Command protected function configureMessageLogger() { - app()->singleton(WebsocketLogger::class, function() { - return (new WebsocketLogger($this->output)) + app()->singleton(WebsocketsLogger::class, function() { + return (new WebsocketsLogger($this->output)) ->enable(config('app.debug')) ->verbose($this->output->isVerbose()); }); diff --git a/src/Server/Logger/Logger.php b/src/Server/Logger/Logger.php index 756c35e..434d4c8 100644 --- a/src/Server/Logger/Logger.php +++ b/src/Server/Logger/Logger.php @@ -18,7 +18,7 @@ class Logger public static function isEnabled(): bool { - return app(WebsocketLogger::class)->enabled; + return app(WebsocketsLogger::class)->enabled; } public function __construct(OutputInterface $consoleOutput) diff --git a/src/Server/Logger/WebsocketLogger.php b/src/Server/Logger/WebsocketsLogger.php similarity index 92% rename from src/Server/Logger/WebsocketLogger.php rename to src/Server/Logger/WebsocketsLogger.php index ac031be..9444179 100644 --- a/src/Server/Logger/WebsocketLogger.php +++ b/src/Server/Logger/WebsocketsLogger.php @@ -8,14 +8,14 @@ use Ratchet\ConnectionInterface; use Ratchet\RFC6455\Messaging\MessageInterface; use Ratchet\WebSocket\MessageComponentInterface; -class WebsocketLogger extends Logger implements MessageComponentInterface +class WebsocketsLogger extends Logger implements MessageComponentInterface { /** @var \Ratchet\Http\HttpServerInterface */ protected $app; - public static function decorate(MessageComponentInterface $app): WebsocketLogger + public static function decorate(MessageComponentInterface $app): WebsocketsLogger { - $logger = app(WebsocketLogger::class); + $logger = app(WebsocketsLogger::class); return $logger->setApp($app); } diff --git a/src/Server/Router.php b/src/Server/Router.php index 34d47e1..5117040 100644 --- a/src/Server/Router.php +++ b/src/Server/Router.php @@ -2,7 +2,7 @@ namespace BeyondCode\LaravelWebSockets\Server; -use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketLogger; +use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController; @@ -97,8 +97,8 @@ class Router { $app = app($action); - if (WebsocketLogger::isEnabled()) { - $app = WebsocketLogger::decorate($app); + if (WebsocketsLogger::isEnabled()) { + $app = WebsocketsLogger::decorate($app); } return new WsServer($app);