update tests

composer.json

@@ -24,7 +24,6 @@
         "illuminate/http": "^10.0",
         "illuminate/redis": "^10.0",
         "illuminate/support": "^10.0",
-        "nesbot/carbon": "^2.64",
         "ratchet/rfc6455": "^0.3.1",
         "react/socket": "^1.14",
         "symfony/http-foundation": "^6.3"

src/Channels/Channel.php

@@ -91,11 +91,11 @@ public function broadcast(array $payload, Connection $except = null): void
         foreach ($chunks as $connections) {
             foreach ($connections as $connection) {
                 if ($except && $except->id() === $connection->connection()->id()) {
-                    break;
+                    continue;
                 }
 
                 if (isset($payload['except']) && $payload['except'] === $connection->connection()->id()) {
-                    break;
+                    continue;
                 }
 
                 try {

src/Contracts/Connection.php

@@ -13,8 +13,6 @@ abstract class Connection
 
     /**
      * Stores the ping state of the connection.
-     *
-     * @var \Carbon\Carbon
      */
     protected $hasBeenPinged = false;
 
@@ -71,12 +69,30 @@ public function ping(): void
         $this->hasBeenPinged = true;
     }
 
+        /**
+     * Get the last time the connection was seen.
+     */
+    public function lastSeenAt(): ?int
+    {
+        return $this->lastSeenAt;
+    }
+
+    /**
+     * Set the connection last seen at timestamp.
+     */
+    public function setLastSeenAt(int $time): Connection
+    {
+        $this->lastSeenAt = $time;
+
+        return $this;
+    }
+
     /**
      * Touch the connection last seen at timestamp.
      */
     public function touch(): Connection
     {
-        $this->lastSeenAt = time();
+        $this->setLastSeenAt(time());
 
         return $this;
     }

src/Jobs/PruneStaleConnections.php

@@ -31,6 +31,10 @@ public function handle(ChannelManager $channels): void
                         ]),
                     ]));
 
+                    $channels
+                        ->for($connection->app())
+                        ->unsubscribeFromAll($connection->connection());
+
                     $connection->disconnect();
                 }
             });

src/Pusher/Http/Controllers/ChannelsController.php

@@ -15,7 +15,7 @@ class ChannelsController extends Controller
      */
     public function handle(RequestInterface $request, Connection $connection, ...$args): Response
     {
-        $channels = $this->channels->all();
+        $channels = collect($this->channels->all());
         $info = explode(',', $this->query['info'] ?? '');
 
         if (isset($this->query['filter_by_prefix'])) {

src/Servers/Reverb/Connection.php

@@ -18,8 +18,6 @@ class Connection extends ConnectionContract
 
     /**
      * Stores the ping state of the connection.
-     *
-     * @var \Carbon\Carbon
      */
     protected $hasBeenPinged = false;
 

tests/Connection.php

@@ -50,11 +50,14 @@ public function origin(): string
         return 'http://localhost';
     }
 
-    public function setLastSeenAt(Carbon $lastSeenAt): void
+    public function setLastSeenAt(int $time): Connection
     {
-        $this->lastSeenAt = $lastSeenAt;
+        $this->lastSeenAt = $time;
+
+        return $this;
     }
 
+
     public function setHasBeenPinged(): void
     {
         $this->hasBeenPinged = true;

tests/Feature/Reverb/ServerTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use Laravel\Reverb\Contracts\ChannelManager;
@@ -141,7 +142,7 @@
     $this->subscribe('test-channel', connection: $connection);
     $promise = $this->messagePromise($connection);
 
-    Carbon::setTestNow(now()->addMinutes(10));
+    Arr::first(channelManager()->connections())->setLastSeenAt(time() - 60 * 10);
 
     (new PingInactiveConnections)->handle(channelManager());
 
@@ -155,7 +156,7 @@
 
     expect(channelManager()->find('test-channel')->connections())->toHaveCount(1);
 
-    Carbon::setTestNow(now()->addMinutes(10));
+    Arr::first(channelManager()->connections())->setLastSeenAt(time() - 60 * 10);
 
     $promiseTwo = $this->messagePromise($connection);
     (new PingInactiveConnections)->handle(
@@ -204,7 +205,7 @@
     $this->subscribe('presence-test-channel-4', connection: $connection, data: ['user_id' => 1, 'user_info' => ['name' => 'Test User 1']]);
 
     expect(channelManager()->all())->toHaveCount(4);
-    channelManager()->all()->each(function ($channel) use ($connection) {
+    collect(channelManager()->all())->each(function ($channel) use ($connection) {
         expect($channel->connections())->toHaveCount(1);
         expect(collect($channel->connections())->map(fn ($connection) => $connection->id()))->toContain($this->connectionId);
     });

tests/Feature/Reverb/UsersTerminateControllerTest.php

@@ -20,13 +20,13 @@
     $this->subscribe('test-channel-one', connection: $connection);
     $this->subscribe('test-channel-two', connection: $connection);
 
-    expect(channelManager()->all()->get('test-channel-one')->connections())->toHaveCount(2);
-    expect(channelManager()->all()->get('test-channel-two')->connections())->toHaveCount(2);
+    expect(collect(channelManager()->all())->get('test-channel-one')->connections())->toHaveCount(2);
+    expect(collect(channelManager()->all())->get('test-channel-two')->connections())->toHaveCount(2);
 
     $response = await($this->signedPostRequest("users/{$this->connectionId}/terminate_connections"));
 
     $this->assertSame(200, $response->getStatusCode());
     $this->assertSame('{}', $response->getBody()->getContents());
-    expect(channelManager()->all()->get('test-channel-one')->connections())->toHaveCount(1);
-    expect(channelManager()->all()->get('test-channel-two')->connections())->toHaveCount(1);
+    expect(collect(channelManager()->all())->get('test-channel-one')->connections())->toHaveCount(1);
+    expect(collect(channelManager()->all())->get('test-channel-two')->connections())->toHaveCount(1);
 });

tests/Feature/ServerTest.php

@@ -30,8 +30,9 @@
     $channelManager->shouldReceive('for')
         ->andReturn($channelManager);
     $this->app->singleton(ChannelManager::class, fn () => $channelManager);
+    $server = $this->app->make(Server::class);
 
-    $this->server->close(new Connection);
+    $server->close(new Connection);
 
     $channelManager->shouldHaveReceived('unsubscribeFromAll');
 });
@@ -160,8 +161,9 @@
     $channelManager->shouldReceive('for')
         ->andReturn($channelManager);
     $this->app->singleton(ChannelManager::class, fn () => $channelManager);
+    $server = $this->app->make(Server::class);
 
-    $this->server->message(
+    $server->message(
         $connection = new Connection,
         json_encode([
             'event' => 'pusher:subscribe',
@@ -171,7 +173,7 @@
             ],
         ]));
 
-    $this->server->close($connection);
+    $server->close($connection);
 
     $channelManager->shouldHaveReceived('unsubscribeFromAll')
         ->once()
@@ -183,8 +185,9 @@
     $channelManager->shouldReceive('for')
         ->andReturn($channelManager);
     $this->app->singleton(ChannelManager::class, fn () => $channelManager);
+    $server = $this->app->make(Server::class);
 
-    $this->server->message(
+    $server->message(
         $connection = new Connection,
         json_encode([
             'event' => 'pusher:subscribe',
@@ -194,7 +197,7 @@
             ],
         ]));
 
-    $this->server->close($connection);
+    $server->close($connection);
 
     $channelManager->shouldHaveReceived('unsubscribeFromAll')
         ->once()
@@ -206,8 +209,9 @@
     $channelManager->shouldReceive('for')
         ->andReturn($channelManager);
     $this->app->singleton(ChannelManager::class, fn () => $channelManager);
+    $server = $this->app->make(Server::class);
 
-    $this->server->message(
+    $server->message(
         $connection = new Connection,
         json_encode([
             'event' => 'pusher:subscribe',
@@ -217,7 +221,7 @@
             ],
         ]));
 
-    $this->server->close($connection);
+    $server->close($connection);
 
     $channelManager->shouldHaveReceived('unsubscribeFromAll')
         ->once()

tests/Unit/Channels/ChannelTest.php

@@ -1,7 +1,6 @@
 <?php
 
 use Laravel\Reverb\Channels\Channel;
-use Laravel\Reverb\Contracts\ApplicationProvider;
 use Laravel\Reverb\Contracts\ChannelConnectionManager;
 use Laravel\Reverb\Tests\Connection;
 
@@ -40,7 +39,7 @@
         ->once()
         ->andReturn($connections = connections(3));
 
-    $channel->broadcast(app(ApplicationProvider::class)->findByKey('pusher-key'), ['foo' => 'bar']);
+    $channel->broadcast(['foo' => 'bar']);
 
     collect($connections)->each(fn ($connection) => $connection->assertSent(['foo' => 'bar']));
 });
@@ -54,7 +53,7 @@
         ->once()
         ->andReturn($connections = connections(3));
 
-    $channel->broadcast(app(ApplicationProvider::class)->findByKey('pusher-key'), ['foo' => 'bar'], $connections[0]->connection());
+    $channel->broadcast(['foo' => 'bar'], $connections[0]->connection());
 
     $connections[0]->assertNothingSent();
     collect(array_slice($connections, -2))->each(fn ($connection) => $connection->assertSent(['foo' => 'bar']));

tests/Unit/Channels/PresenceChannelTest.php

@@ -44,7 +44,7 @@
         ->once()
         ->andReturn($connections = connections(3));
 
-    $channel->broadcast(app(ApplicationProvider::class)->findByKey('pusher-key'), ['foo' => 'bar']);
+    $channel->broadcast(['foo' => 'bar']);
 
     collect($connections)->each(fn ($connection) => $connection->assertSent(['foo' => 'bar']));
 });

tests/Unit/Channels/PrivateChannelTest.php

@@ -41,7 +41,7 @@
         ->once()
         ->andReturn($connections = connections(3));
 
-    $channel->broadcast(app(ApplicationProvider::class)->findByKey('pusher-key'), ['foo' => 'bar']);
+    $channel->broadcast(['foo' => 'bar']);
 
     collect($connections)->each(fn ($connection) => $connection->assertSent(['foo' => 'bar']));
 });

tests/Unit/Jobs/PingInactiveConnectionsTest.php

@@ -17,11 +17,11 @@
 
     $this->channelManager->shouldReceive('connections')
         ->once()
-        ->andReturn(collect($connections));
+        ->andReturn($connections);
 
     $connections = collect($connections)->each(function ($connection) use ($channel) {
         $channel->subscribe($connection->connection());
-        $connection->setLastSeenAt(now()->subMinutes(10));
+        $connection->setLastSeenAt(time() - 60 * 10);
     });
 
     (new PingInactiveConnections)->handle($this->channelManager);

tests/Unit/Jobs/PruneStaleConnectionsTest.php

@@ -17,11 +17,11 @@
 
     $this->channelManager->shouldReceive('connections')
         ->once()
-        ->andReturn(collect($connections));
+        ->andReturn($connections);
 
     collect($connections)->each(function ($connection) use ($channel) {
         $channel->subscribe($connection->connection());
-        $connection->setLastSeenAt(now()->subMinutes(10));
+        $connection->setLastSeenAt(time() - 60 * 10);
         $connection->setHasBeenPinged();
 
         $this->channelManager->shouldReceive('unsubscribeFromAll')

tests/Unit/Managers/ChannelManagerTest.php

@@ -31,9 +31,10 @@
 
     $channels->each(fn ($channel) => $this->channelManager->find($channel)->subscribe($this->connection));
 
-    $this->channelManager->all()->values()->each(function ($channel, $index) {
-        expect($channel->name())->toBe('test-channel-'.($index));
-    });
+    foreach ($this->channelManager->all() as $index => $channel) {
+        expect($channel->name())->toBe($index);
+    }
+
     expect($this->channelManager->all())->toHaveCount(4);
 });
 

tests/Unit/Pusher/EventTest.php

@@ -1,14 +1,16 @@
 <?php
 
+use Laravel\Reverb\Contracts\ChannelManager;
 use Laravel\Reverb\Pusher\Event as PusherEvent;
 use Laravel\Reverb\Tests\Connection;
 
 beforeEach(function () {
     $this->connection = new Connection;
+    $this->pusher = new PusherEvent(app(ChannelManager::class));
 });
 
 it('can send an acknowledgement', function () {
-    PusherEvent::handle(
+    $this->pusher->handle(
         $this->connection,
         'pusher:connection_established'
     );
@@ -23,7 +25,7 @@
 });
 
 it('can subscribe to a channel', function () {
-    PusherEvent::handle(
+    $this->pusher->handle(
         $this->connection,
         'pusher:subscribe',
         ['channel' => 'test-channel']
@@ -36,7 +38,7 @@
 });
 
 it('can unsubscribe from a channel', function () {
-    PusherEvent::handle(
+    $this->pusher->handle(
         $this->connection,
         'pusher:unsubscribe',
         ['channel' => 'test-channel']
@@ -46,7 +48,7 @@
 });
 
 it('can respond to a ping', function () {
-    PusherEvent::handle(
+    $this->pusher->handle(
         $this->connection,
         'pusher:ping',
     );
@@ -57,7 +59,7 @@
 });
 
 it('can correctly format a payload', function () {
-    $payload = PusherEvent::formatPayload(
+    $payload = $this->pusher->formatPayload(
         'foo',
         ['bar' => 'baz'],
         'test-channel',
@@ -70,15 +72,15 @@
         'channel' => 'test-channel',
     ]));
 
-    $payload = PusherEvent::formatPayload('foo');
+    $payload = $this->pusher->formatPayload('foo');
 
     expect($payload)->toBe(json_encode([
         'event' => 'pusher:foo',
     ]));
 });
 
 it('can correctly format an internal payload', function () {
-    $payload = PusherEvent::formatInternalPayload(
+    $payload = $this->pusher->formatInternalPayload(
         'foo',
         ['bar' => 'baz'],
         'test-channel',
@@ -91,7 +93,7 @@
         'channel' => 'test-channel',
     ]));
 
-    $payload = PusherEvent::formatInternalPayload('foo');
+    $payload = $this->pusher->formatInternalPayload('foo');
 
     expect($payload)->toBe(json_encode([
         'event' => 'pusher_internal:foo',