Merge branch 'master' of github.com:beyondcode/laravel-websockets

src/Dashboard/EventSubscriber.php

@@ -8,7 +8,7 @@ use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
 use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\DashboardLogger;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\DashboardLogger;
 use Illuminate\Events\Dispatcher;
 
 class EventSubscriber

src/Server/Router.php

@@ -4,11 +4,11 @@ namespace BeyondCode\LaravelWebSockets\Server;
 
 use BeyondCode\LaravelWebSockets\LaravelEcho;
 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 BeyondCode\LaravelWebSockets\WebSocket\Controllers\FetchChannel;
+use BeyondCode\LaravelWebSockets\WebSocket\Controllers\FetchChannels;
+use BeyondCode\LaravelWebSockets\WebSocket\Controllers\FetchUsers;
+use BeyondCode\LaravelWebSockets\WebSocket\Controllers\TriggerEvent;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherController;
 use Ratchet\WebSocket\WsServer;
 use Symfony\Component\Routing\Route;
 use Ratchet\Http\HttpServerInterface;

src/WebSocket/Controllers/Controller.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
 use BeyondCode\LaravelWebSockets\Events\ExceptionThrown;
@@ -15,11 +15,11 @@ use Ratchet\Http\HttpServerInterface;
 use Psr\Http\Message\RequestInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 
 abstract class Controller implements HttpServerInterface
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(ChannelManager $channelManager)

src/WebSocket/Controllers/FetchChannel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;

src/WebSocket/Controllers/FetchChannels.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\PresenceChannel;
 
 class FetchChannels extends Controller
 {

src/WebSocket/Controllers/FetchUsers.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\PresenceChannel;
 
 class FetchUsers extends Controller
 {

src/WebSocket/Controllers/TriggerEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use BeyondCode\LaravelWebSockets\Events\ApiMessageSent;
 use Illuminate\Http\Request;

src/WebSocket/Messages/Message.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
 
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
@@ -15,7 +15,7 @@ class Message implements RespondableMessage
     /** @var \Ratchet\ConnectionInterface */
     protected $connection;
 
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(stdClass $payload, ConnectionInterface $connection, ChannelManager $channelManager)

src/WebSocket/Messages/RespondableMessage.php

@@ -1,5 +1,5 @@
 <?php
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
 
 interface RespondableMessage
 {

src/WebSocket/Messages/RespondableMessageFactory.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
 
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherMessage;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherMessage;
 use Ratchet\ConnectionInterface;
 use Ratchet\RFC6455\Messaging\MessageInterface;
 

src/WebSocket/Pusher/Channels/Channel.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use BeyondCode\LaravelWebSockets\Events\ChannelOccupied;
 use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
 use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\InvalidSignature;
 use Illuminate\Support\Collection;
 use Ratchet\ConnectionInterface;
 use stdClass;

src/WebSocket/Pusher/Channels/ChannelManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use ReflectionClass;
 use Ratchet\ConnectionInterface;

src/WebSocket/Pusher/Channels/PresenceChannel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;

src/WebSocket/Pusher/Channels/PrivateChannel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;

src/WebSocket/Pusher/DashboardLogger.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
 
 use Ratchet\ConnectionInterface;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 use stdClass;
 
 class DashboardLogger

src/WebSocket/Pusher/Exceptions/InvalidConnection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 class InvalidConnection extends PusherException
 {

src/WebSocket/Pusher/Exceptions/InvalidSignature.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 class InvalidSignature extends PusherException
 {

src/WebSocket/Pusher/Exceptions/PusherException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 use Exception;
 

src/WebSocket/Pusher/Exceptions/UnknownAppKey.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 class UnknownAppKey extends PusherException
 {

src/WebSocket/Pusher/PusherController.php

@@ -1,22 +1,22 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
 
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Messages\RespondableMessageFactory;
+use BeyondCode\LaravelWebSockets\WebSocket\Messages\RespondableMessageFactory;
 use BeyondCode\LaravelWebSockets\QueryParameters;
 use Exception;
 use Ratchet\ConnectionInterface;
 use Ratchet\RFC6455\Messaging\MessageInterface;
 use BeyondCode\LaravelWebSockets\Server\WebSocketController;
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\PusherException;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\PusherException;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\UnknownAppKey;
 
 class PusherController extends WebSocketController
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(ChannelManager $channelManager)

src/WebSocket/Pusher/PusherMessage.php

@@ -1,21 +1,21 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
 
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Messages\RespondableMessage;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Messages\RespondableMessage;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
 class PusherMessage implements RespondableMessage
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\stdClass */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\stdClass */
     protected $payload;
 
     /** @var \React\Socket\ConnectionInterface */
     protected $connection;
 
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(stdClass $payload, ConnectionInterface $connection, ChannelManager $channelManager)

src/WebSocketsServiceProvider.php

@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Route;
 use BeyondCode\LaravelWebSockets\ClientProviders\ClientProvider;
 use Illuminate\Support\ServiceProvider;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 
 class WebSocketsServiceProvider extends ServiceProvider
 {

tests/ConnectionTest.php

@@ -3,14 +3,14 @@
 namespace BeyondCode\LaravelWebSockets\Tests;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\InvalidSignature;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\UnknownAppKey;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherController;
 use BeyondCode\LaravelWebSockets\Tests\Mocks\Message;
 
 class ConnectionTest extends TestCase
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherController */
     protected $pusherServer;
 
     public function setUp()