Revert "formatting"

This reverts commit 8308a7d16d.
2020-12-07 23:30:36 +02:00 · 2020-12-07 23:30:36 +02:00 · cbe4378086
parent b6837a05e4
commit cbe4378086
15 changed files with 756 additions and 557 deletions
--- a/src/API/FetchChannels.php
+++ b/src/API/FetchChannels.php
@ -28,7 +28,9 @@ class FetchChannels extends Controller
            }
        }

-        return $this->channelManager->getGlobalChannels($request->appId)->then(function ($channels) use ($request, $attributes) {
+        return $this->channelManager
+            ->getGlobalChannels($request->appId)
+            ->then(function ($channels) use ($request, $attributes) {
                $channels = collect($channels)->keyBy(function ($channel) {
                    return $channel instanceof Channel
                        ? $channel->getName()
--- a/src/ChannelManagers/LocalChannelManager.php
+++ b/src/ChannelManagers/LocalChannelManager.php
@ -163,7 +163,8 @@ class LocalChannelManager implements ChannelManager
            return Helpers::createFulfilledPromise(false);
        }

-        $this->getLocalChannels($connection->app->id)->then(function ($channels) use ($connection) {
+        $this->getLocalChannels($connection->app->id)
+            ->then(function ($channels) use ($connection) {
                collect($channels)->each->unsubscribe($connection);

                collect($channels)
@ -173,7 +174,8 @@ class LocalChannelManager implements ChannelManager
                    });
            });

-        $this->getLocalChannels($connection->app->id)->then(function ($channels) use ($connection) {
+        $this->getLocalChannels($connection->app->id)
+            ->then(function ($channels) use ($connection) {
                if (count($channels) === 0) {
                    unset($this->channels[$connection->app->id]);
                }
@ -250,7 +252,8 @@ class LocalChannelManager implements ChannelManager
     */
    public function getLocalConnectionsCount($appId, string $channelName = null): PromiseInterface
    {
-        return $this->getLocalChannels($appId)->then(function ($channels) use ($channelName) {
+        return $this->getLocalChannels($appId)
+            ->then(function ($channels) use ($channelName) {
                return collect($channels)->when(! is_null($channelName), function ($collection) use ($channelName) {
                    return $collection->filter(function (Channel $channel) use ($channelName) {
                        return $channel->getName() === $channelName;
@ -452,7 +455,8 @@ class LocalChannelManager implements ChannelManager
     */
    public function updateConnectionInChannels($connection): PromiseInterface
    {
-        return $this->getLocalChannels($connection->app->id)->then(function ($channels) use ($connection) {
+        return $this->getLocalChannels($connection->app->id)
+            ->then(function ($channels) use ($connection) {
                foreach ($channels as $channel) {
                    if ($channel->hasConnection($connection)) {
                        $channel->saveConnection($connection);
--- a/src/ChannelManagers/RedisChannelManager.php
+++ b/src/ChannelManagers/RedisChannelManager.php
@ -137,11 +137,13 @@ class RedisChannelManager extends LocalChannelManager
     */
    public function unsubscribeFromAllChannels(ConnectionInterface $connection): PromiseInterface
    {
-        return $this->getGlobalChannels($connection->app->id)->then(function ($channels) use ($connection) {
+        return $this->getGlobalChannels($connection->app->id)
+            ->then(function ($channels) use ($connection) {
                foreach ($channels as $channel) {
                    $this->unsubscribeFromChannel($connection, $channel, new stdClass);
                }
-        })->then(function () use ($connection) {
+            })
+            ->then(function () use ($connection) {
                return parent::unsubscribeFromAllChannels($connection);
            });
    }
@ -156,13 +158,17 @@ class RedisChannelManager extends LocalChannelManager
     */
    public function subscribeToChannel(ConnectionInterface $connection, string $channelName, stdClass $payload): PromiseInterface
    {
-        return $this->subscribeToTopic($connection->app->id, $channelName)->then(function () use ($connection) {
+        return $this->subscribeToTopic($connection->app->id, $channelName)
+            ->then(function () use ($connection) {
                return $this->addConnectionToSet($connection, Carbon::now());
-        })->then(function () use ($connection, $channelName) {
+            })
+            ->then(function () use ($connection, $channelName) {
                return $this->addChannelToSet($connection->app->id, $channelName);
-        })->then(function () use ($connection, $channelName) {
+            })
+            ->then(function () use ($connection, $channelName) {
                return $this->incrementSubscriptionsCount($connection->app->id, $channelName, 1);
-        })->then(function () use ($connection, $channelName, $payload) {
+            })
+            ->then(function () use ($connection, $channelName, $payload) {
                return parent::subscribeToChannel($connection, $channelName, $payload);
            });
    }
@ -193,11 +199,14 @@ class RedisChannelManager extends LocalChannelManager
                            $this->unsubscribeFromTopic($connection->app->id, $channelName);
                        }
                    });
-            })->then(function () use ($connection, $channelName) {
+            })
+            ->then(function () use ($connection, $channelName) {
                return $this->removeChannelFromSet($connection->app->id, $channelName);
-            })->then(function () use ($connection) {
+            })
+            ->then(function () use ($connection) {
                return $this->removeConnectionFromSet($connection);
-            })->then(function () use ($connection, $channelName, $payload) {
+            })
+            ->then(function () use ($connection, $channelName, $payload) {
                return parent::unsubscribeFromChannel($connection, $channelName, $payload);
            });
    }
@ -211,7 +220,8 @@ class RedisChannelManager extends LocalChannelManager
     */
    public function subscribeToApp($appId): PromiseInterface
    {
-        return $this->subscribeToTopic($appId)->then(function () use ($appId) {
+        return $this->subscribeToTopic($appId)
+            ->then(function () use ($appId) {
                return $this->incrementSubscriptionsCount($appId);
            });
    }
@ -225,7 +235,8 @@ class RedisChannelManager extends LocalChannelManager
     */
    public function unsubscribeFromApp($appId): PromiseInterface
    {
-        return $this->unsubscribeFromTopic($appId)->then(function () use ($appId) {
+        return $this->unsubscribeFromTopic($appId)
+            ->then(function () use ($appId) {
                return $this->decrementSubscriptionsCount($appId);
            });
    }
@ -297,7 +308,8 @@ class RedisChannelManager extends LocalChannelManager
        return $this->storeUserData($connection->app->id, $channel, $connection->socketId, json_encode($user))
            ->then(function () use ($connection, $channel, $user) {
                return $this->addUserSocket($connection->app->id, $channel, $user, $connection->socketId);
-            })->then(function () use ($connection, $user, $channel, $payload) {
+            })
+            ->then(function () use ($connection, $user, $channel, $payload) {
                return parent::userJoinedPresenceChannel($connection, $user, $channel, $payload);
            });
    }
@ -316,7 +328,8 @@ class RedisChannelManager extends LocalChannelManager
        return $this->removeUserData($connection->app->id, $channel, $connection->socketId)
            ->then(function () use ($connection, $channel, $user) {
                return $this->removeUserSocket($connection->app->id, $channel, $user, $connection->socketId);
-            })->then(function () use ($connection, $user, $channel) {
+            })
+            ->then(function () use ($connection, $user, $channel) {
                return parent::userLeftPresenceChannel($connection, $user, $channel);
            });
    }
@ -370,7 +383,8 @@ class RedisChannelManager extends LocalChannelManager
            );
        }

-        return $this->publishClient->exec()->then(function ($data) use ($channelNames) {
+        return $this->publishClient->exec()
+            ->then(function ($data) use ($channelNames) {
                return array_combine($channelNames, $data);
            });
    }
@ -399,7 +413,8 @@ class RedisChannelManager extends LocalChannelManager
    public function connectionPonged(ConnectionInterface $connection): PromiseInterface
    {
        // This will update the score with the current timestamp.
-        return $this->addConnectionToSet($connection, Carbon::now())->then(function () use ($connection) {
+        return $this->addConnectionToSet($connection, Carbon::now())
+            ->then(function () use ($connection) {
                return parent::connectionPonged($connection);
            });
    }
--- a/src/Channels/PresenceChannel.php
+++ b/src/Channels/PresenceChannel.php
@ -54,7 +54,8 @@ class PresenceChannel extends PrivateChannel
                            ]),
                        ]));
                    });
-            })->then(function () use ($connection, $user, $payload) {
+            })
+            ->then(function () use ($connection, $user, $payload) {
                // The `pusher_internal:member_added` event is triggered when a user joins a channel.
                // It's quite possible that a user can have multiple connections to the same channel
                // (for example by having multiple browser tabs open)
@ -103,9 +104,12 @@ class PresenceChannel extends PrivateChannel
    {
        $truth = parent::unsubscribe($connection);

-        $this->channelManager->getChannelMember($connection, $this->getName())->then(function ($user) {
+        $this->channelManager
+            ->getChannelMember($connection, $this->getName())
+            ->then(function ($user) {
                return @json_decode($user);
-        })->then(function ($user) use ($connection) {
+            })
+            ->then(function ($user) use ($connection) {
                if (! $user) {
                    return;
                }
--- a/src/Console/Commands/StartServer.php
+++ b/src/Console/Commands/StartServer.php
@ -304,11 +304,13 @@ class StartServer extends Command

        // Get all local connections and close them. They will
        // be automatically be unsubscribed from all channels.
-        $channelManager->getLocalConnections()->then(function ($connections) {
+        $channelManager->getLocalConnections()
+            ->then(function ($connections) {
                foreach ($connections as $connection) {
                    $connection->close();
                }
-        })->then(function () {
+            })
+            ->then(function () {
                $this->loop->stop();
            });
    }
--- a/src/Server/Messages/PusherChannelProtocolMessage.php
+++ b/src/Server/Messages/PusherChannelProtocolMessage.php
@ -32,7 +32,9 @@ class PusherChannelProtocolMessage extends PusherClientMessage
     */
    protected function ping(ConnectionInterface $connection)
    {
-        $this->channelManager->connectionPonged($connection)->then(function () use ($connection) {
+        $this->channelManager
+            ->connectionPonged($connection)
+            ->then(function () use ($connection) {
                $connection->send(json_encode(['event' => 'pusher:pong']));

                ConnectionPonged::dispatch($connection->app->id, $connection->socketId);
--- a/src/Statistics/Collectors/MemoryCollector.php
+++ b/src/Statistics/Collectors/MemoryCollector.php
@ -98,7 +98,9 @@ class MemoryCollector implements StatisticsCollector

                $this->createRecord($statistic, $appId);

-                $this->channelManager->getGlobalConnectionsCount($appId)->then(function ($connections) use ($statistic) {
+                $this->channelManager
+                    ->getGlobalConnectionsCount($appId)
+                    ->then(function ($connections) use ($statistic) {
                        $statistic->reset(
                            is_null($connections) ? 0 : $connections
                        );
--- a/src/Statistics/Collectors/RedisCollector.php
+++ b/src/Statistics/Collectors/RedisCollector.php
@ -84,12 +84,16 @@ class RedisCollector extends MemoryCollector
            ->hincrby(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'current_connections_count', 1
-            )->then(function ($currentConnectionsCount) use ($appId) {
+            )
+            ->then(function ($currentConnectionsCount) use ($appId) {
                // Get the peak connections count from Redis.
-                $this->channelManager->getPublishClient()->hget(
+                $this->channelManager
+                    ->getPublishClient()
+                    ->hget(
                        $this->channelManager->getRedisKey($appId, null, ['stats']),
                        'peak_connections_count'
-                )->then(function ($currentPeakConnectionCount) use ($currentConnectionsCount, $appId) {
+                    )
+                    ->then(function ($currentPeakConnectionCount) use ($currentConnectionsCount, $appId) {
                        // Extract the greatest number between the current peak connection count
                        // and the current connection number.
                        $peakConnectionsCount = is_null($currentPeakConnectionCount)
@ -97,7 +101,9 @@ class RedisCollector extends MemoryCollector
                            : max($currentPeakConnectionCount, $currentConnectionsCount);

                        // Then set it to the database.
-                    $this->channelManager->getPublishClient()->hset(
+                        $this->channelManager
+                            ->getPublishClient()
+                            ->hset(
                                $this->channelManager->getRedisKey($appId, null, ['stats']),
                                'peak_connections_count', $peakConnectionsCount
                            );
@ -129,7 +135,9 @@ class RedisCollector extends MemoryCollector
                            : max($currentPeakConnectionCount, $currentConnectionsCount);

                        // Then set it to the database.
-                        $this->channelManager->getPublishClient()->hset(
+                        $this->channelManager
+                            ->getPublishClient()
+                            ->hset(
                                $this->channelManager->getRedisKey($appId, null, ['stats']),
                                'peak_connections_count', $peakConnectionsCount
                            );
@ -145,7 +153,10 @@ class RedisCollector extends MemoryCollector
    public function save()
    {
        $this->lock()->get(function () {
-            $this->channelManager->getPublishClient()->smembers(static::$redisSetName)->then(function ($members) {
+            $this->channelManager
+                ->getPublishClient()
+                ->smembers(static::$redisSetName)
+                ->then(function ($members) {
                    foreach ($members as $appId) {
                        $this->channelManager
                            ->getPublishClient()
@ -195,7 +206,10 @@ class RedisCollector extends MemoryCollector
     */
    public function getStatistics(): PromiseInterface
    {
-        return $this->channelManager->getPublishClient()->smembers(static::$redisSetName)->then(function ($members) {
+        return $this->channelManager
+            ->getPublishClient()
+            ->smembers(static::$redisSetName)
+            ->then(function ($members) {
                $appsWithStatistics = [];

                foreach ($members as $appId) {
@ -240,22 +254,30 @@ class RedisCollector extends MemoryCollector
     */
    public function resetStatistics($appId, int $currentConnectionCount)
    {
-        $this->channelManager->getPublishClient()->hset(
+        $this->channelManager
+            ->getPublishClient()
+            ->hset(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'current_connections_count', $currentConnectionCount
            );

-        $this->channelManager->getPublishClient()->hset(
+        $this->channelManager
+            ->getPublishClient()
+            ->hset(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'peak_connections_count', $currentConnectionCount
            );

-        $this->channelManager->getPublishClient()->hset(
+        $this->channelManager
+            ->getPublishClient()
+            ->hset(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'websocket_messages_count', 0
            );

-        $this->channelManager->getPublishClient()->hset(
+        $this->channelManager
+            ->getPublishClient()
+            ->hset(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'api_messages_count', 0
            );
@ -270,27 +292,37 @@ class RedisCollector extends MemoryCollector
     */
    public function resetAppTraces($appId)
    {
-        $this->channelManager->getPublishClient()->hdel(
+        $this->channelManager
+            ->getPublishClient()
+            ->hdel(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'current_connections_count'
            );

-        $this->channelManager->getPublishClient()->hdel(
+        $this->channelManager
+            ->getPublishClient()
+            ->hdel(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'peak_connections_count'
            );

-        $this->channelManager->getPublishClient()->hdel(
+        $this->channelManager
+            ->getPublishClient()
+            ->hdel(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'websocket_messages_count'
            );

-        $this->channelManager->getPublishClient()->hdel(
+        $this->channelManager
+            ->getPublishClient()
+            ->hdel(
                $this->channelManager->getRedisKey($appId, null, ['stats']),
                'api_messages_count'
            );

-        $this->channelManager->getPublishClient()->srem(static::$redisSetName, $appId);
+        $this->channelManager
+            ->getPublishClient()
+            ->srem(static::$redisSetName, $appId);
    }

    /**
@ -301,7 +333,9 @@ class RedisCollector extends MemoryCollector
     */
    protected function ensureAppIsInSet($appId)
    {
-        $this->channelManager->getPublishClient()->sadd(static::$redisSetName, $appId);
+        $this->channelManager
+            ->getPublishClient()
+            ->sadd(static::$redisSetName, $appId);

        return $this->channelManager->getPublishClient();
    }
--- a/tests/AsyncRedisQueueTest.php
+++ b/tests/AsyncRedisQueueTest.php
@ -62,7 +62,9 @@ class AsyncRedisQueueTest extends TestCase
        $this->queue->later(-300, $jobs[2]);
        $this->queue->later(-100, $jobs[3]);

-        $this->getPublishClient()->zcard('queues:default:delayed')->then(function ($count) {
+        $this->getPublishClient()
+            ->zcard('queues:default:delayed')
+            ->then(function ($count) {
                $this->assertEquals(4, $count);
            });

@ -85,7 +87,8 @@ class AsyncRedisQueueTest extends TestCase

        $this->unregisterManagers();

-        $this->getPublishClient()->assertCalledCount(1, 'eval');
+        $this->getPublishClient()
+            ->assertCalledCount(1, 'eval');

        $redisJob = $this->queue->pop();

@ -123,7 +126,8 @@ class AsyncRedisQueueTest extends TestCase

        $this->unregisterManagers();

-        $this->getPublishClient()->assertCalledCount(1, 'eval');
+        $this->getPublishClient()
+            ->assertCalledCount(1, 'eval');

        $redisJob = $this->queue->pop();

@ -148,7 +152,8 @@ class AsyncRedisQueueTest extends TestCase
        $this->queue->push($job1);
        $this->queue->push($job2);

-        $this->getPublishClient()->assertCalledCount(2, 'eval');
+        $this->getPublishClient()
+            ->assertCalledCount(2, 'eval');

        $this->unregisterManagers();

--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@ -54,21 +54,29 @@ class ConnectionTest extends TestCase
    {
        $connection = $this->newActiveConnection(['public-channel']);

-        $this->channelManager->getGlobalChannels('1234')->then(function ($channels) {
+        $this->channelManager
+            ->getGlobalChannels('1234')
+            ->then(function ($channels) {
                $this->assertCount(1, $channels);
            });

-        $this->channelManager->getGlobalConnectionsCount('1234')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });

        $this->pusherServer->onClose($connection);

-        $this->channelManager->getGlobalConnectionsCount('1234')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234')
+            ->then(function ($total) {
                $this->assertEquals(0, $total);
            });

-        $this->channelManager->getGlobalChannels('1234')->then(function ($channels) {
+        $this->channelManager
+            ->getGlobalChannels('1234')
+            ->then(function ($channels) {
                $this->assertCount(0, $channels);
            });
    }
--- a/tests/LocalPongRemovalTest.php
+++ b/tests/LocalPongRemovalTest.php
@ -20,17 +20,23 @@ class LocalPongRemovalTest extends TestCase
        $this->channelManager->updateConnectionInChannels($activeConnection);
        $this->channelManager->updateConnectionInChannels($obsoleteConnection);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'public-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'public-channel')
+            ->then(function ($count) {
                $this->assertEquals(2, $count);
            });

        $this->channelManager->removeObsoleteConnections();

-        $this->channelManager->getGlobalConnectionsCount('1234', 'public-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'public-channel')
+            ->then(function ($count) {
                $this->assertEquals(1, $count);
            });

-        $this->channelManager->getLocalConnections()->then(function ($connections) use ($activeConnection) {
+        $this->channelManager
+            ->getLocalConnections()
+            ->then(function ($connections) use ($activeConnection) {
                $connection = $connections[$activeConnection->socketId];

                $this->assertEquals($activeConnection->socketId, $connection->socketId);
@ -51,17 +57,23 @@ class LocalPongRemovalTest extends TestCase
        $this->channelManager->updateConnectionInChannels($activeConnection);
        $this->channelManager->updateConnectionInChannels($obsoleteConnection);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'private-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'private-channel')
+            ->then(function ($count) {
                $this->assertEquals(2, $count);
            });

        $this->channelManager->removeObsoleteConnections();

-        $this->channelManager->getGlobalConnectionsCount('1234', 'private-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'private-channel')
+            ->then(function ($count) {
                $this->assertEquals(1, $count);
            });

-        $this->channelManager->getLocalConnections()->then(function ($connections) use ($activeConnection) {
+        $this->channelManager
+            ->getLocalConnections()
+            ->then(function ($connections) use ($activeConnection) {
                $connection = $connections[$activeConnection->socketId];

                $this->assertEquals($activeConnection->socketId, $connection->socketId);
@ -82,27 +94,37 @@ class LocalPongRemovalTest extends TestCase
        $this->channelManager->updateConnectionInChannels($activeConnection);
        $this->channelManager->updateConnectionInChannels($obsoleteConnection);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($count) {
                $this->assertEquals(2, $count);
            });

-        $this->channelManager->getChannelMembers('1234', 'presence-channel')->then(function ($members) {
+        $this->channelManager
+            ->getChannelMembers('1234', 'presence-channel')
+            ->then(function ($members) {
                $this->assertCount(2, $members);
            });

        $this->channelManager->removeObsoleteConnections();

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($count) {
                $this->assertEquals(1, $count);
            });

-        $this->channelManager->getLocalConnections()->then(function ($connections) use ($activeConnection) {
+        $this->channelManager
+            ->getLocalConnections()
+            ->then(function ($connections) use ($activeConnection) {
                $connection = $connections[$activeConnection->socketId];

                $this->assertEquals($activeConnection->socketId, $connection->socketId);
            });

-        $this->channelManager->getChannelMembers('1234', 'presence-channel')->then(function ($members) {
+        $this->channelManager
+            ->getChannelMembers('1234', 'presence-channel')
+            ->then(function ($members) {
                $this->assertCount(1, $members);
            });
    }
--- a/tests/PresenceChannelTest.php
+++ b/tests/PresenceChannelTest.php
@ -58,7 +58,9 @@ class PresenceChannelTest extends TestCase
            'channel' => 'presence-channel',
        ]);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });
    }
@ -110,11 +112,15 @@ class PresenceChannelTest extends TestCase
            ]),
        ]);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($total) {
                $this->assertEquals(3, $total);
            });

-        $this->channelManager->getChannelMembers('1234', 'presence-channel')->then(function ($members) {
+        $this->channelManager
+            ->getChannelMembers('1234', 'presence-channel')
+            ->then(function ($members) {
                $this->assertCount(2, $members);
            });
    }
@ -129,7 +135,9 @@ class PresenceChannelTest extends TestCase
            'data' => json_encode(['user_id' => 2]),
        ]);

-        $this->channelManager->getChannelMembers('1234', 'presence-channel')->then(function ($members) {
+        $this->channelManager
+            ->getChannelMembers('1234', 'presence-channel')
+            ->then(function ($members) {
                $this->assertCount(2, $members);
            });

@ -140,11 +148,15 @@ class PresenceChannelTest extends TestCase
            'data' => json_encode(['user_id' => 2]),
        ]);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });

-        $this->channelManager->getChannelMembers('1234', 'presence-channel')->then(function ($members) use ($rick) {
+        $this->channelManager
+            ->getChannelMembers('1234', 'presence-channel')
+            ->then(function ($members) use ($rick) {
                $this->assertCount(1, $members);
                $this->assertEquals(1, $members[$rick->socketId]->user_id);
            });
@ -154,7 +166,9 @@ class PresenceChannelTest extends TestCase
    {
        $connection = $this->newPresenceConnection('presence-channel', ['user_id' => 1]);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });

@ -167,7 +181,9 @@ class PresenceChannelTest extends TestCase

        $this->pusherServer->onMessage($connection, $message);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($total) {
                $this->assertEquals(0, $total);
            });
    }
@ -213,11 +229,15 @@ class PresenceChannelTest extends TestCase
        $rick = $this->newPresenceConnection('presence-channel', ['user_id' => 1]);
        $morty = $this->newPresenceConnection('presence-channel', ['user_id' => 2]);

-        $this->statisticsCollector->getStatistics()->then(function ($statistics) {
+        $this->statisticsCollector
+            ->getStatistics()
+            ->then(function ($statistics) {
                $this->assertCount(1, $statistics);
            });

-        $this->statisticsCollector->getAppStatistics('1234')->then(function ($statistic) {
+        $this->statisticsCollector
+            ->getAppStatistics('1234')
+            ->then(function ($statistic) {
                $this->assertEquals([
                    'peak_connections_count' => 2,
                    'websocket_messages_count' => 2,
@ -232,7 +252,9 @@ class PresenceChannelTest extends TestCase
        $this->newPresenceConnection('presence-channel', ['user_id' => 1]);
        $this->newPresenceConnection('presence-channel-2', ['user_id' => 2]);

-        $this->channelManager->getLocalConnections()->then(function ($connections) {
+        $this->channelManager
+            ->getLocalConnections()
+            ->then(function ($connections) {
                $this->assertCount(2, $connections);

                foreach ($connections as $connection) {
@ -282,11 +304,15 @@ class PresenceChannelTest extends TestCase
                $this->assertCount(0, $sockets);
            });

-        $this->channelManager->getMemberSockets('2', '1234', 'presence-channel')->then(function ($sockets) {
+        $this->channelManager
+            ->getMemberSockets('2', '1234', 'presence-channel')
+            ->then(function ($sockets) {
                $this->assertCount(0, $sockets);
            });

-        $this->channelManager->getMemberSockets('observer', '1234', 'presence-channel')->then(function ($sockets) {
+        $this->channelManager
+            ->getMemberSockets('observer', '1234', 'presence-channel')
+            ->then(function ($sockets) {
                $this->assertCount(1, $sockets);
            });
    }
@ -374,7 +400,8 @@ class PresenceChannelTest extends TestCase
        $this->getSubscribeClient()
            ->assertNothingDispatched();

-        $this->getPublishClient()->assertCalledWithArgs('publish', [
+        $this->getPublishClient()
+            ->assertCalledWithArgs('publish', [
                $this->channelManager->getRedisKey('1234', 'presence-channel'),
                $message->getPayload(),
            ]);
@ -411,7 +438,9 @@ class PresenceChannelTest extends TestCase

        $this->assertSame([], json_decode($response->getContent(), true));

-        $this->statisticsCollector->getAppStatistics('1234')->then(function ($statistic) {
+        $this->statisticsCollector
+            ->getAppStatistics('1234')
+            ->then(function ($statistic) {
                $this->assertEquals([
                    'peak_connections_count' => 1,
                    'websocket_messages_count' => 1,
@ -451,7 +480,9 @@ class PresenceChannelTest extends TestCase
        $this->assertSame([], json_decode($response->getContent(), true));

        if (method_exists($this->channelManager, 'getPublishClient')) {
-            $this->channelManager->getPublishClient()->assertCalledWithArgsCount(1, 'publish', [
+            $this->channelManager
+                ->getPublishClient()
+                ->assertCalledWithArgsCount(1, 'publish', [
                    $this->channelManager->getRedisKey('1234', 'presence-channel'),
                    json_encode([
                        'event' => 'some-event',
@ -497,7 +528,9 @@ class PresenceChannelTest extends TestCase
        $this->assertSame([], json_decode($response->getContent(), true));

        if (method_exists($this->channelManager, 'getPublishClient')) {
-            $this->channelManager->getPublishClient()->assertCalledWithArgsCount(1, 'publish', [
+            $this->channelManager
+                ->getPublishClient()
+                ->assertCalledWithArgsCount(1, 'publish', [
                    $this->channelManager->getRedisKey('1234', 'presence-channel'),
                    json_encode([
                        'event' => 'some-event',
--- a/tests/PrivateChannelTest.php
+++ b/tests/PrivateChannelTest.php
@ -48,7 +48,9 @@ class PrivateChannelTest extends TestCase
            'channel' => 'private-channel',
        ]);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'private-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'private-channel')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });
    }
@ -57,7 +59,9 @@ class PrivateChannelTest extends TestCase
    {
        $connection = $this->newPrivateConnection('private-channel');

-        $this->channelManager->getGlobalConnectionsCount('1234', 'private-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'private-channel')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });

@ -70,7 +74,9 @@ class PrivateChannelTest extends TestCase

        $this->pusherServer->onMessage($connection, $message);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'private-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'private-channel')
+            ->then(function ($total) {
                $this->assertEquals(0, $total);
            });
    }
@ -116,11 +122,15 @@ class PrivateChannelTest extends TestCase
        $rick = $this->newPrivateConnection('private-channel');
        $morty = $this->newPrivateConnection('private-channel');

-        $this->statisticsCollector->getStatistics()->then(function ($statistics) {
+        $this->statisticsCollector
+            ->getStatistics()
+            ->then(function ($statistics) {
                $this->assertCount(1, $statistics);
            });

-        $this->statisticsCollector->getAppStatistics('1234')->then(function ($statistic) {
+        $this->statisticsCollector
+            ->getAppStatistics('1234')
+            ->then(function ($statistic) {
                $this->assertEquals([
                    'peak_connections_count' => 2,
                    'websocket_messages_count' => 2,
@ -135,7 +145,9 @@ class PrivateChannelTest extends TestCase
        $this->newPrivateConnection('private-channel');
        $this->newPrivateConnection('private-channel-2');

-        $this->channelManager->getLocalConnections()->then(function ($connections) {
+        $this->channelManager
+            ->getLocalConnections()
+            ->then(function ($connections) {
                $this->assertCount(2, $connections);

                foreach ($connections as $connection) {
@ -208,7 +220,8 @@ class PrivateChannelTest extends TestCase
        $this->getSubscribeClient()
            ->assertNothingDispatched();

-        $this->getPublishClient()->assertCalledWithArgs('publish', [
+        $this->getPublishClient()
+            ->assertCalledWithArgs('publish', [
                $this->channelManager->getRedisKey('1234', 'private-channel'),
                $message->getPayload(),
            ]);
@ -245,7 +258,9 @@ class PrivateChannelTest extends TestCase

        $this->assertSame([], json_decode($response->getContent(), true));

-        $this->statisticsCollector->getAppStatistics('1234')->then(function ($statistic) {
+        $this->statisticsCollector
+            ->getAppStatistics('1234')
+            ->then(function ($statistic) {
                $this->assertEquals([
                    'peak_connections_count' => 1,
                    'websocket_messages_count' => 1,
@ -285,7 +300,9 @@ class PrivateChannelTest extends TestCase
        $this->assertSame([], json_decode($response->getContent(), true));

        if (method_exists($this->channelManager, 'getPublishClient')) {
-            $this->channelManager->getPublishClient()->assertCalledWithArgsCount(1, 'publish', [
+            $this->channelManager
+                ->getPublishClient()
+                ->assertCalledWithArgsCount(1, 'publish', [
                    $this->channelManager->getRedisKey('1234', 'private-channel'),
                    json_encode([
                        'event' => 'some-event',
@ -331,7 +348,9 @@ class PrivateChannelTest extends TestCase
        $this->assertSame([], json_decode($response->getContent(), true));

        if (method_exists($this->channelManager, 'getPublishClient')) {
-            $this->channelManager->getPublishClient()->assertCalledWithArgsCount(1, 'publish', [
+            $this->channelManager
+                ->getPublishClient()
+                ->assertCalledWithArgsCount(1, 'publish', [
                    $this->channelManager->getRedisKey('1234', 'private-channel'),
                    json_encode([
                        'event' => 'some-event',
--- a/tests/PublicChannelTest.php
+++ b/tests/PublicChannelTest.php
@ -14,7 +14,9 @@ class PublicChannelTest extends TestCase
    {
        $connection = $this->newActiveConnection(['public-channel']);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'public-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'public-channel')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });

@ -38,7 +40,9 @@ class PublicChannelTest extends TestCase
    {
        $connection = $this->newActiveConnection(['public-channel']);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'public-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'public-channel')
+            ->then(function ($total) {
                $this->assertEquals(1, $total);
            });

@ -51,7 +55,9 @@ class PublicChannelTest extends TestCase

        $this->pusherServer->onMessage($connection, $message);

-        $this->channelManager->getGlobalConnectionsCount('1234', 'public-channel')->then(function ($total) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'public-channel')
+            ->then(function ($total) {
                $this->assertEquals(0, $total);
            });
    }
@ -97,11 +103,15 @@ class PublicChannelTest extends TestCase
        $rick = $this->newActiveConnection(['public-channel']);
        $morty = $this->newActiveConnection(['public-channel']);

-        $this->statisticsCollector->getStatistics()->then(function ($statistics) {
+        $this->statisticsCollector
+            ->getStatistics()
+            ->then(function ($statistics) {
                $this->assertCount(1, $statistics);
            });

-        $this->statisticsCollector->getAppStatistics('1234')->then(function ($statistic) {
+        $this->statisticsCollector
+            ->getAppStatistics('1234')
+            ->then(function ($statistic) {
                $this->assertEquals([
                    'peak_connections_count' => 2,
                    'websocket_messages_count' => 2,
@ -116,7 +126,9 @@ class PublicChannelTest extends TestCase
        $this->newActiveConnection(['public-channel']);
        $this->newActiveConnection(['public-channel-2']);

-        $this->channelManager->getLocalConnections()->then(function ($connections) {
+        $this->channelManager
+            ->getLocalConnections()
+            ->then(function ($connections) {
                $this->assertCount(2, $connections);

                foreach ($connections as $connection) {
@ -189,7 +201,8 @@ class PublicChannelTest extends TestCase
        $this->getSubscribeClient()
            ->assertNothingDispatched();

-        $this->getPublishClient()->assertCalledWithArgs('publish', [
+        $this->getPublishClient()
+            ->assertCalledWithArgs('publish', [
                $this->channelManager->getRedisKey('1234', 'public-channel'),
                $message->getPayload(),
            ]);
@ -226,7 +239,9 @@ class PublicChannelTest extends TestCase

        $this->assertSame([], json_decode($response->getContent(), true));

-        $this->statisticsCollector->getAppStatistics('1234')->then(function ($statistic) {
+        $this->statisticsCollector
+            ->getAppStatistics('1234')
+            ->then(function ($statistic) {
                $this->assertEquals([
                    'peak_connections_count' => 1,
                    'websocket_messages_count' => 1,
@ -266,7 +281,9 @@ class PublicChannelTest extends TestCase
        $this->assertSame([], json_decode($response->getContent(), true));

        if (method_exists($this->channelManager, 'getPublishClient')) {
-            $this->channelManager->getPublishClient()->assertCalledWithArgsCount(1, 'publish', [
+            $this->channelManager
+                ->getPublishClient()
+                ->assertCalledWithArgsCount(1, 'publish', [
                    $this->channelManager->getRedisKey('1234', 'public-channel'),
                    json_encode([
                        'event' => 'some-event',
@ -312,7 +329,9 @@ class PublicChannelTest extends TestCase
        $this->assertSame([], json_decode($response->getContent(), true));

        if (method_exists($this->channelManager, 'getPublishClient')) {
-            $this->channelManager->getPublishClient()->assertCalledWithArgsCount(1, 'publish', [
+            $this->channelManager
+                ->getPublishClient()
+                ->assertCalledWithArgsCount(1, 'publish', [
                    $this->channelManager->getRedisKey('1234', 'public-channel'),
                    json_encode([
                        'event' => 'some-event',
--- a/tests/RedisPongRemovalTest.php
+++ b/tests/RedisPongRemovalTest.php
@ -19,21 +19,29 @@ class RedisPongRemovalTest extends TestCase
        // Make the connection look like it was lost 1 day ago.
        $this->channelManager->addConnectionToSet($obsoleteConnection, Carbon::now()->subDays(1));

-        $this->channelManager->getGlobalConnectionsCount('1234', 'public-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'public-channel')
+            ->then(function ($count) {
                $this->assertEquals(2, $count);
            });

-        $this->channelManager->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))->then(function ($expiredConnections) {
+        $this->channelManager
+            ->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))
+            ->then(function ($expiredConnections) {
                $this->assertCount(1, $expiredConnections);
            });

        $this->channelManager->removeObsoleteConnections();

-        $this->channelManager->getGlobalConnectionsCount('1234', 'public-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'public-channel')
+            ->then(function ($count) {
                $this->assertEquals(1, $count);
            });

-        $this->channelManager->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))->then(function ($expiredConnections) {
+        $this->channelManager
+            ->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))
+            ->then(function ($expiredConnections) {
                $this->assertCount(0, $expiredConnections);
            });
    }
@ -51,21 +59,29 @@ class RedisPongRemovalTest extends TestCase
        // Make the connection look like it was lost 1 day ago.
        $this->channelManager->addConnectionToSet($obsoleteConnection, Carbon::now()->subDays(1));

-        $this->channelManager->getGlobalConnectionsCount('1234', 'private-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'private-channel')
+            ->then(function ($count) {
                $this->assertEquals(2, $count);
            });

-        $this->channelManager->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))->then(function ($expiredConnections) {
+        $this->channelManager
+            ->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))
+            ->then(function ($expiredConnections) {
                $this->assertCount(1, $expiredConnections);
            });

        $this->channelManager->removeObsoleteConnections();

-        $this->channelManager->getGlobalConnectionsCount('1234', 'private-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'private-channel')
+            ->then(function ($count) {
                $this->assertEquals(1, $count);
            });

-        $this->channelManager->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))->then(function ($expiredConnections) {
+        $this->channelManager
+            ->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))
+            ->then(function ($expiredConnections) {
                $this->assertCount(0, $expiredConnections);
            });
    }
@ -83,29 +99,41 @@ class RedisPongRemovalTest extends TestCase
        // Make the connection look like it was lost 1 day ago.
        $this->channelManager->addConnectionToSet($obsoleteConnection, Carbon::now()->subDays(1));

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($count) {
                $this->assertEquals(2, $count);
            });

-        $this->channelManager->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))->then(function ($expiredConnections) {
+        $this->channelManager
+            ->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))
+            ->then(function ($expiredConnections) {
                $this->assertCount(1, $expiredConnections);
            });

-        $this->channelManager->getChannelMembers('1234', 'presence-channel')->then(function ($members) {
+        $this->channelManager
+            ->getChannelMembers('1234', 'presence-channel')
+            ->then(function ($members) {
                $this->assertCount(2, $members);
            });

        $this->channelManager->removeObsoleteConnections();

-        $this->channelManager->getGlobalConnectionsCount('1234', 'presence-channel')->then(function ($count) {
+        $this->channelManager
+            ->getGlobalConnectionsCount('1234', 'presence-channel')
+            ->then(function ($count) {
                $this->assertEquals(1, $count);
            });

-        $this->channelManager->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))->then(function ($expiredConnections) {
+        $this->channelManager
+            ->getConnectionsFromSet(0, Carbon::now()->subMinutes(2)->format('U'))
+            ->then(function ($expiredConnections) {
                $this->assertCount(0, $expiredConnections);
            });

-        $this->channelManager->getChannelMembers('1234', 'presence-channel')->then(function ($members) {
+        $this->channelManager
+            ->getChannelMembers('1234', 'presence-channel')
+            ->then(function ($members) {
                $this->assertCount(1, $members);
            });
    }