Merge pull request #8 from Askedio/analysis-XpRRjZ

Applied fixes from StyleCI

Author: gcphost

src/Console/Commands/RatchetServerCommand.php

@@ -10,8 +10,6 @@
 use Ratchet\WebSocket\WsServer;
 use Symfony\Component\Console\Input\InputOption;
 
-
-
 class RatchetServerCommand extends Command
 {
     /**
@@ -117,8 +115,7 @@ private function getWsServerDriver($ratchetServer)
      */
     private function startWampServer()
     {
-
-        $loop   = \React\EventLoop\Factory::create();
+        $loop = \React\EventLoop\Factory::create();
 
         $class = $this->option('class');
 
@@ -130,9 +127,9 @@ private function startWampServer()
         $pull = $context->getSocket(\ZMQ::SOCKET_PULL);
         $pull->bind(sprintf('tcp://%s:%d', config('ratchet.zmq.host'), config('ratchet.zmq.port')));
 
-         $pull->on('message', function($message) use ($ratchetServer) {
-             $ratchetServer->onEntry($message);
-         });
+        $pull->on('message', function ($message) use ($ratchetServer) {
+            $ratchetServer->onEntry($message);
+        });
 
 
         $webSock = new \React\Socket\Server($loop);
@@ -160,7 +157,6 @@ private function startWampServer()
      */
     private function server($driver)
     {
-
         if ($driver == 'WampServer') {
             return $this->startWampServer();
         }

src/Providers/LaravelRatchetServiceProvider.php

@@ -17,7 +17,7 @@ public function register()
         $this->app->register(\GrahamCampbell\Throttle\ThrottleServiceProvider::class);
 
         $this->app->singleton('command.ratchet.serve', function () {
-              return new RatchetServerCommand();
+            return new RatchetServerCommand();
         });
 
         $this->commands('command.ratchet.serve');

src/Pusher.php

@@ -5,15 +5,13 @@
 use Ratchet\ConnectionInterface;
 use Ratchet\Wamp\WampServerInterface;
 
-class Pusher implements WampServerInterface {
-
-
-    public $subscribedTopics = array();
+class Pusher implements WampServerInterface
+{
+    public $subscribedTopics = [];
 
 
     protected $console = false;
 
-
     public function __construct($console)
     {
         $this->console = $console;
@@ -22,7 +20,8 @@ public function __construct($console)
     /**
      * @param string JSON'ified string we'll receive from ZeroMQ
      */
-    public function onEntry($entry) {
+    public function onEntry($entry)
+    {
         $entryData = json_decode($entry, true);
 
         if (!array_key_exists($entryData['category'], $this->subscribedTopics)) {
@@ -40,7 +39,8 @@ public function onEntry($entry) {
      * @param \Ratchet\ConnectionInterface $conn
      * @param string|Topic                 $topic The topic to subscribe to
      */
-    public function onSubscribe(ConnectionInterface $conn, $topic) {
+    public function onSubscribe(ConnectionInterface $conn, $topic)
+    {
         $this->console->info("onSubscribe: {$conn->WAMP->sessionId} topic: $topic {$topic->count()}");
 
         if (!array_key_exists($topic->getId(), $this->subscribedTopics)) {
@@ -49,14 +49,14 @@ public function onSubscribe(ConnectionInterface $conn, $topic) {
         }
     }
 
-
     /**
      * A request to unsubscribe from a topic has been made.
      *
      * @param \Ratchet\ConnectionInterface $conn
      * @param string|Topic                 $topic The topic to unsubscribe from
      */
-    public function onUnSubscribe(ConnectionInterface $conn, $topic) {
+    public function onUnSubscribe(ConnectionInterface $conn, $topic)
+    {
         $this->console->info("onUnSubscribe: topic: $topic {$topic->count()}");
     }
 
@@ -67,7 +67,8 @@ public function onUnSubscribe(ConnectionInterface $conn, $topic) {
      *
      * @throws \Exception
      */
-    public function onOpen(ConnectionInterface $conn) {
+    public function onOpen(ConnectionInterface $conn)
+    {
         $this->console->info("onOpen ({$conn->WAMP->sessionId})");
     }
 
@@ -78,11 +79,11 @@ public function onOpen(ConnectionInterface $conn) {
      *
      * @throws \Exception
      */
-    public function onClose(ConnectionInterface $conn) {
+    public function onClose(ConnectionInterface $conn)
+    {
         $this->console->info("onClose ({$conn->WAMP->sessionId})");
     }
 
-
     /**
      * An RPC call has been received.
      *
@@ -91,12 +92,12 @@ public function onClose(ConnectionInterface $conn) {
      * @param string|Topic                 $topic  The topic to execute the call against
      * @param array                        $params Call parameters received from the client
      */
-    public function onCall(ConnectionInterface $conn, $id, $topic, array $params) {
-        $this->console->info("onCall");
+    public function onCall(ConnectionInterface $conn, $id, $topic, array $params)
+    {
+        $this->console->info('onCall');
         $conn->callError($id, $topic, 'You are not allowed to make calls')->close();
     }
 
-
     /**
      * A client is attempting to publish content to a subscribed connections on a URI.
      *
@@ -106,8 +107,9 @@ public function onCall(ConnectionInterface $conn, $id, $topic, array $params) {
      * @param array                        $exclude  A list of session IDs the message should be excluded from (blacklist)
      * @param array                        $eligible A list of session Ids the message should be send to (whitelist)
      */
-    public function onPublish(ConnectionInterface $conn, $topic, $event, array $exclude, array $eligible) {
-        $this->console->info("onPublish");
+    public function onPublish(ConnectionInterface $conn, $topic, $event, array $exclude, array $eligible)
+    {
+        $this->console->info('onPublish');
     }
 
     /**
@@ -119,7 +121,8 @@ public function onPublish(ConnectionInterface $conn, $topic, $event, array $excl
      *
      * @throws \Exception
      */
-    public function onError(ConnectionInterface $conn, \Exception $e) {
-        $this->console->info("onError" . $e->getMessage());
+    public function onError(ConnectionInterface $conn, \Exception $e)
+    {
+        $this->console->info('onError'.$e->getMessage());
     }
-}
+}

src/config/ratchet.php

@@ -21,7 +21,7 @@
                          ],
     'abortOnMessageThrottle' => false,
     'blackList'              => collect([]),
-    'zmq'   => [
+    'zmq'                    => [
         'host' => '127.0.0.1',
         'port' => 5555,
       ],