mshamaseen / laravel-ratchet

src/Receiver.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
         $this->userAuthSocketMapper = [];
 
         $this->mainRoutes();
-        include base_path() . '/routes/websocket.php';
+        include base_path().'/routes/websocket.php';
         $this->routes = WsRoute::getRoutes();
     }
 
@@ -74,7 +74,7 @@ 
 
             $this->resetSession($msg->session);
 
-            $this->resetAuth($msg,$from);
+            $this->resetAuth($msg, $from);
 
             $route = $this->routes[$msg->route];
 
@@ -178,7 +178,7 @@ 
         if ($data = \Session::getHandler()->read($session_id)) {
             $data = @unserialize($data);
 
-            if ($data !== false && ! is_null($data) && is_array($data)) {
+            if ($data !== false && !is_null($data) && is_array($data)) {
                 return $data;
             }
         }
@@ -210,17 +210,17 @@ 
      * @param ConnectionInterface $from
      * @throws WebSocketException
      */
-    function resetAuth($msg,$from)
+    function resetAuth($msg, $from)
     {
         $data = $this->readFromHandler($msg->session);
 
-        if(!empty($data))
+        if (!empty($data))
         {
             $user_id = $this->getUserId($data);
             /** @var User $user_model */
             $user_model = $this->getUserModel();
             $user = $user_model::find($user_id);
-            if(!$user)
+            if (!$user)
             {
                 $this->error($msg, $from, 'There is no such user.');
             }

Braces +1 added lines, -2 removed lines

@@ -228,8 +228,7 @@
 
             $this->clients[$from->resourceId]->id = \Auth::id();
             $this->userAuthSocketMapper[\Auth::id()] = $from->resourceId;
-        }
-        else
+        } else
         {
             $this->error($msg, $from, 'Unauthenticated.');
         }

src/Controllers/ChatController.php

Spacing +6 added lines, -6 removed lines

@@ -20,15 +20,15 @@ 
      */
     function sendMessageToUser()
     {
-        $this->validate($this->request,[
+        $this->validate($this->request, [
             'user_id'=>'required',
             'message' => 'required'
         ]);
 
         $user_id = $this->request->user_id;
-        $data = ['message'=>$this->request->message,'event'=>'receivedMessage'];
+        $data = ['message'=>$this->request->message, 'event'=>'receivedMessage'];
 
-        $this->sendToUser($user_id,$data);
+        $this->sendToUser($user_id, $data);
     }
 
     /**
@@ -36,12 +36,12 @@ 
      */
     function sendMessageToRoom()
     {
-        $this->validate($this->request,[
+        $this->validate($this->request, [
             'room_id'=>'required',
             'message' => 'required'
         ]);
         $room_id = $this->request->room_id;
-        $data = ['message'=>$this->request->message,'event'=>'RoomMessage'];
-        $this->sendToRoom($room_id,$data);
+        $data = ['message'=>$this->request->message, 'event'=>'RoomMessage'];
+        $this->sendToRoom($room_id, $data);
     }
 }
\ No newline at end of file

src/Traits/WebSocketMessagesManager.php

Spacing +13 added lines, -13 removed lines

@@ -25,9 +25,9 @@ 
      * @param $error
      * @throws WebSocketException
      */
-    function error($request,ConnectionInterface $from, $error)
+    function error($request, ConnectionInterface $from, $error)
     {
-        if(env('APP_DEBUG'))
+        if (env('APP_DEBUG'))
         {
             echo 'User error: ';
             echo $error."\n";
@@ -39,7 +39,7 @@ 
             'event'=>'error',
             'message'=>$error
         ];
-        $this->sendToWebSocketUser($from,$data);
+        $this->sendToWebSocketUser($from, $data);
         throw new WebSocketException();
     }
 
@@ -47,17 +47,17 @@ 
      * @param ConnectionInterface $conn
      * @param $data
      */
-    function sendToWebSocketUser(ConnectionInterface $conn,$data)
+    function sendToWebSocketUser(ConnectionInterface $conn, $data)
     {
-        if(!is_array($data))
-            $data = ['msg'=>$data,'event'=>'default'];
+        if (!is_array($data))
+            $data = ['msg'=>$data, 'event'=>'default'];
 
-        if(!isset($data['event']))
+        if (!isset($data['event']))
         {
             $data['event'] = 'default';
         }
 
-        if(isset($this->route) && !array_key_exists('sender',$data))
+        if (isset($this->route) && !array_key_exists('sender', $data))
             $data['sender'] = $this->getSenderData();
 
         $conn->send(json_encode($data));
@@ -68,17 +68,17 @@ 
      * @param array $data
      * @throws WebSocketException
      */
-    function sendToUser($user_id,$data)
+    function sendToUser($user_id, $data)
     {
-        if(!array_key_exists($user_id,$this->userAuthSocketMapper))
+        if (!array_key_exists($user_id, $this->userAuthSocketMapper))
         {
-            $this->error($this->request,$this->conn,'No such user !');
+            $this->error($this->request, $this->conn, 'No such user !');
         }
 
         $resourceId = $this->userAuthSocketMapper[$user_id];
         /** @var ConnectionInterface $conn */
         $conn = $this->clients[$resourceId]->conn;
-        $this->sendToWebSocketUser($conn,$data);
+        $this->sendToWebSocketUser($conn, $data);
     }
 
     /**
@@ -86,7 +86,7 @@ 
      */
     function sendBack($data)
     {
-       $this->sendToWebSocketUser($this->conn,$data);
+       $this->sendToWebSocketUser($this->conn, $data);
     }
 
     /**

Braces +6 added lines, -4 removed lines

@@ -49,16 +49,18 @@
      */
     function sendToWebSocketUser(ConnectionInterface $conn,$data)
     {
-        if(!is_array($data))
-            $data = ['msg'=>$data,'event'=>'default'];
+        if(!is_array($data)) {
+                    $data = ['msg'=>$data,'event'=>'default'];
+        }
 
         if(!isset($data['event']))
         {
             $data['event'] = 'default';
         }
 
-        if(isset($this->route) && !array_key_exists('sender',$data))
-            $data['sender'] = $this->getSenderData();
+        if(isset($this->route) && !array_key_exists('sender',$data)) {
+                    $data['sender'] = $this->getSenderData();
+        }
 
         $conn->send(json_encode($data));
     }