hfw / socket

src/WebSocket/Handshake.php

Braces +3 added lines, -6 removed lines

@@ -101,19 +101,16 @@
                 $value = trim($value);
                 if (isset($this->headers[$key])) {
                     $this->headers[$key] .= ', ' . $value;
-                }
-                else {
+                } else {
                     $this->headers[$key] = $value;
                 }
             }
             $this->buffer = ''; // wipe the buffer
             $this->validate();
-        }
-        catch (WebSocketError $e) { // catch and respond with HTTP error and rethrow
+        } catch (WebSocketError $e) { // catch and respond with HTTP error and rethrow
             $this->client->write("HTTP/1.1 {$e->getCode()} WebSocket Handshake Failure\r\n\r\n");
             throw $e;
-        }
-        catch (Throwable $e) { // catch everything else and respond with HTTP 500 and rethrow
+        } catch (Throwable $e) { // catch everything else and respond with HTTP 500 and rethrow
             $this->client->write("HTTP/1.1 500 WebSocket Internal Error\r\n\r\n");
             throw $e;
         }

src/WebSocket/WebSocketClient.php

Braces +4 added lines, -8 removed lines

@@ -82,8 +82,7 @@ 
             if ($code >= 1000 and $this->isOk()) {
                 $this->frameHandler->writeClose($code, $reason);
             }
-        }
-        finally {
+        } finally {
             $this->server->remove($this);
             parent::close();
             $this->state = self::STATE_CLOSED;
@@ -200,16 +199,13 @@ 
                     $this->state = self::STATE_OK;
                     $this->onStateOk();
                 }
-            }
-            elseif ($this->isOk()) {
+            } elseif ($this->isOk()) {
                 $this->frameHandler->onReadable();
             }
-        }
-        catch (WebSocketError $e) {
+        } catch (WebSocketError $e) {
             $this->close($e->getCode(), $e->getMessage());
             throw $e;
-        }
-        catch (Throwable $e) {
+        } catch (Throwable $e) {
             $this->close(Frame::CLOSE_INTERNAL_ERROR);
             throw $e;
         }

src/WebSocket/FrameReader.php

Braces +4 added lines, -8 removed lines

@@ -141,19 +141,15 @@
         if ($badRsv = $rsv & ~$this->rsv) {
             $badRsv = str_pad(base_convert($badRsv >> 4, 10, 2), 3, '0', STR_PAD_LEFT);
             throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, "Received unknown RSV bits: 0b{$badRsv}");
-        }
-        elseif ($opCode >= Frame::OP_CLOSE) {
+        } elseif ($opCode >= Frame::OP_CLOSE) {
             if ($opCode > Frame::OP_PONG) {
                 throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, "Received unsupported control frame ({$opCode})");
-            }
-            elseif (!$final) {
+            } elseif (!$final) {
                 throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, "Received fragmented control frame ({$opCode})");
             }
-        }
-        elseif ($opCode > Frame::OP_BINARY) {
+        } elseif ($opCode > Frame::OP_BINARY) {
             throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, "Received unsupported data frame ({$opCode})");
-        }
-        elseif ($length > $this->maxLength) {
+        } elseif ($length > $this->maxLength) {
             throw new WebSocketError(Frame::CLOSE_TOO_LARGE, "Payload would exceed {$this->maxLength} bytes");
         }
 

src/WebSocket/FrameHandler.php

Braces +9 added lines, -18 removed lines

@@ -105,8 +105,7 @@ 
     protected function onBinary (Frame $frame): void {
         if ($this->stream) {
             $this->client->onBinary($frame->getPayload());
-        }
-        else {
+        } else {
             $this->onData_CheckLength($frame);
             $this->buffer .= $frame->getPayload();
             if ($frame->isFinal()) {
@@ -149,12 +148,10 @@ 
         try {
             if ($this->continue === Frame::OP_TEXT) {
                 $this->onText($frame);
-            }
-            else {
+            } else {
                 $this->onBinary($frame);
             }
-        }
-        finally {
+        } finally {
             if ($frame->isFinal()) {
                 $this->continue = null;
             }
@@ -173,14 +170,11 @@ 
     protected function onControl (Frame $frame): void {
         if ($frame->isClose()) {
             $this->onClose($frame);
-        }
-        elseif ($frame->isPing()) {
+        } elseif ($frame->isPing()) {
             $this->onPing($frame);
-        }
-        elseif ($frame->isPong()) {
+        } elseif ($frame->isPong()) {
             $this->onPong($frame);
-        }
-        else {
+        } else {
             throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, "Unsupported control frame.", $frame);
         }
     }
@@ -248,8 +242,7 @@ 
     public function onFrame (Frame $frame): void {
         if ($frame->isControl()) {
             $this->onControl($frame);
-        }
-        else {
+        } else {
             $this->onData($frame);
         }
     }
@@ -378,12 +371,10 @@ 
         if ($length > 65535) {
             $head .= chr(127);
             $head .= pack('J', $length);
-        }
-        elseif ($length >= 126) {
+        } elseif ($length >= 126) {
             $head .= chr(126);
             $head .= pack('n', $length);
-        }
-        else {
+        } else {
             $head .= chr($length);
         }
         $this->client->write($head . $payload);