move pusher server (#28)

laravel · Dec 4, 2023 · 8a06931 · 8a06931
1 parent dbd7a98
commit 8a06931
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/Server.php → src/Pusher/Server.php b/src/Server.php → src/Pusher/Server.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Laravel\Reverb;
+namespace Laravel\Reverb\Pusher;
 
 use Exception;
 use Illuminate\Support\Str;
+use Laravel\Reverb\ClientEvent;
 use Laravel\Reverb\Contracts\ChannelManager;
 use Laravel\Reverb\Contracts\Connection;
 use Laravel\Reverb\Exceptions\InvalidOrigin;

diff --git a/src/Servers/ApiGateway/Server.php b/src/Servers/ApiGateway/Server.php
@@ -6,15 +6,15 @@
 use Laravel\Reverb\Contracts\ApplicationProvider;
 use Laravel\Reverb\Contracts\ConnectionManager;
 use Laravel\Reverb\Exceptions\InvalidApplication;
-use Laravel\Reverb\Server as ReverbServer;
+use Laravel\Reverb\Pusher\Server as PusherServer;
 use Laravel\Reverb\Servers\ApiGateway\Jobs\SendToConnection;
 
 class Server
 {
     protected ConnectionManager $connections;
 
     public function __construct(
-        protected ReverbServer $server,
+        protected PusherServer $server,
         protected ApplicationProvider $applications,
     ) {
         $this->connections = app(ConnectionManager::class);

diff --git a/src/Servers/Reverb/Controller.php b/src/Servers/Reverb/Controller.php
@@ -4,14 +4,14 @@
 
 use Laravel\Reverb\Contracts\ApplicationProvider;
 use Laravel\Reverb\Exceptions\InvalidApplication;
-use Laravel\Reverb\Server;
+use Laravel\Reverb\Pusher\Server as PusherServer;
 use Laravel\Reverb\Servers\Reverb\Connection as ReverbConnection;
 use Laravel\Reverb\WebSockets\WsConnection;
 use Psr\Http\Message\RequestInterface;
 
 class Controller
 {
-    public function __construct(protected Server $server, protected ApplicationProvider $applications)
+    public function __construct(protected PusherServer $server, protected ApplicationProvider $applications)
     {
         //
     }

diff --git a/src/Servers/Reverb/Factory.php b/src/Servers/Reverb/Factory.php
@@ -12,7 +12,7 @@
 use Laravel\Reverb\Pusher\Http\Controllers\EventsBatchController;
 use Laravel\Reverb\Pusher\Http\Controllers\EventsController;
 use Laravel\Reverb\Pusher\Http\Controllers\UsersTerminateController;
-use Laravel\Reverb\Server;
+use Laravel\Reverb\Pusher\Server as PusherServer;
 use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
 use React\Socket\SocketServer;
@@ -42,7 +42,7 @@ protected static function routes(): RouteCollection
     {
         $routes = new RouteCollection;
 
-        $routes->add('sockets', Route::get('/app/{appKey}', new Controller(app(Server::class), app(ApplicationProvider::class))));
+        $routes->add('sockets', Route::get('/app/{appKey}', new Controller(app(PusherServer::class), app(ApplicationProvider::class))));
         $routes->add('events', Route::post('/apps/{appId}/events', new EventsController));
         $routes->add('events_batch', Route::post('/apps/{appId}/batch_events', new EventsBatchController));
         $routes->add('channels', Route::get('/apps/{appId}/channels', new ChannelsController));

diff --git a/tests/Feature/ServerTest.php b/tests/Feature/ServerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use Laravel\Reverb\Contracts\ChannelManager;
-use Laravel\Reverb\Server;
+use Laravel\Reverb\Pusher\Server;
 use Laravel\Reverb\Tests\Connection;
 use Laravel\Reverb\Tests\TestCase;