From 3d4ebf595a42073f195765dc7a67588ea6b522bc Mon Sep 17 00:00:00 2001
From: Marcel Pociot <m.pociot@gmail.com>
Date: Tue, 27 Nov 2018 16:42:19 +0100
Subject: [PATCH] wip

---
 src/{WebSockets => HttpApi}/Controllers/Controller.php    | 2 +-
 src/{WebSockets => HttpApi}/Controllers/FetchChannel.php  | 3 ++-
 src/{WebSockets => HttpApi}/Controllers/FetchChannels.php | 3 ++-
 src/{WebSockets => HttpApi}/Controllers/FetchUsers.php    | 3 ++-
 src/{WebSockets => HttpApi}/Controllers/TriggerEvent.php  | 3 ++-
 src/Server/Router.php                                     | 8 ++++----
 src/WebSockets/{ => Controllers}/PusherController.php     | 2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)
 rename src/{WebSockets => HttpApi}/Controllers/Controller.php (98%)
 rename src/{WebSockets => HttpApi}/Controllers/FetchChannel.php (78%)
 rename src/{WebSockets => HttpApi}/Controllers/FetchChannels.php (87%)
 rename src/{WebSockets => HttpApi}/Controllers/FetchUsers.php (87%)
 rename src/{WebSockets => HttpApi}/Controllers/TriggerEvent.php (87%)
 rename src/WebSockets/{ => Controllers}/PusherController.php (97%)

diff --git a/src/WebSockets/Controllers/Controller.php b/src/HttpApi/Controllers/Controller.php
similarity index 98%
rename from src/WebSockets/Controllers/Controller.php
rename to src/HttpApi/Controllers/Controller.php
index dc57fff..1fdbea5 100644
--- a/src/WebSockets/Controllers/Controller.php
+++ b/src/HttpApi/Controllers/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
+namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
 use BeyondCode\LaravelWebSockets\Events\ExceptionThrown;
diff --git a/src/WebSockets/Controllers/FetchChannel.php b/src/HttpApi/Controllers/FetchChannel.php
similarity index 78%
rename from src/WebSockets/Controllers/FetchChannel.php
rename to src/HttpApi/Controllers/FetchChannel.php
index fce1430..2cb44e3 100644
--- a/src/WebSockets/Controllers/FetchChannel.php
+++ b/src/HttpApi/Controllers/FetchChannel.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
+namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers;
 
+use BeyondCode\LaravelWebSockets\HttpApi\Controllers\Controller;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
diff --git a/src/WebSockets/Controllers/FetchChannels.php b/src/HttpApi/Controllers/FetchChannels.php
similarity index 87%
rename from src/WebSockets/Controllers/FetchChannels.php
rename to src/HttpApi/Controllers/FetchChannels.php
index 384a6de..6b0960d 100644
--- a/src/WebSockets/Controllers/FetchChannels.php
+++ b/src/HttpApi/Controllers/FetchChannels.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
+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;
diff --git a/src/WebSockets/Controllers/FetchUsers.php b/src/HttpApi/Controllers/FetchUsers.php
similarity index 87%
rename from src/WebSockets/Controllers/FetchUsers.php
rename to src/HttpApi/Controllers/FetchUsers.php
index 4661738..a6f4930 100644
--- a/src/WebSockets/Controllers/FetchUsers.php
+++ b/src/HttpApi/Controllers/FetchUsers.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
+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;
diff --git a/src/WebSockets/Controllers/TriggerEvent.php b/src/HttpApi/Controllers/TriggerEvent.php
similarity index 87%
rename from src/WebSockets/Controllers/TriggerEvent.php
rename to src/HttpApi/Controllers/TriggerEvent.php
index 59aeb84..78684f3 100644
--- a/src/WebSockets/Controllers/TriggerEvent.php
+++ b/src/HttpApi/Controllers/TriggerEvent.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
+namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers;
 
 use BeyondCode\LaravelWebSockets\Events\ApiMessageSent;
+use BeyondCode\LaravelWebSockets\HttpApi\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class TriggerEvent extends Controller
diff --git a/src/Server/Router.php b/src/Server/Router.php
index a718caf..d565f8f 100644
--- a/src/Server/Router.php
+++ b/src/Server/Router.php
@@ -4,10 +4,10 @@ namespace BeyondCode\LaravelWebSockets\Server;
 
 use BeyondCode\LaravelWebSockets\LaravelEcho;
 use BeyondCode\LaravelWebSockets\Server\Logger\MessageLogger;
-use BeyondCode\LaravelWebSockets\WebSockets\Controllers\FetchChannel;
-use BeyondCode\LaravelWebSockets\WebSockets\Controllers\FetchChannels;
-use BeyondCode\LaravelWebSockets\WebSockets\Controllers\FetchUsers;
-use BeyondCode\LaravelWebSockets\WebSockets\Controllers\TriggerEvent;
+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\WebSockets\Pusher\PusherController;
 use Ratchet\WebSocket\WsServer;
 use Symfony\Component\Routing\Route;
diff --git a/src/WebSockets/PusherController.php b/src/WebSockets/Controllers/PusherController.php
similarity index 97%
rename from src/WebSockets/PusherController.php
rename to src/WebSockets/Controllers/PusherController.php
index 72ddd88..3f29872 100644
--- a/src/WebSockets/PusherController.php
+++ b/src/WebSockets/Controllers/PusherController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
 use BeyondCode\LaravelWebSockets\WebSockets\Messages\RespondableMessageFactory;