diff --git a/src/Console/StartWebSocketServer.php b/src/Console/StartWebSocketServer.php index a4e8ff2..e68767c 100644 --- a/src/Console/StartWebSocketServer.php +++ b/src/Console/StartWebSocketServer.php @@ -2,23 +2,23 @@ namespace BeyondCode\LaravelWebSockets\Console; -use React\Socket\Connector; +use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; +use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter; +use BeyondCode\LaravelWebSockets\Server\Logger\ConnectionLogger; +use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger; +use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger; +use BeyondCode\LaravelWebSockets\Server\WebSocketServerFactory; +use BeyondCode\LaravelWebSockets\Statistics\DnsResolver; +use BeyondCode\LaravelWebSockets\Statistics\Logger\HttpStatisticsLogger; +use BeyondCode\LaravelWebSockets\Statistics\Logger\StatisticsLogger as StatisticsLoggerInterface; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; use Clue\React\Buzz\Browser; use Illuminate\Console\Command; use React\Dns\Config\Config as DnsConfig; +use React\Dns\Resolver\Factory as DnsFactory; use React\Dns\Resolver\ResolverInterface; use React\EventLoop\Factory as LoopFactory; -use React\Dns\Resolver\Factory as DnsFactory; -use BeyondCode\LaravelWebSockets\Statistics\DnsResolver; -use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; -use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter; -use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger; -use BeyondCode\LaravelWebSockets\Server\WebSocketServerFactory; -use BeyondCode\LaravelWebSockets\Server\Logger\ConnectionLogger; -use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; -use BeyondCode\LaravelWebSockets\Statistics\Logger\HttpStatisticsLogger; -use BeyondCode\LaravelWebSockets\Statistics\Logger\StatisticsLogger as StatisticsLoggerInterface; +use React\Socket\Connector; class StartWebSocketServer extends Command { diff --git a/src/Dashboard/DashboardLogger.php b/src/Dashboard/DashboardLogger.php index 315135f..874d0d2 100644 --- a/src/Dashboard/DashboardLogger.php +++ b/src/Dashboard/DashboardLogger.php @@ -2,9 +2,9 @@ namespace BeyondCode\LaravelWebSockets\Dashboard; -use stdClass; -use Ratchet\ConnectionInterface; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use Ratchet\ConnectionInterface; +use stdClass; class DashboardLogger { diff --git a/src/Dashboard/Http/Controllers/AuthenticateDashboard.php b/src/Dashboard/Http/Controllers/AuthenticateDashboard.php index 23c1110..0f9f56c 100644 --- a/src/Dashboard/Http/Controllers/AuthenticateDashboard.php +++ b/src/Dashboard/Http/Controllers/AuthenticateDashboard.php @@ -2,10 +2,10 @@ namespace BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers; -use Pusher\Pusher; -use Illuminate\Http\Request; use BeyondCode\LaravelWebSockets\Apps\App; use Illuminate\Broadcasting\Broadcasters\PusherBroadcaster; +use Illuminate\Http\Request; +use Pusher\Pusher; class AuthenticateDashboard { diff --git a/src/Dashboard/Http/Controllers/SendMessage.php b/src/Dashboard/Http/Controllers/SendMessage.php index 5c4461a..fe0c755 100644 --- a/src/Dashboard/Http/Controllers/SendMessage.php +++ b/src/Dashboard/Http/Controllers/SendMessage.php @@ -2,10 +2,10 @@ namespace BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers; -use Pusher\Pusher; -use Illuminate\Http\Request; use BeyondCode\LaravelWebSockets\Statistics\Rules\AppId; use Illuminate\Broadcasting\Broadcasters\PusherBroadcaster; +use Illuminate\Http\Request; +use Pusher\Pusher; class SendMessage { diff --git a/src/Dashboard/Http/Controllers/ShowDashboard.php b/src/Dashboard/Http/Controllers/ShowDashboard.php index 101cfb1..2ed2bb1 100644 --- a/src/Dashboard/Http/Controllers/ShowDashboard.php +++ b/src/Dashboard/Http/Controllers/ShowDashboard.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers; -use Illuminate\Http\Request; use BeyondCode\LaravelWebSockets\Apps\AppProvider; +use Illuminate\Http\Request; class ShowDashboard { diff --git a/src/Exceptions/InvalidApp.php b/src/Exceptions/InvalidApp.php index 8a4ecff..28e50d9 100644 --- a/src/Exceptions/InvalidApp.php +++ b/src/Exceptions/InvalidApp.php @@ -3,9 +3,9 @@ namespace BeyondCode\LaravelWebSockets\Exceptions; use Exception; -use Facade\IgnitionContracts\Solution; use Facade\IgnitionContracts\BaseSolution; use Facade\IgnitionContracts\ProvidesSolution; +use Facade\IgnitionContracts\Solution; class InvalidApp extends Exception implements ProvidesSolution { diff --git a/src/Facades/StatisticsLogger.php b/src/Facades/StatisticsLogger.php index 858d63f..ba8f70b 100644 --- a/src/Facades/StatisticsLogger.php +++ b/src/Facades/StatisticsLogger.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Facades; -use Illuminate\Support\Facades\Facade; use BeyondCode\LaravelWebSockets\Statistics\Logger\StatisticsLogger as StatisticsLoggerInterface; +use Illuminate\Support\Facades\Facade; /** @see \BeyondCode\LaravelWebSockets\Statistics\Logger\HttpStatisticsLogger */ class StatisticsLogger extends Facade diff --git a/src/HttpApi/Controllers/Controller.php b/src/HttpApi/Controllers/Controller.php index 975e8ef..492b3eb 100644 --- a/src/HttpApi/Controllers/Controller.php +++ b/src/HttpApi/Controllers/Controller.php @@ -2,22 +2,22 @@ namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers; -use Exception; -use Pusher\Pusher; -use Illuminate\Support\Arr; -use Illuminate\Http\Request; -use GuzzleHttp\Psr7\Response; -use Ratchet\ConnectionInterface; -use Illuminate\Http\JsonResponse; -use GuzzleHttp\Psr7\ServerRequest; -use Illuminate\Support\Collection; -use Ratchet\Http\HttpServerInterface; -use Psr\Http\Message\RequestInterface; use BeyondCode\LaravelWebSockets\Apps\App; use BeyondCode\LaravelWebSockets\QueryParameters; -use Symfony\Component\HttpKernel\Exception\HttpException; -use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use Exception; +use GuzzleHttp\Psr7\Response; +use GuzzleHttp\Psr7\ServerRequest; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; +use Illuminate\Support\Arr; +use Illuminate\Support\Collection; +use Psr\Http\Message\RequestInterface; +use Pusher\Pusher; +use Ratchet\ConnectionInterface; +use Ratchet\Http\HttpServerInterface; +use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; +use Symfony\Component\HttpKernel\Exception\HttpException; abstract class Controller implements HttpServerInterface { diff --git a/src/HttpApi/Controllers/FetchChannelsController.php b/src/HttpApi/Controllers/FetchChannelsController.php index c57efe7..89dab33 100644 --- a/src/HttpApi/Controllers/FetchChannelsController.php +++ b/src/HttpApi/Controllers/FetchChannelsController.php @@ -2,9 +2,9 @@ namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers; -use Illuminate\Support\Str; use Illuminate\Http\Request; use Illuminate\Support\Collection; +use Illuminate\Support\Str; use Symfony\Component\HttpKernel\Exception\HttpException; class FetchChannelsController extends Controller diff --git a/src/HttpApi/Controllers/FetchUsersController.php b/src/HttpApi/Controllers/FetchUsersController.php index 87960e4..d59da7c 100644 --- a/src/HttpApi/Controllers/FetchUsersController.php +++ b/src/HttpApi/Controllers/FetchUsersController.php @@ -2,10 +2,10 @@ namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\HttpException; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; class FetchUsersController extends Controller { diff --git a/src/HttpApi/Controllers/TriggerEventController.php b/src/HttpApi/Controllers/TriggerEventController.php index 0764071..7f00005 100644 --- a/src/HttpApi/Controllers/TriggerEventController.php +++ b/src/HttpApi/Controllers/TriggerEventController.php @@ -2,9 +2,9 @@ namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers; -use Illuminate\Http\Request; -use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; +use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; +use Illuminate\Http\Request; class TriggerEventController extends Controller { diff --git a/src/Server/Logger/Logger.php b/src/Server/Logger/Logger.php index 7422309..ee62d4c 100644 --- a/src/Server/Logger/Logger.php +++ b/src/Server/Logger/Logger.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Server\Logger; -use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Formatter\OutputFormatterStyle; +use Symfony\Component\Console\Output\OutputInterface; class Logger { diff --git a/src/Server/Logger/WebsocketsLogger.php b/src/Server/Logger/WebsocketsLogger.php index 2088ae3..0279869 100644 --- a/src/Server/Logger/WebsocketsLogger.php +++ b/src/Server/Logger/WebsocketsLogger.php @@ -2,11 +2,11 @@ namespace BeyondCode\LaravelWebSockets\Server\Logger; +use BeyondCode\LaravelWebSockets\QueryParameters; use Exception; use Ratchet\ConnectionInterface; use Ratchet\RFC6455\Messaging\MessageInterface; use Ratchet\WebSocket\MessageComponentInterface; -use BeyondCode\LaravelWebSockets\QueryParameters; class WebsocketsLogger extends Logger implements MessageComponentInterface { diff --git a/src/Server/OriginCheck.php b/src/Server/OriginCheck.php index dfebfff..5a3bd05 100644 --- a/src/Server/OriginCheck.php +++ b/src/Server/OriginCheck.php @@ -2,10 +2,10 @@ namespace BeyondCode\LaravelWebSockets\Server; +use Psr\Http\Message\RequestInterface; use Ratchet\ConnectionInterface; use Ratchet\Http\CloseResponseTrait; use Ratchet\Http\HttpServerInterface; -use Psr\Http\Message\RequestInterface; use Ratchet\MessageComponentInterface; class OriginCheck implements HttpServerInterface diff --git a/src/Server/Router.php b/src/Server/Router.php index 3ce6685..110b2d9 100644 --- a/src/Server/Router.php +++ b/src/Server/Router.php @@ -2,18 +2,18 @@ namespace BeyondCode\LaravelWebSockets\Server; -use Ratchet\WebSocket\WsServer; +use BeyondCode\LaravelWebSockets\Exceptions\InvalidWebSocketController; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\TriggerEventController; +use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger; +use BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler; use Illuminate\Support\Collection; +use Ratchet\WebSocket\MessageComponentInterface; +use Ratchet\WebSocket\WsServer; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; -use Ratchet\WebSocket\MessageComponentInterface; -use BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler; -use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger; -use BeyondCode\LaravelWebSockets\Exceptions\InvalidWebSocketController; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\TriggerEventController; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController; class Router { diff --git a/src/Server/WebSocketServerFactory.php b/src/Server/WebSocketServerFactory.php index e7bdd82..0e4ab4b 100644 --- a/src/Server/WebSocketServerFactory.php +++ b/src/Server/WebSocketServerFactory.php @@ -2,17 +2,17 @@ namespace BeyondCode\LaravelWebSockets\Server; +use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger; use Ratchet\Http\Router; -use React\Socket\Server; use Ratchet\Server\IoServer; -use React\Socket\SecureServer; -use React\EventLoop\LoopInterface; use React\EventLoop\Factory as LoopFactory; +use React\EventLoop\LoopInterface; +use React\Socket\SecureServer; +use React\Socket\Server; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Routing\Matcher\UrlMatcher; use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RouteCollection; -use Symfony\Component\Routing\Matcher\UrlMatcher; -use Symfony\Component\Console\Output\OutputInterface; -use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger; class WebSocketServerFactory { diff --git a/src/Statistics/DnsResolver.php b/src/Statistics/DnsResolver.php index e6522f0..ceca998 100644 --- a/src/Statistics/DnsResolver.php +++ b/src/Statistics/DnsResolver.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Statistics; -use React\Promise\FulfilledPromise; use React\Dns\Resolver\ResolverInterface; +use React\Promise\FulfilledPromise; class DnsResolver implements ResolverInterface { diff --git a/src/Statistics/Events/StatisticsUpdated.php b/src/Statistics/Events/StatisticsUpdated.php index 6e2ac35..e486180 100644 --- a/src/Statistics/Events/StatisticsUpdated.php +++ b/src/Statistics/Events/StatisticsUpdated.php @@ -2,12 +2,12 @@ namespace BeyondCode\LaravelWebSockets\Statistics\Events; -use Illuminate\Support\Str; -use Illuminate\Queue\SerializesModels; -use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; use BeyondCode\LaravelWebSockets\Statistics\Models\WebSocketsStatisticsEntry; +use Illuminate\Broadcasting\PrivateChannel; +use Illuminate\Contracts\Broadcasting\ShouldBroadcast; +use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Str; class StatisticsUpdated implements ShouldBroadcast { diff --git a/src/Statistics/Http/Controllers/WebSocketStatisticsEntriesController.php b/src/Statistics/Http/Controllers/WebSocketStatisticsEntriesController.php index 39ea041..8fd758c 100644 --- a/src/Statistics/Http/Controllers/WebSocketStatisticsEntriesController.php +++ b/src/Statistics/Http/Controllers/WebSocketStatisticsEntriesController.php @@ -2,9 +2,9 @@ namespace BeyondCode\LaravelWebSockets\Statistics\Http\Controllers; -use Illuminate\Http\Request; -use BeyondCode\LaravelWebSockets\Statistics\Rules\AppId; use BeyondCode\LaravelWebSockets\Statistics\Events\StatisticsUpdated; +use BeyondCode\LaravelWebSockets\Statistics\Rules\AppId; +use Illuminate\Http\Request; class WebSocketStatisticsEntriesController { diff --git a/src/Statistics/Logger/HttpStatisticsLogger.php b/src/Statistics/Logger/HttpStatisticsLogger.php index a23f7a9..1cc0201 100644 --- a/src/Statistics/Logger/HttpStatisticsLogger.php +++ b/src/Statistics/Logger/HttpStatisticsLogger.php @@ -2,13 +2,13 @@ namespace BeyondCode\LaravelWebSockets\Statistics\Logger; -use Clue\React\Buzz\Browser; -use Ratchet\ConnectionInterface; -use function GuzzleHttp\Psr7\stream_for; use BeyondCode\LaravelWebSockets\Apps\App; +use BeyondCode\LaravelWebSockets\Statistics\Http\Controllers\WebSocketStatisticsEntriesController; use BeyondCode\LaravelWebSockets\Statistics\Statistic; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; -use BeyondCode\LaravelWebSockets\Statistics\Http\Controllers\WebSocketStatisticsEntriesController; +use Clue\React\Buzz\Browser; +use function GuzzleHttp\Psr7\stream_for; +use Ratchet\ConnectionInterface; class HttpStatisticsLogger implements StatisticsLogger { diff --git a/src/Statistics/Rules/AppId.php b/src/Statistics/Rules/AppId.php index a6fc6d2..9734a6b 100644 --- a/src/Statistics/Rules/AppId.php +++ b/src/Statistics/Rules/AppId.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Statistics\Rules; -use Illuminate\Contracts\Validation\Rule; use BeyondCode\LaravelWebSockets\Apps\AppProvider; +use Illuminate\Contracts\Validation\Rule; class AppId implements Rule { diff --git a/src/WebSockets/Channels/Channel.php b/src/WebSockets/Channels/Channel.php index 9415b0b..0c9ca49 100644 --- a/src/WebSockets/Channels/Channel.php +++ b/src/WebSockets/Channels/Channel.php @@ -2,11 +2,11 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Channels; -use stdClass; -use Illuminate\Support\Str; -use Ratchet\ConnectionInterface; use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\InvalidSignature; +use Illuminate\Support\Str; +use Ratchet\ConnectionInterface; +use stdClass; class Channel { diff --git a/src/WebSockets/Channels/ChannelManagers/ArrayChannelManager.php b/src/WebSockets/Channels/ChannelManagers/ArrayChannelManager.php index 9664c65..8d0d91c 100644 --- a/src/WebSockets/Channels/ChannelManagers/ArrayChannelManager.php +++ b/src/WebSockets/Channels/ChannelManagers/ArrayChannelManager.php @@ -2,13 +2,13 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManagers; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\Channel; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\PrivateChannel; use Illuminate\Support\Arr; use Illuminate\Support\Str; use Ratchet\ConnectionInterface; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\Channel; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\PrivateChannel; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel; class ArrayChannelManager implements ChannelManager { diff --git a/src/WebSockets/Channels/PresenceChannel.php b/src/WebSockets/Channels/PresenceChannel.php index bb6ec45..9bbe1ec 100644 --- a/src/WebSockets/Channels/PresenceChannel.php +++ b/src/WebSockets/Channels/PresenceChannel.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Channels; -use stdClass; use Ratchet\ConnectionInterface; +use stdClass; class PresenceChannel extends Channel { diff --git a/src/WebSockets/Channels/PrivateChannel.php b/src/WebSockets/Channels/PrivateChannel.php index 34f3ac0..a4d40c3 100644 --- a/src/WebSockets/Channels/PrivateChannel.php +++ b/src/WebSockets/Channels/PrivateChannel.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Channels; -use stdClass; use Ratchet\ConnectionInterface; +use stdClass; class PrivateChannel extends Channel { diff --git a/src/WebSockets/Messages/PusherChannelProtocolMessage.php b/src/WebSockets/Messages/PusherChannelProtocolMessage.php index 8c36595..5217faa 100644 --- a/src/WebSockets/Messages/PusherChannelProtocolMessage.php +++ b/src/WebSockets/Messages/PusherChannelProtocolMessage.php @@ -2,10 +2,10 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Messages; -use stdClass; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; use Illuminate\Support\Str; use Ratchet\ConnectionInterface; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use stdClass; class PusherChannelProtocolMessage implements PusherMessage { diff --git a/src/WebSockets/Messages/PusherClientMessage.php b/src/WebSockets/Messages/PusherClientMessage.php index 5e30f7e..f7c4c45 100644 --- a/src/WebSockets/Messages/PusherClientMessage.php +++ b/src/WebSockets/Messages/PusherClientMessage.php @@ -2,11 +2,11 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Messages; -use stdClass; -use Illuminate\Support\Str; -use Ratchet\ConnectionInterface; use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use Illuminate\Support\Str; +use Ratchet\ConnectionInterface; +use stdClass; class PusherClientMessage implements PusherMessage { diff --git a/src/WebSockets/Messages/PusherMessageFactory.php b/src/WebSockets/Messages/PusherMessageFactory.php index fc64ae3..7fbe512 100644 --- a/src/WebSockets/Messages/PusherMessageFactory.php +++ b/src/WebSockets/Messages/PusherMessageFactory.php @@ -2,10 +2,10 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Messages; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; use Illuminate\Support\Str; use Ratchet\ConnectionInterface; use Ratchet\RFC6455\Messaging\MessageInterface; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; class PusherMessageFactory { diff --git a/src/WebSockets/WebSocketHandler.php b/src/WebSockets/WebSocketHandler.php index a9d0c8c..d2fdb6c 100644 --- a/src/WebSockets/WebSocketHandler.php +++ b/src/WebSockets/WebSocketHandler.php @@ -2,19 +2,19 @@ namespace BeyondCode\LaravelWebSockets\WebSockets; -use Exception; -use Ratchet\ConnectionInterface; use BeyondCode\LaravelWebSockets\Apps\App; -use Ratchet\RFC6455\Messaging\MessageInterface; -use Ratchet\WebSocket\MessageComponentInterface; -use BeyondCode\LaravelWebSockets\QueryParameters; -use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; +use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; +use BeyondCode\LaravelWebSockets\QueryParameters; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\ConnectionsOverCapacity; use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\UnknownAppKey; use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\WebSocketException; use BeyondCode\LaravelWebSockets\WebSockets\Messages\PusherMessageFactory; -use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\ConnectionsOverCapacity; +use Exception; +use Ratchet\ConnectionInterface; +use Ratchet\RFC6455\Messaging\MessageInterface; +use Ratchet\WebSocket\MessageComponentInterface; class WebSocketHandler implements MessageComponentInterface { diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php index 9c57842..02ede2c 100644 --- a/src/WebSocketsServiceProvider.php +++ b/src/WebSocketsServiceProvider.php @@ -2,20 +2,20 @@ namespace BeyondCode\LaravelWebSockets; +use BeyondCode\LaravelWebSockets\Apps\AppProvider; +use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\AuthenticateDashboard; +use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\DashboardApiController; +use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\SendMessage; +use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowDashboard; +use BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize as AuthorizeDashboard; +use BeyondCode\LaravelWebSockets\Server\Router; +use BeyondCode\LaravelWebSockets\Statistics\Http\Controllers\WebSocketStatisticsEntriesController; +use BeyondCode\LaravelWebSockets\Statistics\Http\Middleware\Authorize as AuthorizeStatistics; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManagers\ArrayChannelManager; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; -use BeyondCode\LaravelWebSockets\Server\Router; -use BeyondCode\LaravelWebSockets\Apps\AppProvider; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; -use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\SendMessage; -use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowDashboard; -use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\AuthenticateDashboard; -use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\DashboardApiController; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManagers\ArrayChannelManager; -use BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize as AuthorizeDashboard; -use BeyondCode\LaravelWebSockets\Statistics\Http\Middleware\Authorize as AuthorizeStatistics; -use BeyondCode\LaravelWebSockets\Statistics\Http\Controllers\WebSocketStatisticsEntriesController; class WebSocketsServiceProvider extends ServiceProvider { diff --git a/tests/Channels/ChannelTest.php b/tests/Channels/ChannelTest.php index 41272fa..56c6a7b 100644 --- a/tests/Channels/ChannelTest.php +++ b/tests/Channels/ChannelTest.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\Channels; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Tests\Mocks\Message; +use BeyondCode\LaravelWebSockets\Tests\TestCase; class ChannelTest extends TestCase { diff --git a/tests/Channels/PresenceChannelTest.php b/tests/Channels/PresenceChannelTest.php index 8a86560..c2ae4a4 100644 --- a/tests/Channels/PresenceChannelTest.php +++ b/tests/Channels/PresenceChannelTest.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\Channels; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Tests\Mocks\Message; +use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\InvalidSignature; class PresenceChannelTest extends TestCase diff --git a/tests/Channels/PrivateChannelTest.php b/tests/Channels/PrivateChannelTest.php index 493c005..6b8d9b6 100644 --- a/tests/Channels/PrivateChannelTest.php +++ b/tests/Channels/PrivateChannelTest.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\Channels; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Tests\Mocks\Message; +use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\InvalidSignature; class PrivateChannelTest extends TestCase diff --git a/tests/ClientProviders/AppTest.php b/tests/ClientProviders/AppTest.php index 71393d7..72e8e9d 100644 --- a/tests/ClientProviders/AppTest.php +++ b/tests/ClientProviders/AppTest.php @@ -3,8 +3,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\ClientProviders; use BeyondCode\LaravelWebSockets\Apps\App; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Exceptions\InvalidApp; +use BeyondCode\LaravelWebSockets\Tests\TestCase; class AppTest extends TestCase { diff --git a/tests/ClientProviders/ConfigAppProviderTest.php b/tests/ClientProviders/ConfigAppProviderTest.php index 3beb8b6..150233b 100644 --- a/tests/ClientProviders/ConfigAppProviderTest.php +++ b/tests/ClientProviders/ConfigAppProviderTest.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\ClientProviders; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Apps\ConfigAppProvider; +use BeyondCode\LaravelWebSockets\Tests\TestCase; class ConfigAppProviderTest extends TestCase { diff --git a/tests/Commands/CleanStatisticsTest.php b/tests/Commands/CleanStatisticsTest.php index ffe70c6..91f7790 100644 --- a/tests/Commands/CleanStatisticsTest.php +++ b/tests/Commands/CleanStatisticsTest.php @@ -3,10 +3,10 @@ namespace BeyondCode\LaravelWebSockets\Tests\Commands; use Artisan; +use BeyondCode\LaravelWebSockets\Statistics\Models\WebSocketsStatisticsEntry; +use BeyondCode\LaravelWebSockets\Tests\TestCase; use Carbon\Carbon; use Illuminate\Support\Collection; -use BeyondCode\LaravelWebSockets\Tests\TestCase; -use BeyondCode\LaravelWebSockets\Statistics\Models\WebSocketsStatisticsEntry; class CleanStatisticsTest extends TestCase { diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php index 0c832ad..89db694 100644 --- a/tests/ConnectionTest.php +++ b/tests/ConnectionTest.php @@ -4,8 +4,8 @@ namespace BeyondCode\LaravelWebSockets\Tests; use BeyondCode\LaravelWebSockets\Apps\App; use BeyondCode\LaravelWebSockets\Tests\Mocks\Message; -use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\UnknownAppKey; use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\ConnectionsOverCapacity; +use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\UnknownAppKey; class ConnectionTest extends TestCase { diff --git a/tests/HttpApi/FetchChannelTest.php b/tests/HttpApi/FetchChannelTest.php index 50fcaf1..262f93c 100644 --- a/tests/HttpApi/FetchChannelTest.php +++ b/tests/HttpApi/FetchChannelTest.php @@ -2,13 +2,13 @@ namespace BeyondCode\LaravelWebSockets\Tests\HttpApi; -use Pusher\Pusher; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController; +use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; +use BeyondCode\LaravelWebSockets\Tests\TestCase; use GuzzleHttp\Psr7\Request; use Illuminate\Http\JsonResponse; -use BeyondCode\LaravelWebSockets\Tests\TestCase; -use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; +use Pusher\Pusher; use Symfony\Component\HttpKernel\Exception\HttpException; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController; class FetchChannelTest extends TestCase { diff --git a/tests/HttpApi/FetchChannelsTest.php b/tests/HttpApi/FetchChannelsTest.php index 9d750e4..8dcc1fe 100644 --- a/tests/HttpApi/FetchChannelsTest.php +++ b/tests/HttpApi/FetchChannelsTest.php @@ -2,13 +2,13 @@ namespace BeyondCode\LaravelWebSockets\Tests\HttpApi; -use Pusher\Pusher; +use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController; +use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; +use BeyondCode\LaravelWebSockets\Tests\TestCase; use GuzzleHttp\Psr7\Request; use Illuminate\Http\JsonResponse; -use BeyondCode\LaravelWebSockets\Tests\TestCase; -use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; +use Pusher\Pusher; use Symfony\Component\HttpKernel\Exception\HttpException; -use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController; class FetchChannelsTest extends TestCase { diff --git a/tests/HttpApi/FetchUsersTest.php b/tests/HttpApi/FetchUsersTest.php index 35a9744..43bc858 100644 --- a/tests/HttpApi/FetchUsersTest.php +++ b/tests/HttpApi/FetchUsersTest.php @@ -2,12 +2,12 @@ namespace BeyondCode\LaravelWebSockets\Tests\HttpApi; -use Pusher\Pusher; -use GuzzleHttp\Psr7\Request; -use BeyondCode\LaravelWebSockets\Tests\TestCase; -use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; -use Symfony\Component\HttpKernel\Exception\HttpException; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController; +use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; +use BeyondCode\LaravelWebSockets\Tests\TestCase; +use GuzzleHttp\Psr7\Request; +use Pusher\Pusher; +use Symfony\Component\HttpKernel\Exception\HttpException; class FetchUsersTest extends TestCase { diff --git a/tests/Messages/PusherClientMessageTest.php b/tests/Messages/PusherClientMessageTest.php index d3aa7ba..a97aed7 100644 --- a/tests/Messages/PusherClientMessageTest.php +++ b/tests/Messages/PusherClientMessageTest.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\Messages; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Tests\Mocks\Message; +use BeyondCode\LaravelWebSockets\Tests\TestCase; class PusherClientMessageTest extends TestCase { diff --git a/tests/Mocks/Connection.php b/tests/Mocks/Connection.php index a0c37d0..2e9c606 100644 --- a/tests/Mocks/Connection.php +++ b/tests/Mocks/Connection.php @@ -3,8 +3,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\Mocks; use GuzzleHttp\Psr7\Request; -use Ratchet\ConnectionInterface; use PHPUnit\Framework\Assert as PHPUnit; +use Ratchet\ConnectionInterface; class Connection implements ConnectionInterface { diff --git a/tests/Statistics/Controllers/WebSocketsStatisticsControllerTest.php b/tests/Statistics/Controllers/WebSocketsStatisticsControllerTest.php index fb67fcb..14e4629 100644 --- a/tests/Statistics/Controllers/WebSocketsStatisticsControllerTest.php +++ b/tests/Statistics/Controllers/WebSocketsStatisticsControllerTest.php @@ -2,9 +2,9 @@ namespace BeyondCode\LaravelWebSockets\Tests\Statistics\Controllers; -use BeyondCode\LaravelWebSockets\Tests\TestCase; -use BeyondCode\LaravelWebSockets\Statistics\Models\WebSocketsStatisticsEntry; use BeyondCode\LaravelWebSockets\Statistics\Http\Controllers\WebSocketStatisticsEntriesController; +use BeyondCode\LaravelWebSockets\Statistics\Models\WebSocketsStatisticsEntry; +use BeyondCode\LaravelWebSockets\Tests\TestCase; class WebSocketsStatisticsControllerTest extends TestCase { diff --git a/tests/Statistics/Logger/StatisticsLoggerTest.php b/tests/Statistics/Logger/StatisticsLoggerTest.php index 23f0a6a..49abd19 100644 --- a/tests/Statistics/Logger/StatisticsLoggerTest.php +++ b/tests/Statistics/Logger/StatisticsLoggerTest.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\Statistics\Controllers; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; +use BeyondCode\LaravelWebSockets\Tests\TestCase; class StatisticsLoggerTest extends TestCase { diff --git a/tests/Statistics/Rules/AppIdTest.php b/tests/Statistics/Rules/AppIdTest.php index 3176d09..0849d0b 100644 --- a/tests/Statistics/Rules/AppIdTest.php +++ b/tests/Statistics/Rules/AppIdTest.php @@ -2,8 +2,8 @@ namespace BeyondCode\LaravelWebSockets\Tests\Statistics\Rules; -use BeyondCode\LaravelWebSockets\Tests\TestCase; use BeyondCode\LaravelWebSockets\Statistics\Rules\AppId; +use BeyondCode\LaravelWebSockets\Tests\TestCase; class AppIdTest extends TestCase { diff --git a/tests/TestCase.php b/tests/TestCase.php index 14d3655..e4b4023 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,17 +2,17 @@ namespace BeyondCode\LaravelWebSockets\Tests; -use Mockery; +use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; +use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; +use BeyondCode\LaravelWebSockets\Tests\Mocks\Message; +use BeyondCode\LaravelWebSockets\Tests\Statistics\Logger\FakeStatisticsLogger; +use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; +use BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler; +use BeyondCode\LaravelWebSockets\WebSocketsServiceProvider; use Clue\React\Buzz\Browser; use GuzzleHttp\Psr7\Request; +use Mockery; use Ratchet\ConnectionInterface; -use BeyondCode\LaravelWebSockets\Tests\Mocks\Message; -use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection; -use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; -use BeyondCode\LaravelWebSockets\WebSocketsServiceProvider; -use BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler; -use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; -use BeyondCode\LaravelWebSockets\Tests\Statistics\Logger\FakeStatisticsLogger; abstract class TestCase extends \Orchestra\Testbench\TestCase {