From b8c60171afa89f9433d3183f3b4d92d461a060a2 Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Tue, 27 Nov 2018 15:58:52 +0100 Subject: [PATCH 1/3] wip --- src/Server/Router.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Server/Router.php b/src/Server/Router.php index c5afff5..1979bbe 100644 --- a/src/Server/Router.php +++ b/src/Server/Router.php @@ -4,7 +4,10 @@ namespace BeyondCode\LaravelWebSockets\Server; use BeyondCode\LaravelWebSockets\LaravelEcho; use BeyondCode\LaravelWebSockets\Server\Logger\MessageLogger; -use BeyondCode\LaravelWebSockets\Server\WebSocketController; +use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchChannel; +use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchChannels; +use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchUsers; +use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController; use Ratchet\WebSocket\WsServer; use Symfony\Component\Routing\Route; use Ratchet\Http\HttpServerInterface; @@ -67,11 +70,11 @@ class Router public function echo() { - $this->get('/app/{appKey}', LaravelEcho\Pusher\PusherServer::class); + $this->get('/app/{appKey}', PusherController::class); - $this->get('/apps/{appId}/channels', LaravelEcho\Http\Controllers\FetchChannels::class); - $this->get('/apps/{appId}/channels/{channelName}', LaravelEcho\Http\Controllers\FetchChannel::class); - $this->get('/apps/{appId}/channels/{channelName}/users', LaravelEcho\Http\Controllers\FetchUsers::class); + $this->get('/apps/{appId}/channels', FetchChannels::class); + $this->get('/apps/{appId}/channels/{channelName}', FetchChannel::class); + $this->get('/apps/{appId}/channels/{channelName}/users', FetchUsers::class); $this->post('/apps/{appId}/events', LaravelEcho\Http\Controllers\TriggerEvent::class); } From 6087789f3a7c1b2c94b9a650ccacc782bfcad10c Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Tue, 27 Nov 2018 15:59:02 +0100 Subject: [PATCH 2/3] wip --- .../Controllers/{EchoController.php => Controller.php} | 2 +- src/WebSocketServer/Controllers/FetchChannel.php | 2 +- src/WebSocketServer/Controllers/FetchChannels.php | 2 +- src/WebSocketServer/Controllers/FetchUsers.php | 2 +- src/WebSocketServer/Controllers/TriggerEvent.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/WebSocketServer/Controllers/{EchoController.php => Controller.php} (98%) diff --git a/src/WebSocketServer/Controllers/EchoController.php b/src/WebSocketServer/Controllers/Controller.php similarity index 98% rename from src/WebSocketServer/Controllers/EchoController.php rename to src/WebSocketServer/Controllers/Controller.php index 27a398c..fd69aa8 100644 --- a/src/WebSocketServer/Controllers/EchoController.php +++ b/src/WebSocketServer/Controllers/Controller.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager; -abstract class EchoController implements HttpServerInterface +abstract class Controller implements HttpServerInterface { /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */ protected $channelManager; diff --git a/src/WebSocketServer/Controllers/FetchChannel.php b/src/WebSocketServer/Controllers/FetchChannel.php index e7654c8..937e642 100644 --- a/src/WebSocketServer/Controllers/FetchChannel.php +++ b/src/WebSocketServer/Controllers/FetchChannel.php @@ -5,7 +5,7 @@ namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers; use Illuminate\Http\Request; use Symfony\Component\HttpKernel\Exception\HttpException; -class FetchChannel extends EchoController +class FetchChannel extends Controller { public function __invoke(Request $request) { diff --git a/src/WebSocketServer/Controllers/FetchChannels.php b/src/WebSocketServer/Controllers/FetchChannels.php index 9ef1e36..73d6049 100644 --- a/src/WebSocketServer/Controllers/FetchChannels.php +++ b/src/WebSocketServer/Controllers/FetchChannels.php @@ -6,7 +6,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Collection; use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel; -class FetchChannels extends EchoController +class FetchChannels extends Controller { public function __invoke(Request $request) { diff --git a/src/WebSocketServer/Controllers/FetchUsers.php b/src/WebSocketServer/Controllers/FetchUsers.php index b386c81..c66f1ef 100644 --- a/src/WebSocketServer/Controllers/FetchUsers.php +++ b/src/WebSocketServer/Controllers/FetchUsers.php @@ -7,7 +7,7 @@ use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\HttpException; use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel; -class FetchUsers extends EchoController +class FetchUsers extends Controller { public function __invoke(Request $request) { diff --git a/src/WebSocketServer/Controllers/TriggerEvent.php b/src/WebSocketServer/Controllers/TriggerEvent.php index 3e6369a..db49722 100644 --- a/src/WebSocketServer/Controllers/TriggerEvent.php +++ b/src/WebSocketServer/Controllers/TriggerEvent.php @@ -5,7 +5,7 @@ namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers; use BeyondCode\LaravelWebSockets\Events\ApiMessageSent; use Illuminate\Http\Request; -class TriggerEvent extends EchoController +class TriggerEvent extends Controller { public function __invoke(Request $request) { From a5245f70b7e2f1a8d1abde1d2d94c4781ade652c Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Tue, 27 Nov 2018 15:59:51 +0100 Subject: [PATCH 3/3] wip --- src/Server/Router.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Server/Router.php b/src/Server/Router.php index 1979bbe..f973282 100644 --- a/src/Server/Router.php +++ b/src/Server/Router.php @@ -7,6 +7,7 @@ use BeyondCode\LaravelWebSockets\Server\Logger\MessageLogger; use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchChannel; use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchChannels; use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchUsers; +use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\TriggerEvent; use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController; use Ratchet\WebSocket\WsServer; use Symfony\Component\Routing\Route; @@ -76,7 +77,7 @@ class Router $this->get('/apps/{appId}/channels/{channelName}', FetchChannel::class); $this->get('/apps/{appId}/channels/{channelName}/users', FetchUsers::class); - $this->post('/apps/{appId}/events', LaravelEcho\Http\Controllers\TriggerEvent::class); + $this->post('/apps/{appId}/events', TriggerEvent::class); } /**