@@ -53,7 +53,7 @@ |
||
| 53 | 53 | new Receiver() |
| 54 | 54 | ) |
| 55 | 55 | ), |
| 56 | - env('CHAT_PORT',8080) |
|
| 56 | + env('CHAT_PORT', 8080) |
|
| 57 | 57 | ); |
| 58 | 58 | |
| 59 | 59 | $server->run(); |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | |
| 11 | 11 | class WsRoute extends \Illuminate\Support\Facades\Facade |
| 12 | 12 | { |
| 13 | - static function getFacadeAccessor(){ |
|
| 13 | + static function getFacadeAccessor() { |
|
| 14 | 14 | |
| 15 | 15 | return 'WsRoute'; |
| 16 | 16 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $this->publishes([ |
| 29 | 29 | __DIR__.'/config' => realpath('config'), |
| 30 | 30 | __DIR__.'/Routes/websocket' => realpath('routes'), |
| 31 | - ],'laravel-ratchet'); |
|
| 31 | + ], 'laravel-ratchet'); |
|
| 32 | 32 | |
| 33 | 33 | if ($this->app['config']->get('laravel-ratchet') === null) { |
| 34 | 34 | $this->app['config']->set('laravel-ratchet', require __DIR__.'/config/laravel-ratchet.php'); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function register() |
| 44 | 44 | { |
| 45 | - $this->app->bind('WsRoute',function (){ |
|
| 45 | + $this->app->bind('WsRoute', function() { |
|
| 46 | 46 | return new Routes(); |
| 47 | 47 | }); |
| 48 | 48 | } |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | function hasMember($client) |
| 46 | 46 | { |
| 47 | - if(array_key_exists($client->id,$this->members)) |
|
| 47 | + if (array_key_exists($client->id, $this->members)) |
|
| 48 | 48 | return true; |
| 49 | 49 | |
| 50 | 50 | return false; |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * @param $method |
| 25 | 25 | * @param bool $authenticated |
| 26 | 26 | */ |
| 27 | - function make($routeName, $controller, $method,$authenticated = true) |
|
| 27 | + function make($routeName, $controller, $method, $authenticated = true) |
|
| 28 | 28 | { |
| 29 | 29 | $this->routes[$routeName] = (object) [ |
| 30 | 30 | 'controller'=>$controller, |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | */ |
| 73 | 73 | function sendBack($data) |
| 74 | 74 | { |
| 75 | - $this->sendToWebSocketUser($this->conn,$data); |
|
| 75 | + $this->sendToWebSocketUser($this->conn,$data); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * @param $error |
| 26 | 26 | * @throws WebSocketException |
| 27 | 27 | */ |
| 28 | - function error($request,ConnectionInterface $from, $error) |
|
| 28 | + function error($request, ConnectionInterface $from, $error) |
|
| 29 | 29 | { |
| 30 | 30 | echo 'Error: '; |
| 31 | 31 | echo $error."\n"; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | 'type'=>'error', |
| 37 | 37 | 'message'=>$error |
| 38 | 38 | ]; |
| 39 | - $this->sendToWebSocketUser($from,$data); |
|
| 39 | + $this->sendToWebSocketUser($from, $data); |
|
| 40 | 40 | throw new WebSocketException(); |
| 41 | 41 | } |
| 42 | 42 | |
@@ -44,12 +44,12 @@ discard block |
||
| 44 | 44 | * @param ConnectionInterface $conn |
| 45 | 45 | * @param $data |
| 46 | 46 | */ |
| 47 | - function sendToWebSocketUser(ConnectionInterface $conn,$data) |
|
| 47 | + function sendToWebSocketUser(ConnectionInterface $conn, $data) |
|
| 48 | 48 | { |
| 49 | - if(!is_array($data)) |
|
| 49 | + if (!is_array($data)) |
|
| 50 | 50 | $data = ['msg'=>$data]; |
| 51 | 51 | |
| 52 | - if(isset($this->route) && $this->route->auth && !array_key_exists('sender',$data)) |
|
| 52 | + if (isset($this->route) && $this->route->auth && !array_key_exists('sender', $data)) |
|
| 53 | 53 | $data['sender'] = $this->getSenderData(); |
| 54 | 54 | |
| 55 | 55 | $conn->send(json_encode($data)); |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | * @param int $user_id |
| 60 | 60 | * @param array $data |
| 61 | 61 | */ |
| 62 | - function sendToUser($user_id,$data) |
|
| 62 | + function sendToUser($user_id, $data) |
|
| 63 | 63 | { |
| 64 | 64 | $resourceId = $this->userAuthSocketMapper[$user_id]; |
| 65 | 65 | /** @var ConnectionInterface $conn */ |
| 66 | 66 | $conn = $this->clients[$resourceId]->conn; |
| 67 | - $this->sendToWebSocketUser($conn,$data); |
|
| 67 | + $this->sendToWebSocketUser($conn, $data); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | function sendBack($data) |
| 74 | 74 | { |
| 75 | - $this->sendToWebSocketUser($this->conn,$data); |
|
| 75 | + $this->sendToWebSocketUser($this->conn, $data); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | * @throws \Illuminate\Validation\ValidationException |
| 48 | 48 | */ |
| 49 | 49 | public function validate($request, array $rules, |
| 50 | - array $messages = [], array $customAttributes = []) |
|
| 50 | + array $messages = [], array $customAttributes = []) |
|
| 51 | 51 | { |
| 52 | 52 | return $this->getValidationFactory()->make( |
| 53 | 53 | (array) $request, $rules, $messages, $customAttributes |
@@ -19,9 +19,9 @@ |
||
| 19 | 19 | { |
| 20 | 20 | foreach ($required as $input) |
| 21 | 21 | { |
| 22 | - if(!in_array($input,(array)$this->request)) |
|
| 22 | + if (!in_array($input, (array) $this->request)) |
|
| 23 | 23 | { |
| 24 | - $this->error($this->request,$this->conn,$this->requireErrorMessage($input)); |
|
| 24 | + $this->error($this->request, $this->conn, $this->requireErrorMessage($input)); |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $client = $this->clients[$this->userAuthSocketMapper[\Auth::id()]]; |
| 32 | 32 | $room->removeMember($client); |
| 33 | 33 | |
| 34 | - if(count($room->members) == 0) |
|
| 34 | + if (count($room->members) == 0) |
|
| 35 | 35 | { |
| 36 | 36 | unset($this->receiver->rooms[$room_id]); |
| 37 | 37 | } |
@@ -55,16 +55,16 @@ discard block |
||
| 55 | 55 | * @param bool $createIfNotExist |
| 56 | 56 | * @return Room |
| 57 | 57 | */ |
| 58 | - function validateRoom($room_id,$createIfNotExist = false) |
|
| 58 | + function validateRoom($room_id, $createIfNotExist = false) |
|
| 59 | 59 | { |
| 60 | - if(!array_key_exists($room_id,$this->receiver->rooms)) |
|
| 60 | + if (!array_key_exists($room_id, $this->receiver->rooms)) |
|
| 61 | 61 | { |
| 62 | - if($createIfNotExist) |
|
| 62 | + if ($createIfNotExist) |
|
| 63 | 63 | { |
| 64 | 64 | $room = $this->receiver->rooms[$room_id] = new Room($room_id); |
| 65 | 65 | return $room; |
| 66 | 66 | } |
| 67 | - $this->error($this->request,$this->conn,'Room is not exist'); |
|
| 67 | + $this->error($this->request, $this->conn, 'Room is not exist'); |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | |
@@ -78,12 +78,12 @@ discard block |
||
| 78 | 78 | /** @var Room $room */ |
| 79 | 79 | $room = $this->rooms[$room_id]; |
| 80 | 80 | $client = $this->clients[$this->userAuthSocketMapper[\Auth::id()]]; |
| 81 | - if(!$this->hasMember($client)) |
|
| 82 | - $this->error($this->request,$this->conn,'You can\'t send a message to room which you are not in !'); |
|
| 81 | + if (!$this->hasMember($client)) |
|
| 82 | + $this->error($this->request, $this->conn, 'You can\'t send a message to room which you are not in !'); |
|
| 83 | 83 | |
| 84 | 84 | foreach ($room->members as $member) |
| 85 | 85 | { |
| 86 | - $this->sendToUser($member->id,$message); |
|
| 86 | + $this->sendToUser($member->id, $message); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | \ No newline at end of file |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | function enterRoom($room_id) |
| 22 | 22 | { |
| 23 | - $this->validateRoom($room_id,true); |
|
| 23 | + $this->validateRoom($room_id, true); |
|
| 24 | 24 | |
| 25 | 25 | $this->addMember($room_id); |
| 26 | 26 | } |