formatting

src/Servers/Reverb/Console/Commands/StartServer.php

@@ -5,7 +5,6 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Laravel\Reverb\Application;
-use Laravel\Reverb\Concerns\InteractsWithAsyncRedis;
 use Laravel\Reverb\Contracts\ApplicationProvider;
 use Laravel\Reverb\Contracts\Logger;
 use Laravel\Reverb\Jobs\PingInactiveConnections;
@@ -22,8 +21,6 @@
 
 class StartServer extends Command implements SignalableCommandInterface
 {
-    use InteractsWithAsyncRedis;
-
     /**
      * The name and signature of the console command.
      *
@@ -58,8 +55,11 @@ public function handle(): void
 
         $server = ServerFactory::make($host, $port, loop: $loop);
 
-        $this->laravel->make(PubSubProvider::class)->connect($loop);
-        $this->subscribeToRedis($loop);
+        if ($this->laravel->make(ServerServiceProviderManager::class)->subscribesToEvents()) {
+            $this->laravel->make(PubSubProvider::class)->connect($loop);
+            $this->laravel->make(PubSubProvider::class)->subscribe();
+        }
+
         $this->scheduleCleanup($loop);
         $this->checkForRestartSignal($server, $loop, $host, $port);
 

src/Servers/Reverb/Publishing/RedisPubSubProvider.php

@@ -2,16 +2,14 @@
 
 namespace Laravel\Reverb\Servers\Reverb\Publishing;
 
-use Laravel\Reverb\Concerns\InteractsWithAsyncRedis;
+use Illuminate\Support\Facades\Config;
 use Laravel\Reverb\Protocols\Pusher\EventDispatcher;
 use Laravel\Reverb\Servers\Reverb\Contracts\PubSubProvider;
 use React\EventLoop\LoopInterface;
 use RuntimeException;
 
 class RedisPubSubProvider implements PubSubProvider
 {
-    use InteractsWithAsyncRedis;
-
     protected $publishingClient;
 
     protected $subscribingClient;
@@ -59,6 +57,31 @@ public function publish(array $payload): void
         $this->publishingClient->publish($this->channel, json_encode($payload));
     }
 
+    /**
+     * Get the connection URL for Redis.
+     */
+    protected function redisUrl(): string
+    {
+        $config = Config::get('database.redis.default');
+
+        $host = $config['host'];
+        $port = $config['port'] ?: 6379;
+
+        $query = [];
+
+        if ($config['password']) {
+            $query['password'] = $config['password'];
+        }
+
+        if ($config['database']) {
+            $query['db'] = $config['database'];
+        }
+
+        $query = http_build_query($query);
+
+        return "redis://{$host}:{$port}".($query ? "?{$query}" : '');
+    }
+
     /**
      * Ensure that a connection to Redis has been established.
      */

tests/ReverbTestCase.php

@@ -3,7 +3,6 @@
 namespace Laravel\Reverb\Tests;
 
 use Illuminate\Support\Str;
-use Laravel\Reverb\Concerns\InteractsWithAsyncRedis;
 use Laravel\Reverb\Servers\Reverb\Contracts\PubSubProvider;
 use Laravel\Reverb\Servers\Reverb\Factory;
 use Laravel\Reverb\ServerServiceProviderManager;
@@ -18,8 +17,6 @@
 
 class ReverbTestCase extends TestCase
 {
-    use InteractsWithAsyncRedis;
-
     protected $server;
 
     protected $loop;
@@ -79,7 +76,7 @@ public function usingRedis(): void
         app(ServerServiceProviderManager::class)->withPublishing();
 
         app(PubSubProvider::class)->connect($this->loop);
-        $this->subscribeToRedis($this->loop);
+        app(PubSubProvider::class)->subscribe();
     }
 
     /**