@@ -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 | } |
@@ -22,7 +22,7 @@ |
||
22 | 22 | /** |
23 | 23 | * @param $request |
24 | 24 | * @param ConnectionInterface $from |
25 | - * @param $error |
|
25 | + * @param string $error |
|
26 | 26 | * @throws WebSocketException |
27 | 27 | */ |
28 | 28 | function error($request,ConnectionInterface $from, $error) |
@@ -11,7 +11,6 @@ |
||
11 | 11 | |
12 | 12 | use Shamaseen\Laravel\Ratchet\Exceptions\WebSocketException; |
13 | 13 | use Ratchet\ConnectionInterface; |
14 | -use Shamaseen\Laravel\Ratchet\Objects\Rooms\Room; |
|
15 | 14 | |
16 | 15 | /** |
17 | 16 | * Trait WebSocketMessagesManager |
@@ -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,9 +25,9 @@ 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 | - if(env('APP_DEBUG')) |
|
30 | + if (env('APP_DEBUG')) |
|
31 | 31 | { |
32 | 32 | echo 'User error: '; |
33 | 33 | echo $error."\n"; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | 'event'=>'error', |
40 | 40 | 'message'=>$error |
41 | 41 | ]; |
42 | - $this->sendToWebSocketUser($from,$data); |
|
42 | + $this->sendToWebSocketUser($from, $data); |
|
43 | 43 | throw new WebSocketException(); |
44 | 44 | } |
45 | 45 | |
@@ -47,17 +47,17 @@ discard block |
||
47 | 47 | * @param ConnectionInterface $conn |
48 | 48 | * @param $data |
49 | 49 | */ |
50 | - function sendToWebSocketUser(ConnectionInterface $conn,$data) |
|
50 | + function sendToWebSocketUser(ConnectionInterface $conn, $data) |
|
51 | 51 | { |
52 | - if(!is_array($data)) |
|
53 | - $data = ['msg'=>$data,'event'=>'default']; |
|
52 | + if (!is_array($data)) |
|
53 | + $data = ['msg'=>$data, 'event'=>'default']; |
|
54 | 54 | |
55 | - if(!isset($data['event'])) |
|
55 | + if (!isset($data['event'])) |
|
56 | 56 | { |
57 | 57 | $data['event'] = 'default'; |
58 | 58 | } |
59 | 59 | |
60 | - if(isset($this->route) && $this->route->auth && !array_key_exists('sender',$data)) |
|
60 | + if (isset($this->route) && $this->route->auth && !array_key_exists('sender', $data)) |
|
61 | 61 | $data['sender'] = $this->getSenderData(); |
62 | 62 | |
63 | 63 | $conn->send(json_encode($data)); |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | * @param int $user_id |
68 | 68 | * @param array $data |
69 | 69 | */ |
70 | - function sendToUser($user_id,$data) |
|
70 | + function sendToUser($user_id, $data) |
|
71 | 71 | { |
72 | 72 | $resourceId = $this->userAuthSocketMapper[$user_id]; |
73 | 73 | /** @var ConnectionInterface $conn */ |
74 | 74 | $conn = $this->clients[$resourceId]->conn; |
75 | - $this->sendToWebSocketUser($conn,$data); |
|
75 | + $this->sendToWebSocketUser($conn, $data); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | function sendBack($data) |
82 | 82 | { |
83 | - $this->sendToWebSocketUser($this->conn,$data); |
|
83 | + $this->sendToWebSocketUser($this->conn, $data); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -49,16 +49,18 @@ |
||
49 | 49 | */ |
50 | 50 | function sendToWebSocketUser(ConnectionInterface $conn,$data) |
51 | 51 | { |
52 | - if(!is_array($data)) |
|
53 | - $data = ['msg'=>$data,'event'=>'default']; |
|
52 | + if(!is_array($data)) { |
|
53 | + $data = ['msg'=>$data,'event'=>'default']; |
|
54 | + } |
|
54 | 55 | |
55 | 56 | if(!isset($data['event'])) |
56 | 57 | { |
57 | 58 | $data['event'] = 'default'; |
58 | 59 | } |
59 | 60 | |
60 | - if(isset($this->route) && $this->route->auth && !array_key_exists('sender',$data)) |
|
61 | - $data['sender'] = $this->getSenderData(); |
|
61 | + if(isset($this->route) && $this->route->auth && !array_key_exists('sender',$data)) { |
|
62 | + $data['sender'] = $this->getSenderData(); |
|
63 | + } |
|
62 | 64 | |
63 | 65 | $conn->send(json_encode($data)); |
64 | 66 | } |
@@ -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; |
@@ -44,8 +44,9 @@ |
||
44 | 44 | |
45 | 45 | function hasMember($client) |
46 | 46 | { |
47 | - if(array_key_exists($client->id,$this->members)) |
|
48 | - return true; |
|
47 | + if(array_key_exists($client->id,$this->members)) { |
|
48 | + return true; |
|
49 | + } |
|
49 | 50 | |
50 | 51 | return false; |
51 | 52 | } |
@@ -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, |
@@ -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 | } |
@@ -22,7 +22,7 @@ |
||
22 | 22 | */ |
23 | 23 | class WebSocketController |
24 | 24 | { |
25 | - use WebSocketMessagesManager,Validation; |
|
25 | + use WebSocketMessagesManager, Validation; |
|
26 | 26 | |
27 | 27 | /** |
28 | 28 | * @var Client[] |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | */ |
21 | 21 | function enterRoom() |
22 | 22 | { |
23 | - $this->validate($this->request,[ |
|
23 | + $this->validate($this->request, [ |
|
24 | 24 | 'room_id'=>'required' |
25 | 25 | ]); |
26 | - $room_id =$this->request->room_id; |
|
26 | + $room_id = $this->request->room_id; |
|
27 | 27 | |
28 | - $this->validateRoom($room_id,true); |
|
28 | + $this->validateRoom($room_id, true); |
|
29 | 29 | |
30 | 30 | $this->addMember($room_id); |
31 | 31 | } |
@@ -36,10 +36,10 @@ discard block |
||
36 | 36 | function exitRoom() |
37 | 37 | { |
38 | 38 | |
39 | - $this->validate($this->request,[ |
|
39 | + $this->validate($this->request, [ |
|
40 | 40 | 'room_id'=>'required' |
41 | 41 | ]); |
42 | - $room_id =$this->request->room_id; |
|
42 | + $room_id = $this->request->room_id; |
|
43 | 43 | |
44 | 44 | $this->validateRoom($room_id); |
45 | 45 |
@@ -20,15 +20,15 @@ discard block |
||
20 | 20 | */ |
21 | 21 | function sendMessageToUser() |
22 | 22 | { |
23 | - $this->validate($this->request,[ |
|
23 | + $this->validate($this->request, [ |
|
24 | 24 | 'user_id'=>'required', |
25 | 25 | 'message' => 'required' |
26 | 26 | ]); |
27 | 27 | |
28 | 28 | $user_id = $this->request->user_id; |
29 | - $data = ['message'=>$this->request->message,'event'=>'sendToUser']; |
|
29 | + $data = ['message'=>$this->request->message, 'event'=>'sendToUser']; |
|
30 | 30 | |
31 | - $this->sendToUser($user_id,$data); |
|
31 | + $this->sendToUser($user_id, $data); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -36,12 +36,12 @@ discard block |
||
36 | 36 | */ |
37 | 37 | function sendMessageToRoom() |
38 | 38 | { |
39 | - $this->validate($this->request,[ |
|
39 | + $this->validate($this->request, [ |
|
40 | 40 | 'room_id'=>'required', |
41 | 41 | 'message' => 'required' |
42 | 42 | ]); |
43 | 43 | $room_id = $this->request->room_id; |
44 | - $data = ['message'=>$this->request->message,'event'=>'sendToRoom']; |
|
45 | - $this->sendToRoom($room_id,$data); |
|
44 | + $data = ['message'=>$this->request->message, 'event'=>'sendToRoom']; |
|
45 | + $this->sendToRoom($room_id, $data); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | \ No newline at end of file |