Apply fixes from StyleCI (#518)

rennokki · web-flow · commit 341eb9604f78 · 2020-09-10T21:59:49.000+02:00
diff --git 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 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
@@ -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
@@ -4,7 +4,6 @@
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,7 +4,6 @@
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 @@ public function respond()
             'event' => $this->payload->event,
             'data' => $this->payload,
         ]);
-
     }
 }
diff --git 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
@@ -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
@@ -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
@@ -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\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
@@ -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
@@ -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 @@ public function connection($appId)
                                 'peak_connections_count', $peakConnectionsCount
                             );
                     });
-        });
+            });
     }
 
     /**
@@ -157,7 +153,7 @@ public function disconnection($appId)
                                 'peak_connections_count', $peakConnectionsCount
                             );
                     });
-        });
+            });
     }
 
     /**
diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php
diff --git a/tests/Commands/StatisticsCleanTest.php b/tests/Commands/StatisticsCleanTest.php
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
diff --git a/tests/Dashboard/StatisticsTest.php b/tests/Dashboard/StatisticsTest.php
diff --git a/tests/Mocks/PromiseResolver.php b/tests/Mocks/PromiseResolver.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace BeyondCode\LaravelWebSockets\Contracts;`
`4`	`4`
`5`	`5`	`use Ratchet\ConnectionInterface;`
	`6`	`+use React\EventLoop\LoopInterface;`
`6`	`7`	`use React\Promise\PromiseInterface;`
`7`	`8`	`use stdClass;`
`8`		`-use React\EventLoop\LoopInterface;`
`9`	`9`
`10`	`10`	`interface ChannelManager`
`11`	`11`	`{`