@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | */ |
47 | 47 | protected $maxLength = 10 * 1024 * 1024; |
48 | 48 | |
49 | - public function __construct (WebSocketClient $client) { |
|
49 | + public function __construct(WebSocketClient $client) { |
|
50 | 50 | $this->client = $client; |
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
54 | 54 | * @return Frame|null |
55 | 55 | */ |
56 | - protected function getFrame () { |
|
56 | + protected function getFrame() { |
|
57 | 57 | if (!$this->head) { |
58 | 58 | if (preg_match(self::REGEXP, $this->buffer, $head)) { |
59 | 59 | [, $op, $len] = unpack('C2', $head[0]); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * |
96 | 96 | * @return Generator|Frame[] |
97 | 97 | */ |
98 | - public function getFrames () { |
|
98 | + public function getFrames() { |
|
99 | 99 | $this->buffer .= $this->client->recvAll(); |
100 | 100 | while ($frame = $this->getFrame()) { |
101 | 101 | yield $frame; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | /** |
106 | 106 | * @return int |
107 | 107 | */ |
108 | - public function getMaxLength (): int { |
|
108 | + public function getMaxLength(): int { |
|
109 | 109 | return $this->maxLength; |
110 | 110 | } |
111 | 111 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * @param int $bytes |
114 | 114 | * @return $this |
115 | 115 | */ |
116 | - public function setMaxLength (int $bytes) { |
|
116 | + public function setMaxLength(int $bytes) { |
|
117 | 117 | if ($bytes < self::MAX_LENGTH_RANGE[0] or $bytes > self::MAX_LENGTH_RANGE[1]) { |
118 | 118 | throw new InvalidArgumentException('Max length must be within range [125,2^63-1]'); |
119 | 119 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * |
127 | 127 | * @throws WebSocketError |
128 | 128 | */ |
129 | - protected function validate (): void { |
|
129 | + protected function validate(): void { |
|
130 | 130 | if ($this->head['length'] > $this->maxLength) { |
131 | 131 | throw new WebSocketError(Frame::CLOSE_TOO_LARGE, "Payload would exceed {$this->maxLength} bytes"); |
132 | 132 | } |
@@ -67,11 +67,9 @@ discard block |
||
67 | 67 | ]; |
68 | 68 | $this->buffer = substr($this->buffer, strlen($head[0])); |
69 | 69 | $this->validate(); |
70 | - } |
|
71 | - elseif (strlen($this->buffer) >= 14) { // max head room |
|
70 | + } elseif (strlen($this->buffer) >= 14) { // max head room |
|
72 | 71 | throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, 'Bad frame.'); |
73 | - } |
|
74 | - else { |
|
72 | + } else { |
|
75 | 73 | return null; |
76 | 74 | } |
77 | 75 | } |
@@ -139,8 +137,7 @@ discard block |
||
139 | 137 | if (!$this->head['final']) { |
140 | 138 | throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, "Received fragmented {$name}"); |
141 | 139 | } |
142 | - } |
|
143 | - elseif ($opCode > Frame::OP_BINARY) { // data |
|
140 | + } elseif ($opCode > Frame::OP_BINARY) { // data |
|
144 | 141 | throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, "Received {$name}"); |
145 | 142 | } |
146 | 143 | } |
@@ -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 { |
|
162 | + final public function hasRsv1(): bool { |
|
163 | 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 { |
|
169 | + final public function hasRsv2(): bool { |
|
170 | 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 { |
|
176 | + final public function hasRsv3(): bool { |
|
177 | 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 |
@@ -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 | } |
@@ -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 () { |
|
28 | + public function accept() { |
|
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) { |
|
61 | + protected function newClient($resource) { |
|
62 | 62 | return new StreamClient($resource); |
63 | 63 | } |
64 | 64 |