From 8f13738d95eeecf57de12c605da2cf52058c0a9e Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Tue, 27 Nov 2018 21:07:21 +0100 Subject: [PATCH] wip --- src/Exceptions/InvalidWebSocketController.php | 6 ++--- src/Server/Router.php | 2 +- src/Server/WebSocketController.php | 27 ------------------- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 src/Server/WebSocketController.php diff --git a/src/Exceptions/InvalidWebSocketController.php b/src/Exceptions/InvalidWebSocketController.php index 4a61c1c..2c03d9c 100644 --- a/src/Exceptions/InvalidWebSocketController.php +++ b/src/Exceptions/InvalidWebSocketController.php @@ -2,14 +2,14 @@ namespace BeyondCode\LaravelWebSockets\Exceptions; -use BeyondCode\LaravelWebSockets\Server\WebSocketController; +use Ratchet\WebSocket\MessageComponentInterface; class InvalidWebSocketController extends \Exception { public static function withController(string $controllerClass) { - $websocketControllerClass = WebSocketController::class; + $messageComponentInterfaceClass = MessageComponentInterface::class; - return new static("Invalid WebSocket Controller provided. Expected instance of `{$websocketControllerClass}`, but received `{$controllerClass}`."); + return new static("Invalid WebSocket Controller provided. Expected instance of `{$messageComponentInterfaceClass}`, but received `{$controllerClass}`."); } } \ No newline at end of file diff --git a/src/Server/Router.php b/src/Server/Router.php index eef48f0..41a7bc8 100644 --- a/src/Server/Router.php +++ b/src/Server/Router.php @@ -27,7 +27,7 @@ class Router public function websocket(string $uri, $action) { - if (!is_subclass_of($action, WebSocketController::class)) { + if (!is_subclass_of($action, MessageComponentInterface::class)) { throw InvalidWebSocketController::withController($action); } diff --git a/src/Server/WebSocketController.php b/src/Server/WebSocketController.php deleted file mode 100644 index d2bda8f..0000000 --- a/src/Server/WebSocketController.php +++ /dev/null @@ -1,27 +0,0 @@ -