@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * |
19 | 19 | * @return string |
20 | 20 | */ |
21 | - public function __toString () { |
|
21 | + public function __toString() { |
|
22 | 22 | try { |
23 | 23 | return implode(':', $this->getSockName()); |
24 | 24 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @return $this |
41 | 41 | * @throws SocketError |
42 | 42 | */ |
43 | - public function bind (string $address, int $port = 0) { |
|
43 | + public function bind(string $address, int $port = 0) { |
|
44 | 44 | if (!@socket_bind($this->resource, $address, $port)) { |
45 | 45 | throw new SocketError($this->resource, SOCKET_EOPNOTSUPP); |
46 | 46 | } |
@@ -21,8 +21,7 @@ |
||
21 | 21 | public function __toString () { |
22 | 22 | try { |
23 | 23 | return implode(':', $this->getSockName()); |
24 | - } |
|
25 | - catch (Throwable $e) { |
|
24 | + } catch (Throwable $e) { |
|
26 | 25 | return "?{$this->resource}"; |
27 | 26 | } |
28 | 27 | } |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | 0x0f => 'RESERVED CONTROL 0x0f', |
42 | 42 | ]; |
43 | 43 | |
44 | - const CLOSE_NORMAL = 1000; // mutual closure |
|
45 | - const CLOSE_INTERRUPT = 1001; // abrupt closure due to hangups, reboots, "going away" |
|
46 | - const CLOSE_PROTOCOL_ERROR = 1002; // invalid behavior / framing |
|
47 | - const CLOSE_UNHANDLED_DATA = 1003; // message handler doesn't want the payload |
|
48 | - const CLOSE_BAD_DATA = 1007; // message handler can't understand the payload |
|
49 | - const CLOSE_POLICY_VIOLATION = 1008; // generic "access denied" |
|
50 | - const CLOSE_TOO_LARGE = 1009; // unacceptable payload size |
|
51 | - const CLOSE_EXPECTATION = 1010; // peer closed because it wants extensions (listed in the reason) |
|
52 | - const CLOSE_INTERNAL_ERROR = 1011; // like http 500 |
|
44 | + const CLOSE_NORMAL = 1000; // mutual closure |
|
45 | + const CLOSE_INTERRUPT = 1001; // abrupt closure due to hangups, reboots, "going away" |
|
46 | + const CLOSE_PROTOCOL_ERROR = 1002; // invalid behavior / framing |
|
47 | + const CLOSE_UNHANDLED_DATA = 1003; // message handler doesn't want the payload |
|
48 | + const CLOSE_BAD_DATA = 1007; // message handler can't understand the payload |
|
49 | + const CLOSE_POLICY_VIOLATION = 1008; // generic "access denied" |
|
50 | + const CLOSE_TOO_LARGE = 1009; // unacceptable payload size |
|
51 | + const CLOSE_EXPECTATION = 1010; // peer closed because it wants extensions (listed in the reason) |
|
52 | + const CLOSE_INTERNAL_ERROR = 1011; // like http 500 |
|
53 | 53 | |
54 | 54 | /** |
55 | 55 | * @var bool |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param int $opCode |
80 | 80 | * @param string $payload |
81 | 81 | */ |
82 | - public function __construct (bool $final, int $rsv, int $opCode, string $payload) { |
|
82 | + public function __construct(bool $final, int $rsv, int $opCode, string $payload) { |
|
83 | 83 | $this->final = $final; |
84 | 84 | $this->rsv = $rsv; |
85 | 85 | $this->opCode = $opCode; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * |
92 | 92 | * @return string |
93 | 93 | */ |
94 | - public function __toString () { |
|
94 | + public function __toString() { |
|
95 | 95 | if ($this->isClose()) { |
96 | 96 | return $this->getCloseReason(); |
97 | 97 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * |
106 | 106 | * @return int |
107 | 107 | */ |
108 | - final public function getCloseCode (): int { |
|
108 | + final public function getCloseCode(): int { |
|
109 | 109 | $code = substr($this->payload, 0, 2); |
110 | 110 | return isset($code[1]) ? unpack('n', $code)[1] : self::CLOSE_NORMAL; |
111 | 111 | } |
@@ -117,126 +117,126 @@ discard block |
||
117 | 117 | * |
118 | 118 | * @return string |
119 | 119 | */ |
120 | - final public function getCloseReason (): string { |
|
120 | + final public function getCloseReason(): string { |
|
121 | 121 | return substr($this->payload, 2); |
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
125 | 125 | * @return int |
126 | 126 | */ |
127 | - final public function getLength (): int { |
|
127 | + final public function getLength(): int { |
|
128 | 128 | return strlen($this->payload); |
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
132 | 132 | * @return string |
133 | 133 | */ |
134 | - public function getName (): string { |
|
134 | + public function getName(): string { |
|
135 | 135 | return self::NAMES[$this->opCode]; |
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
139 | 139 | * @return int |
140 | 140 | */ |
141 | - final public function getOpCode (): int { |
|
141 | + final public function getOpCode(): int { |
|
142 | 142 | return $this->opCode; |
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
146 | 146 | * @return string |
147 | 147 | */ |
148 | - final public function getPayload (): string { |
|
148 | + final public function getPayload(): string { |
|
149 | 149 | return $this->payload; |
150 | 150 | } |
151 | 151 | |
152 | 152 | /** |
153 | 153 | * @return int |
154 | 154 | */ |
155 | - final public function getRsv (): int { |
|
155 | + final public function getRsv(): int { |
|
156 | 156 | return $this->rsv; |
157 | 157 | } |
158 | 158 | |
159 | 159 | /** |
160 | 160 | * @return bool |
161 | 161 | */ |
162 | - final public function hasRsv1 (): bool { |
|
163 | - return (bool)($this->rsv & self::RSV1); |
|
162 | + final public function hasRsv1(): bool { |
|
163 | + return (bool) ($this->rsv & self::RSV1); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | /** |
167 | 167 | * @return bool |
168 | 168 | */ |
169 | - final public function hasRsv2 (): bool { |
|
170 | - return (bool)($this->rsv & self::RSV2); |
|
169 | + final public function hasRsv2(): bool { |
|
170 | + return (bool) ($this->rsv & self::RSV2); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | /** |
174 | 174 | * @return bool |
175 | 175 | */ |
176 | - final public function hasRsv3 (): bool { |
|
177 | - return (bool)($this->rsv & self::RSV3); |
|
176 | + final public function hasRsv3(): bool { |
|
177 | + return (bool) ($this->rsv & self::RSV3); |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | /** |
181 | 181 | * @return bool |
182 | 182 | */ |
183 | - final public function isBinary (): bool { |
|
183 | + final public function isBinary(): bool { |
|
184 | 184 | return $this->opCode === self::OP_BINARY; |
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
188 | 188 | * @return bool |
189 | 189 | */ |
190 | - final public function isClose (): bool { |
|
190 | + final public function isClose(): bool { |
|
191 | 191 | return $this->opCode === self::OP_CLOSE; |
192 | 192 | } |
193 | 193 | |
194 | 194 | /** |
195 | 195 | * @return bool |
196 | 196 | */ |
197 | - final public function isContinue (): bool { |
|
197 | + final public function isContinue(): bool { |
|
198 | 198 | return $this->opCode === self::OP_CONTINUE; |
199 | 199 | } |
200 | 200 | |
201 | 201 | /** |
202 | 202 | * @return bool |
203 | 203 | */ |
204 | - final public function isControl (): bool { |
|
204 | + final public function isControl(): bool { |
|
205 | 205 | return $this->opCode >= self::OP_CLOSE; |
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
209 | 209 | * @return bool |
210 | 210 | */ |
211 | - final public function isData (): bool { |
|
211 | + final public function isData(): bool { |
|
212 | 212 | return $this->opCode < self::OP_CLOSE; |
213 | 213 | } |
214 | 214 | |
215 | 215 | /** |
216 | 216 | * @return bool |
217 | 217 | */ |
218 | - final public function isFinal (): bool { |
|
218 | + final public function isFinal(): bool { |
|
219 | 219 | return $this->final; |
220 | 220 | } |
221 | 221 | |
222 | 222 | /** |
223 | 223 | * @return bool |
224 | 224 | */ |
225 | - final public function isPing (): bool { |
|
225 | + final public function isPing(): bool { |
|
226 | 226 | return $this->opCode === self::OP_PING; |
227 | 227 | } |
228 | 228 | |
229 | 229 | /** |
230 | 230 | * @return bool |
231 | 231 | */ |
232 | - final public function isPong (): bool { |
|
232 | + final public function isPong(): bool { |
|
233 | 233 | return $this->opCode === self::OP_PONG; |
234 | 234 | } |
235 | 235 | |
236 | 236 | /** |
237 | 237 | * @return bool |
238 | 238 | */ |
239 | - final public function isText (): bool { |
|
239 | + final public function isText(): bool { |
|
240 | 240 | return $this->opCode === self::OP_TEXT; |
241 | 241 | } |
242 | 242 |
@@ -22,7 +22,7 @@ |
||
22 | 22 | * @see https://php.net/socket_create_pair |
23 | 23 | * |
24 | 24 | * @param array $extra Variadic constructor arguments. |
25 | - * @return static[] Two instances at indices `0` and `1`. |
|
25 | + * @return StreamClient[] Two instances at indices `0` and `1`. |
|
26 | 26 | * @throws SocketError |
27 | 27 | */ |
28 | 28 | public static function newUnixPair (...$extra) { |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * |
13 | 13 | * @return int |
14 | 14 | */ |
15 | - final public static function getType (): int { |
|
15 | + final public static function getType(): int { |
|
16 | 16 | return SOCK_STREAM; |
17 | 17 | } |
18 | 18 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * @return static[] Two instances at indices `0` and `1`. |
26 | 26 | * @throws SocketError |
27 | 27 | */ |
28 | - public static function newUnixPair (...$extra) { |
|
28 | + public static function newUnixPair(...$extra) { |
|
29 | 29 | if (!@socket_create_pair(AF_UNIX, SOCK_STREAM, 0, $fd)) { |
30 | 30 | throw new SocketError; // reliable errno |
31 | 31 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * @return string |
45 | 45 | * @throws SocketError The partially read data is attached. |
46 | 46 | */ |
47 | - public function read (int $length): string { |
|
47 | + public function read(int $length): string { |
|
48 | 48 | try { |
49 | 49 | $data = ''; |
50 | 50 | do { |
@@ -71,11 +71,11 @@ discard block |
||
71 | 71 | * @return string |
72 | 72 | * @throws SocketError |
73 | 73 | */ |
74 | - public function recv (int $maxLength, int $flags = 0): string { |
|
74 | + public function recv(int $maxLength, int $flags = 0): string { |
|
75 | 75 | if (false === @socket_recv($this->resource, $data, $maxLength, $flags)) { |
76 | 76 | throw new SocketError($this->resource, SOCKET_EINVAL); |
77 | 77 | } |
78 | - return (string)$data; // cast needed, will be null if 0 bytes are read. |
|
78 | + return (string) $data; // cast needed, will be null if 0 bytes are read. |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @return string |
86 | 86 | * @throws SocketError |
87 | 87 | */ |
88 | - public function recvAll (int $flags = 0): string { |
|
88 | + public function recvAll(int $flags = 0): string { |
|
89 | 89 | $flags = ($flags & ~MSG_WAITALL) | MSG_DONTWAIT; |
90 | 90 | $length = $this->getOption(SO_RCVBUF); |
91 | 91 | try { |
@@ -52,8 +52,7 @@ discard block |
||
52 | 52 | $length -= $chunkSize = strlen($chunk); |
53 | 53 | } while ($chunkSize and $length); |
54 | 54 | return $data; |
55 | - } |
|
56 | - catch (SocketError $e) { |
|
55 | + } catch (SocketError $e) { |
|
57 | 56 | $e->setExtra($data); |
58 | 57 | throw $e; |
59 | 58 | } |
@@ -90,8 +89,7 @@ discard block |
||
90 | 89 | $length = $this->getOption(SO_RCVBUF); |
91 | 90 | try { |
92 | 91 | return $this->recv($length, $flags); |
93 | - } |
|
94 | - catch (SocketError $e) { |
|
92 | + } catch (SocketError $e) { |
|
95 | 93 | if ($e->getCode() === SOCKET_EAGAIN) { // would block |
96 | 94 | return ''; |
97 | 95 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * |
13 | 13 | * @return int |
14 | 14 | */ |
15 | - final public static function getType (): int { |
|
15 | + final public static function getType(): int { |
|
16 | 16 | return SOCK_DGRAM; |
17 | 17 | } |
18 | 18 | |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | * @return string |
29 | 29 | * @throws SocketError |
30 | 30 | */ |
31 | - public function recv (int $length, int $flags = 0, string &$name = '', int &$port = 0): string { |
|
31 | + public function recv(int $length, int $flags = 0, string &$name = '', int &$port = 0): string { |
|
32 | 32 | $count = @socket_recvfrom($this->resource, $data, $length, $flags, $name, $port); |
33 | 33 | if ($count === false) { |
34 | 34 | throw new SocketError($this->resource, SOCKET_EOPNOTSUPP); |
35 | 35 | } |
36 | - return (string)$data; // cast needed, will be null if 0 bytes are read |
|
36 | + return (string) $data; // cast needed, will be null if 0 bytes are read |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | } |
40 | 40 | \ No newline at end of file |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * @param resource $resource |
52 | 52 | * @param WebSocketServer $server |
53 | 53 | */ |
54 | - public function __construct ($resource, WebSocketServer $server) { |
|
54 | + public function __construct($resource, WebSocketServer $server) { |
|
55 | 55 | parent::__construct($resource); |
56 | 56 | $this->server = $server; |
57 | 57 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * @param string $reason |
75 | 75 | * @return $this |
76 | 76 | */ |
77 | - public function close (int $code = null, string $reason = '') { |
|
77 | + public function close(int $code = null, string $reason = '') { |
|
78 | 78 | try { |
79 | 79 | if ($code >= 1000 and $this->state === self::STATE_OK) { |
80 | 80 | $this->getFrameHandler()->writeClose($code, $reason); |
@@ -91,49 +91,49 @@ discard block |
||
91 | 91 | /** |
92 | 92 | * @return FrameHandler |
93 | 93 | */ |
94 | - public function getFrameHandler (): FrameHandler { |
|
94 | + public function getFrameHandler(): FrameHandler { |
|
95 | 95 | return $this->frameHandler ?? $this->frameHandler = new FrameHandler($this); |
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | 99 | * @return FrameReader |
100 | 100 | */ |
101 | - public function getFrameReader (): FrameReader { |
|
101 | + public function getFrameReader(): FrameReader { |
|
102 | 102 | return $this->frameReader ?? $this->frameReader = new FrameReader($this); |
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
106 | 106 | * @return HandShake |
107 | 107 | */ |
108 | - public function getHandshake (): HandShake { |
|
108 | + public function getHandshake(): HandShake { |
|
109 | 109 | return $this->handshake ?? $this->handshake = new HandShake($this); |
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
113 | 113 | * @return MessageHandler |
114 | 114 | */ |
115 | - public function getMessageHandler (): MessageHandler { |
|
115 | + public function getMessageHandler(): MessageHandler { |
|
116 | 116 | return $this->messageHandler ?? $this->messageHandler = new MessageHandler($this); |
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
120 | 120 | * @return WebSocketServer |
121 | 121 | */ |
122 | - public function getServer (): WebSocketServer { |
|
122 | + public function getServer(): WebSocketServer { |
|
123 | 123 | return $this->server; |
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
127 | 127 | * @return int |
128 | 128 | */ |
129 | - public function getState (): int { |
|
129 | + public function getState(): int { |
|
130 | 130 | return $this->state; |
131 | 131 | } |
132 | 132 | |
133 | 133 | /** |
134 | 134 | * @return bool |
135 | 135 | */ |
136 | - final public function isOk (): bool { |
|
136 | + final public function isOk(): bool { |
|
137 | 137 | return $this->state === self::STATE_OK; |
138 | 138 | } |
139 | 139 | |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * |
143 | 143 | * The RFC says the connection must be dropped if any unsupported activity occurs. |
144 | 144 | */ |
145 | - final public function onOutOfBand (): void { |
|
145 | + final public function onOutOfBand(): void { |
|
146 | 146 | $this->close(Frame::CLOSE_PROTOCOL_ERROR, "Received out-of-band data."); |
147 | 147 | } |
148 | 148 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | * |
152 | 152 | * @throws Exception |
153 | 153 | */ |
154 | - public function onReadable (): void { |
|
154 | + public function onReadable(): void { |
|
155 | 155 | if (!strlen($this->recv(1, MSG_PEEK))) { // peer has shut down writing, or closed. |
156 | 156 | $this->close(); |
157 | 157 | return; |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | /** |
188 | 188 | * Called when the initial connection handshake succeeds and frame I/O can occur. |
189 | 189 | */ |
190 | - protected function onStateOk (): void { |
|
190 | + protected function onStateOk(): void { |
|
191 | 191 | // stub |
192 | 192 | } |
193 | 193 |
@@ -80,8 +80,7 @@ discard block |
||
80 | 80 | $this->getFrameHandler()->writeClose($code, $reason); |
81 | 81 | $this->shutdown(self::CH_WRITE); |
82 | 82 | } |
83 | - } |
|
84 | - finally { |
|
83 | + } finally { |
|
85 | 84 | $this->state = self::STATE_CLOSE; |
86 | 85 | $this->server->remove($this); |
87 | 86 | return parent::close(); |
@@ -173,12 +172,10 @@ discard block |
||
173 | 172 | case self::STATE_CLOSE: |
174 | 173 | return; |
175 | 174 | } |
176 | - } |
|
177 | - catch (WebSocketError $e) { |
|
175 | + } catch (WebSocketError $e) { |
|
178 | 176 | $this->close($e->getCode(), $e->getMessage()); |
179 | 177 | throw $e; |
180 | - } |
|
181 | - catch (Exception $e) { |
|
178 | + } catch (Exception $e) { |
|
182 | 179 | $this->close(Frame::CLOSE_INTERNAL_ERROR); |
183 | 180 | throw $e; |
184 | 181 | } |
@@ -114,12 +114,10 @@ discard block |
||
114 | 114 | try { |
115 | 115 | if ($this->continue === Frame::OP_TEXT) { |
116 | 116 | $this->onText($fragment); |
117 | - } |
|
118 | - else { |
|
117 | + } else { |
|
119 | 118 | $this->onBinary($fragment); |
120 | 119 | } |
121 | - } |
|
122 | - finally { |
|
120 | + } finally { |
|
123 | 121 | if ($fragment->isFinal()) { |
124 | 122 | $this->continue = null; |
125 | 123 | } |
@@ -138,11 +136,9 @@ discard block |
||
138 | 136 | protected function onControl (Frame $control): void { |
139 | 137 | if ($control->isClose()) { |
140 | 138 | $this->onClose($control); |
141 | - } |
|
142 | - elseif ($control->isPing()) { |
|
139 | + } elseif ($control->isPing()) { |
|
143 | 140 | $this->onPing($control); |
144 | - } |
|
145 | - elseif ($control->isPong()) { |
|
141 | + } elseif ($control->isPong()) { |
|
146 | 142 | $this->onPong($control); |
147 | 143 | } |
148 | 144 | } |
@@ -156,8 +152,7 @@ discard block |
||
156 | 152 | $this->onData_SetContinue($data); |
157 | 153 | if ($data->isText()) { |
158 | 154 | $this->onText($data); |
159 | - } |
|
160 | - elseif ($data->isBinary()) { |
|
155 | + } elseif ($data->isBinary()) { |
|
161 | 156 | $this->onBinary($data); |
162 | 157 | } |
163 | 158 | } |
@@ -192,11 +187,9 @@ discard block |
||
192 | 187 | $this->onFrame_CheckLength($frame); |
193 | 188 | if ($frame->isControl()) { |
194 | 189 | $this->onControl($frame); |
195 | - } |
|
196 | - elseif ($frame->isContinue()) { |
|
190 | + } elseif ($frame->isContinue()) { |
|
197 | 191 | $this->onContinue($frame); |
198 | - } |
|
199 | - else { |
|
192 | + } else { |
|
200 | 193 | $this->onData($frame); |
201 | 194 | } |
202 | 195 | } |
@@ -339,12 +332,10 @@ discard block |
||
339 | 332 | if ($length > 65535) { |
340 | 333 | $head .= chr(127); |
341 | 334 | $head .= pack('J', $length); |
342 | - } |
|
343 | - elseif ($length >= 126) { |
|
335 | + } elseif ($length >= 126) { |
|
344 | 336 | $head .= chr(126); |
345 | 337 | $head .= pack('n', $length); |
346 | - } |
|
347 | - else { |
|
338 | + } else { |
|
348 | 339 | $head .= chr($length); |
349 | 340 | } |
350 | 341 | $this->client->write($head . $payload); |
@@ -51,21 +51,21 @@ discard block |
||
51 | 51 | /** |
52 | 52 | * @param WebSocketClient $client |
53 | 53 | */ |
54 | - public function __construct (WebSocketClient $client) { |
|
54 | + public function __construct(WebSocketClient $client) { |
|
55 | 55 | $this->client = $client; |
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
59 | 59 | * @return int |
60 | 60 | */ |
61 | - public function getFragmentSize (): int { |
|
61 | + public function getFragmentSize(): int { |
|
62 | 62 | return $this->fragmentSize; |
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
66 | 66 | * @return int |
67 | 67 | */ |
68 | - public function getMaxLength (): int { |
|
68 | + public function getMaxLength(): int { |
|
69 | 69 | return $this->maxLength; |
70 | 70 | } |
71 | 71 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * @param Frame $binary |
76 | 76 | * @throws WebSocketError |
77 | 77 | */ |
78 | - protected function onBinary (Frame $binary): void { |
|
78 | + protected function onBinary(Frame $binary): void { |
|
79 | 79 | $this->buffer .= $binary->getPayload(); |
80 | 80 | if ($binary->isFinal()) { |
81 | 81 | $message = $this->buffer; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * |
96 | 96 | * @param Frame $close |
97 | 97 | */ |
98 | - protected function onClose (Frame $close): void { |
|
98 | + protected function onClose(Frame $close): void { |
|
99 | 99 | $this->client->close($close->getCloseCode()); |
100 | 100 | } |
101 | 101 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * @param Frame $fragment |
106 | 106 | * @throws WebSocketError |
107 | 107 | */ |
108 | - protected function onContinue (Frame $fragment): void { |
|
108 | + protected function onContinue(Frame $fragment): void { |
|
109 | 109 | if (!$this->continue) { |
110 | 110 | throw new WebSocketError( |
111 | 111 | Frame::CLOSE_PROTOCOL_ERROR, |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * |
138 | 138 | * @param Frame $control |
139 | 139 | */ |
140 | - protected function onControl (Frame $control): void { |
|
140 | + protected function onControl(Frame $control): void { |
|
141 | 141 | if ($control->isClose()) { |
142 | 142 | $this->onClose($control); |
143 | 143 | } |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | * |
155 | 155 | * @param Frame $data |
156 | 156 | */ |
157 | - protected function onData (Frame $data): void { |
|
157 | + protected function onData(Frame $data): void { |
|
158 | 158 | $this->onData_SetContinue($data); |
159 | 159 | if ($data->isText()) { |
160 | 160 | $this->onText($data); |
@@ -168,11 +168,11 @@ discard block |
||
168 | 168 | * @param Frame $data |
169 | 169 | * @throws WebSocketError |
170 | 170 | */ |
171 | - protected function onData_SetContinue (Frame $data): void { |
|
171 | + protected function onData_SetContinue(Frame $data): void { |
|
172 | 172 | if ($this->continue) { |
173 | 173 | throw new WebSocketError( |
174 | 174 | Frame::CLOSE_PROTOCOL_ERROR, |
175 | - "Received interleaved {$data->getName()} against existing " . Frame::NAMES[$this->continue], |
|
175 | + "Received interleaved {$data->getName()} against existing ".Frame::NAMES[$this->continue], |
|
176 | 176 | $data |
177 | 177 | ); |
178 | 178 | } |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | * |
189 | 189 | * @param Frame $frame |
190 | 190 | */ |
191 | - public function onFrame (Frame $frame): void { |
|
191 | + public function onFrame(Frame $frame): void { |
|
192 | 192 | $this->onFrame_CheckRsv($frame); |
193 | 193 | $this->onFrame_CheckLength($frame); |
194 | 194 | if ($frame->isControl()) { |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | * @param Frame $frame |
207 | 207 | * @throws WebSocketError |
208 | 208 | */ |
209 | - protected function onFrame_CheckLength (Frame $frame): void { |
|
209 | + protected function onFrame_CheckLength(Frame $frame): void { |
|
210 | 210 | if ($frame->isData()) { |
211 | 211 | $length = strlen($this->buffer); |
212 | 212 | if ($length + $frame->getLength() > $this->maxLength) { |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | * @param Frame $frame |
226 | 226 | * @throws WebSocketError |
227 | 227 | */ |
228 | - protected function onFrame_CheckRsv (Frame $frame): void { |
|
228 | + protected function onFrame_CheckRsv(Frame $frame): void { |
|
229 | 229 | if ($badRsv = $frame->getRsv() & ~$this->client->getHandshake()->getRsv()) { |
230 | 230 | $badRsv = str_pad(base_convert($badRsv >> 4, 10, 2), 3, '0', STR_PAD_LEFT); |
231 | 231 | throw new WebSocketError( |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * |
244 | 244 | * @param Frame $ping |
245 | 245 | */ |
246 | - protected function onPing (Frame $ping): void { |
|
246 | + protected function onPing(Frame $ping): void { |
|
247 | 247 | $this->writePong($ping->getPayload()); |
248 | 248 | } |
249 | 249 | |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | * |
255 | 255 | * @param Frame $pong |
256 | 256 | */ |
257 | - protected function onPong (Frame $pong): void { |
|
257 | + protected function onPong(Frame $pong): void { |
|
258 | 258 | // stub |
259 | 259 | } |
260 | 260 | |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | * @param Frame $text |
265 | 265 | * @throws WebSocketError |
266 | 266 | */ |
267 | - protected function onText (Frame $text): void { |
|
267 | + protected function onText(Frame $text): void { |
|
268 | 268 | $this->buffer .= $text->getPayload(); |
269 | 269 | if ($text->isFinal()) { |
270 | 270 | $message = $this->buffer; |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | * @param int $bytes |
278 | 278 | * @return $this |
279 | 279 | */ |
280 | - public function setFragmentSize (int $bytes) { |
|
280 | + public function setFragmentSize(int $bytes) { |
|
281 | 281 | $this->fragmentSize = $bytes; |
282 | 282 | return $this; |
283 | 283 | } |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | * @param int $bytes |
287 | 287 | * @return $this |
288 | 288 | */ |
289 | - public function setMaxLength (int $bytes) { |
|
289 | + public function setMaxLength(int $bytes) { |
|
290 | 290 | $this->maxLength = $bytes; |
291 | 291 | return $this; |
292 | 292 | } |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | * @param int $opCode |
298 | 298 | * @param string $payload |
299 | 299 | */ |
300 | - public function write (int $opCode, string $payload): void { |
|
300 | + public function write(int $opCode, string $payload): void { |
|
301 | 301 | $offset = 0; |
302 | 302 | $total = strlen($payload); |
303 | 303 | do { |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | /** |
314 | 314 | * @param string $payload |
315 | 315 | */ |
316 | - public function writeBinary (string $payload): void { |
|
316 | + public function writeBinary(string $payload): void { |
|
317 | 317 | $this->write(Frame::OP_BINARY, $payload); |
318 | 318 | } |
319 | 319 | |
@@ -321,8 +321,8 @@ discard block |
||
321 | 321 | * @param int $code |
322 | 322 | * @param string $reason |
323 | 323 | */ |
324 | - public function writeClose (int $code = Frame::CLOSE_NORMAL, string $reason = ''): void { |
|
325 | - $this->writeFrame(true, Frame::OP_CLOSE, pack('n', $code) . $reason); |
|
324 | + public function writeClose(int $code = Frame::CLOSE_NORMAL, string $reason = ''): void { |
|
325 | + $this->writeFrame(true, Frame::OP_CLOSE, pack('n', $code).$reason); |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | /** |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | * @param int $opCode |
333 | 333 | * @param string $payload |
334 | 334 | */ |
335 | - protected function writeFrame (bool $final, int $opCode, string $payload): void { |
|
335 | + protected function writeFrame(bool $final, int $opCode, string $payload): void { |
|
336 | 336 | if ($opCode & 0x08 and !$final) { |
337 | 337 | throw new LogicException("Would have sent a fragmented control frame ({$opCode}) {$payload}"); |
338 | 338 | } |
@@ -349,27 +349,27 @@ discard block |
||
349 | 349 | else { |
350 | 350 | $head .= chr($length); |
351 | 351 | } |
352 | - $this->client->write($head . $payload); |
|
352 | + $this->client->write($head.$payload); |
|
353 | 353 | } |
354 | 354 | |
355 | 355 | /** |
356 | 356 | * @param string $payload |
357 | 357 | */ |
358 | - public function writePing (string $payload = ''): void { |
|
358 | + public function writePing(string $payload = ''): void { |
|
359 | 359 | $this->writeFrame(true, Frame::OP_PING, $payload); |
360 | 360 | } |
361 | 361 | |
362 | 362 | /** |
363 | 363 | * @param string $payload |
364 | 364 | */ |
365 | - public function writePong (string $payload = ''): void { |
|
365 | + public function writePong(string $payload = ''): void { |
|
366 | 366 | $this->writeFrame(true, Frame::OP_PONG, $payload); |
367 | 367 | } |
368 | 368 | |
369 | 369 | /** |
370 | 370 | * @param string $payload |
371 | 371 | */ |
372 | - public function writeText (string $payload): void { |
|
372 | + public function writeText(string $payload): void { |
|
373 | 373 | $this->write(Frame::OP_TEXT, $payload); |
374 | 374 | } |
375 | 375 | } |
376 | 376 | \ No newline at end of file |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | /** |
16 | 16 | * @param WebSocketClient $client |
17 | 17 | */ |
18 | - public function __construct (WebSocketClient $client) { |
|
18 | + public function __construct(WebSocketClient $client) { |
|
19 | 19 | $this->client = $client; |
20 | 20 | } |
21 | 21 | |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * |
25 | 25 | * @param string $binary |
26 | 26 | */ |
27 | - public function onBinary (string $binary): void { |
|
27 | + public function onBinary(string $binary): void { |
|
28 | 28 | unset($binary); |
29 | 29 | throw new WebSocketError(Frame::CLOSE_UNHANDLED_DATA, "I don't handle binary data."); |
30 | 30 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * |
35 | 35 | * @param string $text |
36 | 36 | */ |
37 | - public function onText (string $text): void { |
|
37 | + public function onText(string $text): void { |
|
38 | 38 | $this->onText_CheckUtf8($text); |
39 | 39 | throw new WebSocketError(Frame::CLOSE_UNHANDLED_DATA, "I don't handle text."); |
40 | 40 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * |
45 | 45 | * @param string $text |
46 | 46 | */ |
47 | - protected function onText_CheckUtf8 (string $text): void { |
|
47 | + protected function onText_CheckUtf8(string $text): void { |
|
48 | 48 | if (!mb_detect_encoding($text, 'UTF-8', true)) { |
49 | 49 | throw new WebSocketError(Frame::CLOSE_BAD_DATA, "Received TEXT is not UTF-8."); |
50 | 50 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * |
13 | 13 | * @return int |
14 | 14 | */ |
15 | - final public static function getType (): int { |
|
15 | + final public static function getType(): int { |
|
16 | 16 | return SOCK_STREAM; |
17 | 17 | } |
18 | 18 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * @return StreamClient |
26 | 26 | * @throws SocketError |
27 | 27 | */ |
28 | - public function accept (): StreamClient { |
|
28 | + public function accept(): StreamClient { |
|
29 | 29 | if (!$resource = @socket_accept($this->resource)) { |
30 | 30 | throw new SocketError($this->resource); // reliable errno |
31 | 31 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @return $this |
46 | 46 | * @throws SocketError |
47 | 47 | */ |
48 | - public function listen (int $backlog = 0) { |
|
48 | + public function listen(int $backlog = 0) { |
|
49 | 49 | if (!@socket_listen($this->resource, $backlog)) { |
50 | 50 | throw new SocketError($this->resource); // reliable errno |
51 | 51 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @param resource $resource The accepted connection. |
59 | 59 | * @return StreamClient |
60 | 60 | */ |
61 | - protected function newClient ($resource): StreamClient { |
|
61 | + protected function newClient($resource): StreamClient { |
|
62 | 62 | return new StreamClient($resource); |
63 | 63 | } |
64 | 64 |
@@ -31,12 +31,12 @@ discard block |
||
31 | 31 | * @return int |
32 | 32 | * @throws SocketError |
33 | 33 | */ |
34 | - public static function select (array &$read, array &$write, array &$except, ?float $timeout = null): int { |
|
34 | + public static function select(array &$read, array &$write, array &$except, ?float $timeout = null): int { |
|
35 | 35 | $rwe = [$read, $write, $except]; |
36 | 36 | array_walk_recursive($rwe, function(SocketInterface &$each) { |
37 | 37 | $each = $each->getResource(); |
38 | 38 | }); |
39 | - $uSec = (int)(fmod($timeout, 1) * 1000000); // ignored if timeout is null |
|
39 | + $uSec = (int) (fmod($timeout, 1) * 1000000); // ignored if timeout is null |
|
40 | 40 | $count = @socket_select($rwe[0], $rwe[1], $rwe[2], $timeout, $uSec); // keys are preserved |
41 | 41 | if ($count === false) { |
42 | 42 | $read = $write = $except = []; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @param ReactiveInterface $socket |
55 | 55 | * @return $this |
56 | 56 | */ |
57 | - public function add (ReactiveInterface $socket) { |
|
57 | + public function add(ReactiveInterface $socket) { |
|
58 | 58 | $this->sockets[$socket->getId()] = $socket; |
59 | 59 | return $this; |
60 | 60 | } |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | * |
65 | 65 | * @return int |
66 | 66 | */ |
67 | - public function count (): int { |
|
67 | + public function count(): int { |
|
68 | 68 | return count($this->sockets); |
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
72 | 72 | * @return ReactiveInterface[] |
73 | 73 | */ |
74 | - public function getSockets () { |
|
74 | + public function getSockets() { |
|
75 | 75 | return $this->sockets; |
76 | 76 | } |
77 | 77 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * @param ReactiveInterface $socket |
81 | 81 | * @param Throwable $error |
82 | 82 | */ |
83 | - public function onError (int $channel, $socket, Throwable $error) { |
|
83 | + public function onError(int $channel, $socket, Throwable $error) { |
|
84 | 84 | unset($channel); |
85 | 85 | if ($socket instanceof WebSocketClient and $error instanceof WebSocketError) { |
86 | 86 | $socket->close($error->getCode(), $error->getMessage()); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @param float|null $timeout Maximum seconds to block. `NULL` blocks forever. |
102 | 102 | * @return int Number of sockets selected. |
103 | 103 | */ |
104 | - public function react (?float $timeout = null): int { |
|
104 | + public function react(?float $timeout = null): int { |
|
105 | 105 | /** @var ReactiveInterface[][] $rwe */ |
106 | 106 | $rwe = [$this->sockets, [], $this->sockets]; |
107 | 107 | $count = static::select($rwe[0], $rwe[1], $rwe[2], $timeout); |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | * @param ReactiveInterface $socket |
130 | 130 | * @return $this |
131 | 131 | */ |
132 | - public function remove (ReactiveInterface $socket) { |
|
132 | + public function remove(ReactiveInterface $socket) { |
|
133 | 133 | unset($this->sockets[$socket->getId()]); |
134 | 134 | return $this; |
135 | 135 | } |
@@ -84,8 +84,7 @@ discard block |
||
84 | 84 | unset($channel); |
85 | 85 | if ($socket instanceof WebSocketClient and $error instanceof WebSocketError) { |
86 | 86 | $socket->close($error->getCode(), $error->getMessage()); |
87 | - } |
|
88 | - else { |
|
87 | + } else { |
|
89 | 88 | $socket->close(); |
90 | 89 | } |
91 | 90 | echo $error; |
@@ -109,11 +108,9 @@ discard block |
||
109 | 108 | foreach ($rwe[$channel] as $id => $socket) { |
110 | 109 | try { |
111 | 110 | $socket->{$method}(); |
112 | - } |
|
113 | - catch (Throwable $error) { |
|
111 | + } catch (Throwable $error) { |
|
114 | 112 | $this->onError($channel, $socket, $error); |
115 | - } |
|
116 | - finally { |
|
113 | + } finally { |
|
117 | 114 | if (!$socket->isOpen()) { |
118 | 115 | $this->remove($socket); |
119 | 116 | } |