From 2eb3a01169dc4e82f02984cb047a5ece4584940f Mon Sep 17 00:00:00 2001 From: freek Date: Tue, 27 Nov 2018 21:15:29 +0100 Subject: [PATCH] add controller prefixes --- ...tchChannel.php => FetchChannelController.php} | 2 +- ...hChannels.php => FetchChannelsController.php} | 2 +- .../{FetchUsers.php => FetchUsersController.php} | 2 +- ...iggerEvent.php => TriggerEventController.php} | 2 +- src/Server/Router.php | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) rename src/HttpApi/Controllers/{FetchChannel.php => FetchChannelController.php} (91%) rename src/HttpApi/Controllers/{FetchChannels.php => FetchChannelsController.php} (95%) rename src/HttpApi/Controllers/{FetchUsers.php => FetchUsersController.php} (95%) rename src/HttpApi/Controllers/{TriggerEvent.php => TriggerEventController.php} (95%) diff --git a/src/HttpApi/Controllers/FetchChannel.php b/src/HttpApi/Controllers/FetchChannelController.php similarity index 91% rename from src/HttpApi/Controllers/FetchChannel.php rename to src/HttpApi/Controllers/FetchChannelController.php index 2cb44e3..af7a96e 100644 --- a/src/HttpApi/Controllers/FetchChannel.php +++ b/src/HttpApi/Controllers/FetchChannelController.php @@ -6,7 +6,7 @@ use BeyondCode\LaravelWebSockets\HttpApi\Controllers\Controller; use Illuminate\Http\Request; use Symfony\Component\HttpKernel\Exception\HttpException; -class FetchChannel extends Controller +class FetchChannelController extends Controller { public function __invoke(Request $request) { diff --git a/src/HttpApi/Controllers/FetchChannels.php b/src/HttpApi/Controllers/FetchChannelsController.php similarity index 95% rename from src/HttpApi/Controllers/FetchChannels.php rename to src/HttpApi/Controllers/FetchChannelsController.php index 6b0960d..26564d6 100644 --- a/src/HttpApi/Controllers/FetchChannels.php +++ b/src/HttpApi/Controllers/FetchChannelsController.php @@ -7,7 +7,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Collection; use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; -class FetchChannels extends Controller +class FetchChannelsController extends Controller { public function __invoke(Request $request) { diff --git a/src/HttpApi/Controllers/FetchUsers.php b/src/HttpApi/Controllers/FetchUsersController.php similarity index 95% rename from src/HttpApi/Controllers/FetchUsers.php rename to src/HttpApi/Controllers/FetchUsersController.php index a6f4930..9b3551d 100644 --- a/src/HttpApi/Controllers/FetchUsers.php +++ b/src/HttpApi/Controllers/FetchUsersController.php @@ -8,7 +8,7 @@ use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\HttpException; use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; -class FetchUsers extends Controller +class FetchUsersController extends Controller { public function __invoke(Request $request) { diff --git a/src/HttpApi/Controllers/TriggerEvent.php b/src/HttpApi/Controllers/TriggerEventController.php similarity index 95% rename from src/HttpApi/Controllers/TriggerEvent.php rename to src/HttpApi/Controllers/TriggerEventController.php index 78684f3..fa3b19d 100644 --- a/src/HttpApi/Controllers/TriggerEvent.php +++ b/src/HttpApi/Controllers/TriggerEventController.php @@ -6,7 +6,7 @@ use BeyondCode\LaravelWebSockets\Events\ApiMessageSent; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\Controller; use Illuminate\Http\Request; -class TriggerEvent extends Controller +class TriggerEventController extends Controller { public function __invoke(Request $request) { diff --git a/src/Server/Router.php b/src/Server/Router.php index 64d4a52..0016358 100644 --- a/src/Server/Router.php +++ b/src/Server/Router.php @@ -3,10 +3,10 @@ namespace BeyondCode\LaravelWebSockets\Server; use BeyondCode\LaravelWebSockets\Server\Logger\MessageLogger; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannel; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannels; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsers; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\TriggerEvent; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\TriggerEventController; use BeyondCode\LaravelWebSockets\WebSockets\Controllers\WebSocketHandler; use Ratchet\WebSocket\MessageComponentInterface; use Ratchet\WebSocket\WsServer; @@ -78,11 +78,11 @@ class Router { $this->get('/app/{appKey}', WebSocketHandler::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->get('/apps/{appId}/channels', FetchChannelsController::class); + $this->get('/apps/{appId}/channels/{channelName}', FetchChannelController::class); + $this->get('/apps/{appId}/channels/{channelName}/users', FetchUsersController::class); - $this->post('/apps/{appId}/events', TriggerEvent::class); + $this->post('/apps/{appId}/events', TriggerEventController::class); } /**