From 341eb9604f78f5027e11d838b5c27269f9741b5d Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Sep 2020 22:59:49 +0300 Subject: [PATCH] Apply fixes from StyleCI (#518) --- src/API/Controller.php | 6 +++--- src/API/FetchChannel.php | 2 +- src/API/FetchChannels.php | 1 - src/API/FetchUsers.php | 2 -- src/API/TriggerEvent.php | 6 +----- src/ChannelManagers/LocalChannelManager.php | 8 ++++---- src/ChannelManagers/RedisChannelManager.php | 10 +++------- src/Channels/Channel.php | 6 +++--- src/Console/Commands/StartServer.php | 10 +++++----- src/Contracts/ChannelManager.php | 2 +- src/Contracts/StatisticsCollector.php | 1 - src/Dashboard/Http/Controllers/SendMessage.php | 1 - src/DashboardLogger.php | 1 - src/Facades/StatisticsCollector.php | 2 +- src/Facades/StatisticsStore.php | 2 +- src/Server/Exceptions/ConnectionsOverCapacity.php | 2 +- src/Server/Exceptions/InvalidSignature.php | 2 +- src/Server/HttpServer.php | 2 +- src/Server/Messages/PusherChannelProtocolMessage.php | 2 -- src/Server/Messages/PusherClientMessage.php | 5 ++--- src/Server/Messages/PusherMessageFactory.php | 4 ++-- src/Server/Router.php | 3 +-- src/Server/WebSocketHandler.php | 8 ++++---- src/ServerFactory.php | 4 ++-- src/Statistics/Collectors/MemoryCollector.php | 8 ++++---- src/Statistics/Collectors/RedisCollector.php | 10 +++------- src/WebSocketsServiceProvider.php | 6 +++--- tests/Commands/StatisticsCleanTest.php | 6 ++---- tests/ConnectionTest.php | 3 ++- tests/Dashboard/StatisticsTest.php | 1 - tests/Mocks/PromiseResolver.php | 2 +- tests/TestCase.php | 6 +++--- 32 files changed, 55 insertions(+), 79 deletions(-) diff --git a/src/API/Controller.php b/src/API/Controller.php index 994447d..74267de 100644 --- a/src/API/Controller.php +++ b/src/API/Controller.php @@ -2,8 +2,9 @@ namespace BeyondCode\LaravelWebSockets\API; +use BeyondCode\LaravelWebSockets\Apps\App; +use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; use BeyondCode\LaravelWebSockets\Server\QueryParameters; -use Ratchet\Http\HttpServerInterface; use Exception; use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\ServerRequest; @@ -14,11 +15,10 @@ use Illuminate\Support\Collection; use Psr\Http\Message\RequestInterface; use Pusher\Pusher; use Ratchet\ConnectionInterface; +use Ratchet\Http\HttpServerInterface; use React\Promise\PromiseInterface; use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; use Symfony\Component\HttpKernel\Exception\HttpException; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; -use BeyondCode\LaravelWebSockets\Apps\App; abstract class Controller implements HttpServerInterface { diff --git a/src/API/FetchChannel.php b/src/API/FetchChannel.php index 73650b4..a0c20fa 100644 --- a/src/API/FetchChannel.php +++ b/src/API/FetchChannel.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\API; -use Illuminate\Support\Str; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Symfony\Component\HttpKernel\Exception\HttpException; class FetchChannel extends Controller diff --git a/src/API/FetchChannels.php b/src/API/FetchChannels.php index 7eff6ee..dcfd74f 100644 --- a/src/API/FetchChannels.php +++ b/src/API/FetchChannels.php @@ -4,7 +4,6 @@ namespace BeyondCode\LaravelWebSockets\API; use BeyondCode\LaravelWebSockets\Channels\Channel; use Illuminate\Http\Request; -use Illuminate\Support\Collection; use Illuminate\Support\Str; use stdClass; use Symfony\Component\HttpKernel\Exception\HttpException; diff --git a/src/API/FetchUsers.php b/src/API/FetchUsers.php index 79176fc..5327847 100644 --- a/src/API/FetchUsers.php +++ b/src/API/FetchUsers.php @@ -2,10 +2,8 @@ namespace BeyondCode\LaravelWebSockets\API; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; use Illuminate\Http\Request; use Illuminate\Support\Str; -use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\HttpException; class FetchUsers extends Controller diff --git a/src/API/TriggerEvent.php b/src/API/TriggerEvent.php index 4ec9cd2..9f66e63 100644 --- a/src/API/TriggerEvent.php +++ b/src/API/TriggerEvent.php @@ -3,12 +3,8 @@ namespace BeyondCode\LaravelWebSockets\API; use BeyondCode\LaravelWebSockets\DashboardLogger; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; -use Illuminate\Http\Request; -use Illuminate\Support\Str; -use Illuminate\Support\Collection; -use Symfony\Component\HttpKernel\Exception\HttpException; use BeyondCode\LaravelWebSockets\Facades\StatisticsCollector; +use Illuminate\Http\Request; class TriggerEvent extends Controller { diff --git a/src/ChannelManagers/LocalChannelManager.php b/src/ChannelManagers/LocalChannelManager.php index 914e585..2b8150c 100644 --- a/src/ChannelManagers/LocalChannelManager.php +++ b/src/ChannelManagers/LocalChannelManager.php @@ -2,16 +2,16 @@ namespace BeyondCode\LaravelWebSockets\ChannelManagers; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; -use Illuminate\Support\Str; use BeyondCode\LaravelWebSockets\Channels\Channel; use BeyondCode\LaravelWebSockets\Channels\PresenceChannel; use BeyondCode\LaravelWebSockets\Channels\PrivateChannel; +use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; +use Illuminate\Support\Str; +use Ratchet\ConnectionInterface; +use React\EventLoop\LoopInterface; use React\Promise\FulfilledPromise; use React\Promise\PromiseInterface; use stdClass; -use Ratchet\ConnectionInterface; -use React\EventLoop\LoopInterface; class LocalChannelManager implements ChannelManager { diff --git a/src/ChannelManagers/RedisChannelManager.php b/src/ChannelManagers/RedisChannelManager.php index ba7557e..eea138c 100644 --- a/src/ChannelManagers/RedisChannelManager.php +++ b/src/ChannelManagers/RedisChannelManager.php @@ -2,18 +2,14 @@ namespace BeyondCode\LaravelWebSockets\ChannelManagers; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; -use Illuminate\Support\Str; use BeyondCode\LaravelWebSockets\Channels\Channel; -use BeyondCode\LaravelWebSockets\Channels\PresenceChannel; -use BeyondCode\LaravelWebSockets\Channels\PrivateChannel; -use React\Promise\FulfilledPromise; -use React\Promise\PromiseInterface; use Clue\React\Redis\Client; use Clue\React\Redis\Factory; -use stdClass; +use Illuminate\Support\Str; use Ratchet\ConnectionInterface; use React\EventLoop\LoopInterface; +use React\Promise\PromiseInterface; +use stdClass; class RedisChannelManager extends LocalChannelManager { diff --git a/src/Channels/Channel.php b/src/Channels/Channel.php index c21e951..e7e5377 100644 --- a/src/Channels/Channel.php +++ b/src/Channels/Channel.php @@ -2,12 +2,12 @@ namespace BeyondCode\LaravelWebSockets\Channels; +use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; use BeyondCode\LaravelWebSockets\DashboardLogger; +use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature; +use Illuminate\Support\Str; use Ratchet\ConnectionInterface; use stdClass; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; -use Illuminate\Support\Str; -use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature; class Channel { diff --git a/src/Console/Commands/StartServer.php b/src/Console/Commands/StartServer.php index 4ad9338..a088330 100644 --- a/src/Console/Commands/StartServer.php +++ b/src/Console/Commands/StartServer.php @@ -2,17 +2,17 @@ namespace BeyondCode\LaravelWebSockets\Console\Commands; +use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; +use BeyondCode\LaravelWebSockets\Contracts\StatisticsCollector; +use BeyondCode\LaravelWebSockets\Facades\StatisticsCollector as StatisticsCollectorFacade; +use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter; use BeyondCode\LaravelWebSockets\Server\Loggers\ConnectionLogger; use BeyondCode\LaravelWebSockets\Server\Loggers\HttpLogger; use BeyondCode\LaravelWebSockets\Server\Loggers\WebSocketsLogger; use BeyondCode\LaravelWebSockets\ServerFactory; use Illuminate\Console\Command; -use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter; -use BeyondCode\LaravelWebSockets\Facades\StatisticsCollector as StatisticsCollectorFacade; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; -use BeyondCode\LaravelWebSockets\Contracts\StatisticsCollector; -use React\EventLoop\Factory as LoopFactory; use Illuminate\Support\Facades\Cache; +use React\EventLoop\Factory as LoopFactory; class StartServer extends Command { diff --git a/src/Contracts/ChannelManager.php b/src/Contracts/ChannelManager.php index 5d6a894..e056e11 100644 --- a/src/Contracts/ChannelManager.php +++ b/src/Contracts/ChannelManager.php @@ -3,9 +3,9 @@ namespace BeyondCode\LaravelWebSockets\Contracts; use Ratchet\ConnectionInterface; +use React\EventLoop\LoopInterface; use React\Promise\PromiseInterface; use stdClass; -use React\EventLoop\LoopInterface; interface ChannelManager { diff --git a/src/Contracts/StatisticsCollector.php b/src/Contracts/StatisticsCollector.php index 0ffaeac..a46e757 100644 --- a/src/Contracts/StatisticsCollector.php +++ b/src/Contracts/StatisticsCollector.php @@ -2,7 +2,6 @@ namespace BeyondCode\LaravelWebSockets\Contracts; -use React\Promise\FulfilledPromise; use React\Promise\PromiseInterface; interface StatisticsCollector diff --git a/src/Dashboard/Http/Controllers/SendMessage.php b/src/Dashboard/Http/Controllers/SendMessage.php index 90155d1..e0ac2d6 100644 --- a/src/Dashboard/Http/Controllers/SendMessage.php +++ b/src/Dashboard/Http/Controllers/SendMessage.php @@ -4,7 +4,6 @@ namespace BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers; use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; use BeyondCode\LaravelWebSockets\Rules\AppId; -use Exception; use Illuminate\Http\Request; class SendMessage diff --git a/src/DashboardLogger.php b/src/DashboardLogger.php index cfd09ba..046d6ff 100644 --- a/src/DashboardLogger.php +++ b/src/DashboardLogger.php @@ -12,7 +12,6 @@ class DashboardLogger const TYPE_CONNECTED = 'connected'; - const TYPE_OCCUPIED = 'occupied'; const TYPE_SUBSCRIBED = 'subscribed'; diff --git a/src/Facades/StatisticsCollector.php b/src/Facades/StatisticsCollector.php index 5dd1377..7878831 100644 --- a/src/Facades/StatisticsCollector.php +++ b/src/Facades/StatisticsCollector.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Facades; -use Illuminate\Support\Facades\Facade; use BeyondCode\LaravelWebSockets\Contracts\StatisticsCollector as StatisticsCollectorInterface; +use Illuminate\Support\Facades\Facade; class StatisticsCollector extends Facade { diff --git a/src/Facades/StatisticsStore.php b/src/Facades/StatisticsStore.php index 2674e0d..e17a6db 100644 --- a/src/Facades/StatisticsStore.php +++ b/src/Facades/StatisticsStore.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Facades; -use Illuminate\Support\Facades\Facade; use BeyondCode\LaravelWebSockets\Contracts\StatisticsStore as StatisticsStoreInterface; +use Illuminate\Support\Facades\Facade; class StatisticsStore extends Facade { diff --git a/src/Server/Exceptions/ConnectionsOverCapacity.php b/src/Server/Exceptions/ConnectionsOverCapacity.php index 8a35e0f..37f0495 100644 --- a/src/Server/Exceptions/ConnectionsOverCapacity.php +++ b/src/Server/Exceptions/ConnectionsOverCapacity.php @@ -12,6 +12,6 @@ class ConnectionsOverCapacity extends WebSocketException */ public function __construct() { - $this->trigger("Over capacity", 4100); + $this->trigger('Over capacity', 4100); } } diff --git a/src/Server/Exceptions/InvalidSignature.php b/src/Server/Exceptions/InvalidSignature.php index 0cfbb22..b2aaf79 100644 --- a/src/Server/Exceptions/InvalidSignature.php +++ b/src/Server/Exceptions/InvalidSignature.php @@ -12,6 +12,6 @@ class InvalidSignature extends WebSocketException */ public function __construct() { - $this->trigger("Invalid Signature", 4009); + $this->trigger('Invalid Signature', 4009); } } diff --git a/src/Server/HttpServer.php b/src/Server/HttpServer.php index 67a8d44..a9f4d0c 100644 --- a/src/Server/HttpServer.php +++ b/src/Server/HttpServer.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Server; -use Ratchet\Http\HttpServerInterface; use Ratchet\Http\HttpServer as BaseHttpServer; +use Ratchet\Http\HttpServerInterface; class HttpServer extends BaseHttpServer { diff --git a/src/Server/Messages/PusherChannelProtocolMessage.php b/src/Server/Messages/PusherChannelProtocolMessage.php index 96436e6..14dea23 100644 --- a/src/Server/Messages/PusherChannelProtocolMessage.php +++ b/src/Server/Messages/PusherChannelProtocolMessage.php @@ -2,11 +2,9 @@ namespace BeyondCode\LaravelWebSockets\Server\Messages; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; use Illuminate\Support\Str; use Ratchet\ConnectionInterface; use stdClass; -use BeyondCode\LaravelWebSockets\Contracts\PusherMessage; class PusherChannelProtocolMessage extends PusherClientMessage { diff --git a/src/Server/Messages/PusherClientMessage.php b/src/Server/Messages/PusherClientMessage.php index 2211de0..afb74dc 100644 --- a/src/Server/Messages/PusherClientMessage.php +++ b/src/Server/Messages/PusherClientMessage.php @@ -2,12 +2,12 @@ namespace BeyondCode\LaravelWebSockets\Server\Messages; -use BeyondCode\LaravelWebSockets\DashboardLogger; use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; +use BeyondCode\LaravelWebSockets\Contracts\PusherMessage; +use BeyondCode\LaravelWebSockets\DashboardLogger; use Illuminate\Support\Str; use Ratchet\ConnectionInterface; use stdClass; -use BeyondCode\LaravelWebSockets\Contracts\PusherMessage; class PusherClientMessage implements PusherMessage { @@ -75,6 +75,5 @@ class PusherClientMessage implements PusherMessage 'event' => $this->payload->event, 'data' => $this->payload, ]); - } } diff --git a/src/Server/Messages/PusherMessageFactory.php b/src/Server/Messages/PusherMessageFactory.php index acfb2db..253252b 100644 --- a/src/Server/Messages/PusherMessageFactory.php +++ b/src/Server/Messages/PusherMessageFactory.php @@ -2,11 +2,11 @@ namespace BeyondCode\LaravelWebSockets\Server\Messages; +use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; +use BeyondCode\LaravelWebSockets\Contracts\PusherMessage; use Illuminate\Support\Str; use Ratchet\ConnectionInterface; use Ratchet\RFC6455\Messaging\MessageInterface; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; -use BeyondCode\LaravelWebSockets\Contracts\PusherMessage; class PusherMessageFactory { diff --git a/src/Server/Router.php b/src/Server/Router.php index 7dddf2b..d0ce199 100644 --- a/src/Server/Router.php +++ b/src/Server/Router.php @@ -3,7 +3,6 @@ namespace BeyondCode\LaravelWebSockets\Server; use BeyondCode\LaravelWebSockets\Server\Loggers\WebSocketsLogger; -use Illuminate\Support\Collection; use Ratchet\WebSocket\MessageComponentInterface; use Ratchet\WebSocket\WsServer; use Symfony\Component\Routing\Route; @@ -15,7 +14,7 @@ class Router * The implemented routes. * * @var \Symfony\Component\Routing\RouteCollection - */ + */ protected $routes; /** diff --git a/src/Server/WebSocketHandler.php b/src/Server/WebSocketHandler.php index 3593611..1016a1a 100644 --- a/src/Server/WebSocketHandler.php +++ b/src/Server/WebSocketHandler.php @@ -2,14 +2,14 @@ namespace BeyondCode\LaravelWebSockets\Server; -use BeyondCode\LaravelWebSockets\DashboardLogger; use BeyondCode\LaravelWebSockets\Apps\App; +use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; +use BeyondCode\LaravelWebSockets\DashboardLogger; +use BeyondCode\LaravelWebSockets\Facades\StatisticsCollector; use Exception; -use Ratchet\WebSocket\MessageComponentInterface; use Ratchet\ConnectionInterface; use Ratchet\RFC6455\Messaging\MessageInterface; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; -use BeyondCode\LaravelWebSockets\Facades\StatisticsCollector; +use Ratchet\WebSocket\MessageComponentInterface; class WebSocketHandler implements MessageComponentInterface { diff --git a/src/ServerFactory.php b/src/ServerFactory.php index ac79ca6..f132635 100644 --- a/src/ServerFactory.php +++ b/src/ServerFactory.php @@ -2,6 +2,8 @@ namespace BeyondCode\LaravelWebSockets; +use BeyondCode\LaravelWebSockets\Server\HttpServer; +use BeyondCode\LaravelWebSockets\Server\Loggers\HttpLogger; use Ratchet\Http\Router; use Ratchet\Server\IoServer; use React\EventLoop\Factory as LoopFactory; @@ -12,8 +14,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Routing\Matcher\UrlMatcher; use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RouteCollection; -use BeyondCode\LaravelWebSockets\Server\HttpServer; -use BeyondCode\LaravelWebSockets\Server\Loggers\HttpLogger; class ServerFactory { diff --git a/src/Statistics/Collectors/MemoryCollector.php b/src/Statistics/Collectors/MemoryCollector.php index bf5fc80..b56db20 100644 --- a/src/Statistics/Collectors/MemoryCollector.php +++ b/src/Statistics/Collectors/MemoryCollector.php @@ -2,12 +2,12 @@ namespace BeyondCode\LaravelWebSockets\Statistics\Collectors; -use React\Promise\FulfilledPromise; -use React\Promise\PromiseInterface; +use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; +use BeyondCode\LaravelWebSockets\Contracts\StatisticsCollector; use BeyondCode\LaravelWebSockets\Facades\StatisticsStore; use BeyondCode\LaravelWebSockets\Statistics\Statistic; -use BeyondCode\LaravelWebSockets\Contracts\StatisticsCollector; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; +use React\Promise\FulfilledPromise; +use React\Promise\PromiseInterface; class MemoryCollector implements StatisticsCollector { diff --git a/src/Statistics/Collectors/RedisCollector.php b/src/Statistics/Collectors/RedisCollector.php index 43776d5..5c8dff0 100644 --- a/src/Statistics/Collectors/RedisCollector.php +++ b/src/Statistics/Collectors/RedisCollector.php @@ -2,14 +2,10 @@ namespace BeyondCode\LaravelWebSockets\Statistics\Collectors; -use React\Promise\FulfilledPromise; -use React\Promise\PromiseInterface; -use BeyondCode\LaravelWebSockets\Facades\StatisticsStore; use BeyondCode\LaravelWebSockets\Statistics\Statistic; -use BeyondCode\LaravelWebSockets\Contracts\StatisticsCollector; -use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; use Illuminate\Cache\RedisLock; use Illuminate\Support\Facades\Redis; +use React\Promise\PromiseInterface; class RedisCollector extends MemoryCollector { @@ -117,7 +113,7 @@ class RedisCollector extends MemoryCollector 'peak_connections_count', $peakConnectionsCount ); }); - }); + }); } /** @@ -157,7 +153,7 @@ class RedisCollector extends MemoryCollector 'peak_connections_count', $peakConnectionsCount ); }); - }); + }); } /** diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php index 937a57d..9a46353 100644 --- a/src/WebSocketsServiceProvider.php +++ b/src/WebSocketsServiceProvider.php @@ -2,15 +2,15 @@ namespace BeyondCode\LaravelWebSockets; -use Illuminate\Support\ServiceProvider; -use BeyondCode\LaravelWebSockets\Server\Router; -use BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize as AuthorizeDashboard; use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\AuthenticateDashboard; use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\SendMessage; use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowDashboard; use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowStatistics; +use BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize as AuthorizeDashboard; +use BeyondCode\LaravelWebSockets\Server\Router; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Route; +use Illuminate\Support\ServiceProvider; class WebSocketsServiceProvider extends ServiceProvider { diff --git a/tests/Commands/StatisticsCleanTest.php b/tests/Commands/StatisticsCleanTest.php index 5d64902..ea236b9 100644 --- a/tests/Commands/StatisticsCleanTest.php +++ b/tests/Commands/StatisticsCleanTest.php @@ -2,8 +2,6 @@ namespace BeyondCode\LaravelWebSockets\Test; -use BeyondCode\LaravelWebSockets\Test\TestCase; - class StatisticsCleanTest extends TestCase { public function test_clean_statistics_for_app_id() @@ -17,7 +15,7 @@ class StatisticsCleanTest extends TestCase foreach ($this->statisticsStore->getRawRecords() as $record) { $record->update(['created_at' => now()->subDays(10)]); - }; + } $this->artisan('websockets:clean', [ 'appId' => '12345', @@ -38,7 +36,7 @@ class StatisticsCleanTest extends TestCase foreach ($this->statisticsStore->getRawRecords() as $record) { $record->update(['created_at' => now()->subDays(10)]); - }; + } $this->artisan('websockets:clean', ['--days' => 1]); diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php index 1ff8d15..e4e3701 100644 --- a/tests/ConnectionTest.php +++ b/tests/ConnectionTest.php @@ -2,7 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Test; -use BeyondCode\LaravelWebSockets\Server\Exceptions\{ OriginNotAllowed, UnknownAppKey, ConnectionsOverCapacity }; +use BeyondCode\LaravelWebSockets\Server\Exceptions\OriginNotAllowed; +use BeyondCode\LaravelWebSockets\Server\Exceptions\UnknownAppKey; class ConnectionTest extends TestCase { diff --git a/tests/Dashboard/StatisticsTest.php b/tests/Dashboard/StatisticsTest.php index 9e62193..fe5ab50 100644 --- a/tests/Dashboard/StatisticsTest.php +++ b/tests/Dashboard/StatisticsTest.php @@ -2,7 +2,6 @@ namespace BeyondCode\LaravelWebSockets\Test\Dashboard; -use BeyondCode\LaravelWebSockets\Statistics\Logger\MemoryStatisticsLogger; use BeyondCode\LaravelWebSockets\Test\Models\User; use BeyondCode\LaravelWebSockets\Test\TestCase; diff --git a/tests/Mocks/PromiseResolver.php b/tests/Mocks/PromiseResolver.php index d78e606..bbc0df7 100644 --- a/tests/Mocks/PromiseResolver.php +++ b/tests/Mocks/PromiseResolver.php @@ -3,8 +3,8 @@ namespace BeyondCode\LaravelWebSockets\Test\Mocks; use Clue\React\Block; -use React\Promise\PromiseInterface; use React\Promise\FulfilledPromise; +use React\Promise\PromiseInterface; class PromiseResolver implements PromiseInterface { diff --git a/tests/TestCase.php b/tests/TestCase.php index c013b1c..e62b10d 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,13 +2,13 @@ namespace BeyondCode\LaravelWebSockets\Test; -use Orchestra\Testbench\BrowserKit\TestCase as Orchestra; -use React\EventLoop\Factory as LoopFactory; -use GuzzleHttp\Psr7\Request; use BeyondCode\LaravelWebSockets\Contracts\ChannelManager; use BeyondCode\LaravelWebSockets\Contracts\StatisticsCollector; use BeyondCode\LaravelWebSockets\Contracts\StatisticsStore; +use GuzzleHttp\Psr7\Request; use Illuminate\Support\Facades\Redis; +use Orchestra\Testbench\BrowserKit\TestCase as Orchestra; +use React\EventLoop\Factory as LoopFactory; abstract class TestCase extends Orchestra {