hfw / socket

src/StreamServer.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
      *
      * @return int
      */
-    final public static function getType (): int {
+    final public static function getType(): int {
         return SOCK_STREAM;
     }
 
@@ -25,7 +25,7 @@ 
      * @return StreamClient
      * @throws SocketError
      */
-    public function accept (): StreamClient {
+    public function accept(): StreamClient {
         if (!$resource = @socket_accept($this->resource)) {
             throw new SocketError($this->resource); // reliable errno
         }
@@ -45,7 +45,7 @@ 
      * @return $this
      * @throws SocketError
      */
-    public function listen (int $backlog = 0) {
+    public function listen(int $backlog = 0) {
         if (!@socket_listen($this->resource, $backlog)) {
             throw new SocketError($this->resource); // reliable errno
         }
@@ -58,7 +58,7 @@ 
      * @param resource $resource The accepted connection.
      * @return StreamClient
      */
-    protected function newClient ($resource): StreamClient {
+    protected function newClient($resource): StreamClient {
         return new StreamClient($resource);
     }
 

src/Reactor.php

Braces +3 added lines, -6 removed lines

@@ -84,8 +84,7 @@ 
         unset($channel);
         if ($socket instanceof WebSocketClient and $error instanceof WebSocketError) {
             $socket->close($error->getCode(), $error->getMessage());
-        }
-        else {
+        } else {
             $socket->close();
         }
         echo $error;
@@ -109,11 +108,9 @@ 
             foreach ($rwe[$channel] as $id => $socket) {
                 try {
                     $socket->{$method}();
-                }
-                catch (Throwable $error) {
+                } catch (Throwable $error) {
                     $this->onError($channel, $socket, $error);
-                }
-                finally {
+                } finally {
                     if (!$socket->isOpen()) {
                         $this->remove($socket);
                     }

Spacing +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@ 
      * @return int
      * @throws SocketError
      */
-    public static function select (array &$read, array &$write, array &$except, ?float $timeout = null): int {
+    public static function select(array &$read, array &$write, array &$except, ?float $timeout = null): int {
         $rwe = [$read, $write, $except];
         array_walk_recursive($rwe, function(SocketInterface &$each) {
             $each = $each->getResource();
         });
-        $uSec = (int)(fmod($timeout, 1) * 1000000); // ignored if timeout is null
+        $uSec = (int) (fmod($timeout, 1) * 1000000); // ignored if timeout is null
         $count = @socket_select($rwe[0], $rwe[1], $rwe[2], $timeout, $uSec); // keys are preserved
         if ($count === false) {
             $read = $write = $except = [];
@@ -54,7 +54,7 @@ 
      * @param ReactiveInterface $socket
      * @return $this
      */
-    public function add (ReactiveInterface $socket) {
+    public function add(ReactiveInterface $socket) {
         $this->sockets[$socket->getId()] = $socket;
         return $this;
     }
@@ -64,14 +64,14 @@ 
      *
      * @return int
      */
-    public function count (): int {
+    public function count(): int {
         return count($this->sockets);
     }
 
     /**
      * @return ReactiveInterface[]
      */
-    public function getSockets () {
+    public function getSockets() {
         return $this->sockets;
     }
 
@@ -80,7 +80,7 @@ 
      * @param ReactiveInterface $socket
      * @param Throwable $error
      */
-    public function onError (int $channel, $socket, Throwable $error): void {
+    public function onError(int $channel, $socket, Throwable $error): void {
         unset($channel);
         if ($socket instanceof WebSocketClient and $error instanceof WebSocketError) {
             $socket->close($error->getCode(), $error->getMessage());
@@ -101,7 +101,7 @@ 
      * @param float|null $timeout Maximum seconds to block. `NULL` blocks forever.
      * @return int Number of sockets selected.
      */
-    public function react (?float $timeout = null): int {
+    public function react(?float $timeout = null): int {
         /** @var ReactiveInterface[][] $rwe */
         $rwe = [$this->sockets, [], $this->sockets];
         $count = static::select($rwe[0], $rwe[1], $rwe[2], $timeout);
@@ -129,7 +129,7 @@ 
      * @param ReactiveInterface $socket
      * @return $this
      */
-    public function remove (ReactiveInterface $socket) {
+    public function remove(ReactiveInterface $socket) {
         unset($this->sockets[$socket->getId()]);
         return $this;
     }

src/WebSocket/WebSocketServer.php

Spacing +13 added lines, -13 removed lines

@@ -31,7 +31,7 @@ 
      * @param $resource
      * @param Reactor $reactor
      */
-    public function __construct ($resource, Reactor $reactor) {
+    public function __construct($resource, Reactor $reactor) {
         parent::__construct($resource);
         $reactor->add($this);
         $this->reactor = $reactor;
@@ -40,7 +40,7 @@ 
     /**
      * @return WebSocketClient
      */
-    public function accept (): WebSocketClient {
+    public function accept(): WebSocketClient {
         /**
          * @see newClient()
          * @var WebSocketClient $client
@@ -57,7 +57,7 @@ 
      * @param int $opCode
      * @param string $payload
      */
-    public function broadcast (int $opCode, string $payload) {
+    public function broadcast(int $opCode, string $payload) {
         foreach ($this->clients as $client) {
             if ($client->isOk()) {
                 $client->getFrameHandler()->write($opCode, $payload);
@@ -68,7 +68,7 @@ 
     /**
      * @param string $payload
      */
-    public function broadcastBinary (string $payload) {
+    public function broadcastBinary(string $payload) {
         $this->broadcast(Frame::OP_BINARY, $payload);
     }
 
@@ -77,7 +77,7 @@ 
      *
      * @param string $payload
      */
-    public function broadcastPing (string $payload = '') {
+    public function broadcastPing(string $payload = '') {
         $this->broadcast(Frame::OP_PING, $payload);
     }
 
@@ -86,7 +86,7 @@ 
      *
      * @param string $text
      */
-    public function broadcastText (string $text) {
+    public function broadcastText(string $text) {
         $this->broadcast(Frame::OP_TEXT, $text);
     }
 
@@ -97,7 +97,7 @@ 
      * @param string $reason
      * @return $this
      */
-    public function close (int $code = Frame::CLOSE_INTERRUPT, $reason = '') {
+    public function close(int $code = Frame::CLOSE_INTERRUPT, $reason = '') {
         foreach ($this->clients as $client) {
             try {
                 $client->close($code, $reason); // clients remove themselves
@@ -115,14 +115,14 @@ 
      *
      * @return int
      */
-    public function count (): int {
+    public function count(): int {
         return count($this->clients);
     }
 
     /**
      * @return WebSocketClient[]
      */
-    public function getClients () {
+    public function getClients() {
         return $this->clients;
     }
 
@@ -130,21 +130,21 @@ 
      * @param resource $resource
      * @return WebSocketClient
      */
-    protected function newClient ($resource): WebSocketClient {
+    protected function newClient($resource): WebSocketClient {
         return new WebSocketClient($resource, $this);
     }
 
     /**
      * WebSocket servers never get OOB data.
      */
-    final public function onOutOfBand (): void {
+    final public function onOutOfBand(): void {
         // do nothing
     }
 
     /**
      * Auto-accept.
      */
-    public function onReadable (): void {
+    public function onReadable(): void {
         $this->accept();
     }
 
@@ -153,7 +153,7 @@ 
      *
      * @param WebSocketClient $client
      */
-    public function remove ($client): void {
+    public function remove($client): void {
         unset($this->clients[$client->getId()]);
         $this->reactor->remove($client);
     }

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
         foreach ($this->clients as $client) {
             try {
                 $client->close($code, $reason); // clients remove themselves
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 continue;
             }
         }

src/WebSocket/Handshake.php

Spacing +8 added lines, -8 removed lines

@@ -43,21 +43,21 @@ 
     /**
      * @param WebSocketClient $client
      */
-    public function __construct (WebSocketClient $client) {
+    public function __construct(WebSocketClient $client) {
         $this->client = $client;
     }
 
     /**
      * @return string[]
      */
-    public function getHeaders () {
+    public function getHeaders() {
         return $this->headers;
     }
 
     /**
      * @return string
      */
-    public function getMethod (): string {
+    public function getMethod(): string {
         return $this->method;
     }
 
@@ -68,7 +68,7 @@ 
      * @throws WebSocketError
      * @throws Throwable
      */
-    public function onReadable (): bool {
+    public function onReadable(): bool {
         // read into the buffer
         $this->buffer .= $bytes = $this->client->recvAll();
 
@@ -100,7 +100,7 @@ 
                 $key = strtolower(trim($key));
                 $value = trim($value);
                 if (isset($this->headers[$key])) {
-                    $this->headers[$key] .= ', ' . $value;
+                    $this->headers[$key] .= ', '.$value;
                 }
                 else {
                     $this->headers[$key] = $value;
@@ -129,8 +129,8 @@ 
     /**
      * Sends the connection upgrade headers.
      */
-    protected function upgrade (): void {
-        $key = base64_encode(sha1($this->headers['sec-websocket-key'] . self::RFC_GUID, true));
+    protected function upgrade(): void {
+        $key = base64_encode(sha1($this->headers['sec-websocket-key'].self::RFC_GUID, true));
         $this->client->write(implode("\r\n", [
             "HTTP/1.1 101 Switching Protocols",
             "Connection: Upgrade",
@@ -144,7 +144,7 @@ 
      *
      * @throws WebSocketError
      */
-    protected function validate (): void {
+    protected function validate(): void {
         if (!(
             $check = 'method = http 1.1'
             and preg_match('/HTTP\/1\.1$/i', $this->method)

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;
         }

Spacing +17 added lines, -17 removed lines

@@ -52,7 +52,7 @@ 
      * @param resource $resource
      * @param WebSocketServer $server
      */
-    public function __construct ($resource, WebSocketServer $server) {
+    public function __construct($resource, WebSocketServer $server) {
         parent::__construct($resource);
         $this->server = $server;
         $this->handshake = new Handshake($this);
@@ -77,7 +77,7 @@ 
      * @param string $reason Sent to the peer, if code is >= 1000
      * @return $this
      */
-    public function close (int $code = null, string $reason = '') {
+    public function close(int $code = null, string $reason = '') {
         try {
             if ($code >= 1000 and $this->isOk()) {
                 $this->frameHandler->writeClose($code, $reason);
@@ -94,32 +94,32 @@ 
     /**
      * @return FrameHandler
      */
-    public function getFrameHandler (): FrameHandler {
+    public function getFrameHandler(): FrameHandler {
         return $this->frameHandler;
     }
 
     /**
      * @return WebSocketServer
      */
-    public function getServer (): WebSocketServer {
+    public function getServer(): WebSocketServer {
         return $this->server;
     }
 
     /**
      * @return int
      */
-    public function getState (): int {
+    public function getState(): int {
         return $this->state;
     }
 
-    final public function isNegotiating (): bool {
+    final public function isNegotiating(): bool {
         return $this->state === self::STATE_HANDSHAKE;
     }
 
     /**
      * @return bool
      */
-    final public function isOk (): bool {
+    final public function isOk(): bool {
         return $this->state === self::STATE_OK;
     }
 
@@ -131,7 +131,7 @@ 
      * @param string $binary
      * @throws WebSocketError
      */
-    public function onBinary (string $binary): void {
+    public function onBinary(string $binary): void {
         unset($binary);
         throw new WebSocketError(Frame::CLOSE_UNHANDLED_DATA, "I don't handle binary data.");
     }
@@ -142,7 +142,7 @@ 
      * @param int $code
      * @param string $reason
      */
-    public function onClose (int $code, string $reason): void {
+    public function onClose(int $code, string $reason): void {
         unset($code, $reason);
         $this->close();
     }
@@ -154,7 +154,7 @@ 
      *
      * Closes the connection with a protocol-error frame.
      */
-    final public function onOutOfBand (): void {
+    final public function onOutOfBand(): void {
         $this->close(Frame::CLOSE_PROTOCOL_ERROR, "Received out-of-band data.");
     }
 
@@ -165,7 +165,7 @@ 
      *
      * @param string $message
      */
-    public function onPing (string $message): void {
+    public function onPing(string $message): void {
         $this->frameHandler->writePong($message);
     }
 
@@ -176,7 +176,7 @@ 
      *
      * @param string $message
      */
-    public function onPong (string $message): void {
+    public function onPong(string $message): void {
         // stub
     }
 
@@ -186,7 +186,7 @@ 
      * @throws WebSocketError
      * @throws Throwable
      */
-    public function onReadable (): void {
+    public function onReadable(): void {
         try {
             if ($this->isNegotiating()) {
                 if ($this->handshake->onReadable()) {
@@ -216,7 +216,7 @@ 
      * If you have negotiated an extension during {@link Handshake},
      * claim the RSV bits here via {@link FrameReader::setRsv()}
      */
-    protected function onStateOk (): void {
+    protected function onStateOk(): void {
         // stub
     }
 
@@ -228,7 +228,7 @@ 
      * @param string $text
      * @throws WebSocketError
      */
-    public function onText (string $text): void {
+    public function onText(string $text): void {
         unset($text);
         throw new WebSocketError(Frame::CLOSE_UNHANDLED_DATA, "I don't handle text.");
     }
@@ -238,7 +238,7 @@ 
      *
      * @param string $binary
      */
-    public function writeBinary (string $binary): void {
+    public function writeBinary(string $binary): void {
         $this->frameHandler->writeBinary($binary);
     }
 
@@ -247,7 +247,7 @@ 
      *
      * @param string $text
      */
-    public function writeText (string $text): void {
+    public function writeText(string $text): void {
         $this->frameHandler->writeText($text);
     }
 

src/WebSocket/Frame.php

Spacing +33 added lines, -33 removed lines

@@ -43,15 +43,15 @@ 
         0x0f => 'RESERVED CONTROL 0x0f',
     ];
 
-    const CLOSE_NORMAL = 1000;              // mutual closure
-    const CLOSE_INTERRUPT = 1001;           // abrupt closure due to hangups, reboots, "going away"
-    const CLOSE_PROTOCOL_ERROR = 1002;      // invalid behavior / framing
-    const CLOSE_UNHANDLED_DATA = 1003;      // message handler doesn't want the payload
-    const CLOSE_BAD_DATA = 1007;            // message handler can't understand the payload
-    const CLOSE_POLICY_VIOLATION = 1008;    // generic "access denied"
-    const CLOSE_TOO_LARGE = 1009;           // unacceptable payload size
-    const CLOSE_EXPECTATION = 1010;         // peer closed because it wants extensions (listed in the reason)
-    const CLOSE_INTERNAL_ERROR = 1011;      // like http 500
+    const CLOSE_NORMAL = 1000; // mutual closure
+    const CLOSE_INTERRUPT = 1001; // abrupt closure due to hangups, reboots, "going away"
+    const CLOSE_PROTOCOL_ERROR = 1002; // invalid behavior / framing
+    const CLOSE_UNHANDLED_DATA = 1003; // message handler doesn't want the payload
+    const CLOSE_BAD_DATA = 1007; // message handler can't understand the payload
+    const CLOSE_POLICY_VIOLATION = 1008; // generic "access denied"
+    const CLOSE_TOO_LARGE = 1009; // unacceptable payload size
+    const CLOSE_EXPECTATION = 1010; // peer closed because it wants extensions (listed in the reason)
+    const CLOSE_INTERNAL_ERROR = 1011; // like http 500
 
     /**
      * @var bool
@@ -81,7 +81,7 @@ 
      * @param int $opCode
      * @param string $payload
      */
-    public function __construct (bool $final, int $rsv, int $opCode, string $payload) {
+    public function __construct(bool $final, int $rsv, int $opCode, string $payload) {
         $this->final = $final;
         $this->rsv = $rsv;
         $this->opCode = $opCode;
@@ -93,7 +93,7 @@ 
      *
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         if ($this->isClose()) {
             return $this->getCloseReason();
         }
@@ -107,7 +107,7 @@ 
      *
      * @return int
      */
-    final public function getCloseCode (): int {
+    final public function getCloseCode(): int {
         $code = substr($this->payload, 0, 2);
         return isset($code[1]) ? unpack('n', $code)[1] : self::CLOSE_NORMAL;
     }
@@ -119,126 +119,126 @@ 
      *
      * @return string
      */
-    final public function getCloseReason (): string {
+    final public function getCloseReason(): string {
         return substr($this->payload, 2);
     }
 
     /**
      * @return int
      */
-    final public function getLength (): int {
+    final public function getLength(): int {
         return strlen($this->payload);
     }
 
     /**
      * @return string
      */
-    public function getName (): string {
+    public function getName(): string {
         return self::NAMES[$this->opCode];
     }
 
     /**
      * @return int
      */
-    final public function getOpCode (): int {
+    final public function getOpCode(): int {
         return $this->opCode;
     }
 
     /**
      * @return string
      */
-    final public function getPayload (): string {
+    final public function getPayload(): string {
         return $this->payload;
     }
 
     /**
      * @return int
      */
-    final public function getRsv (): int {
+    final public function getRsv(): int {
         return $this->rsv;
     }
 
     /**
      * @return bool
      */
-    final public function hasRsv1 (): bool {
-        return (bool)($this->rsv & self::RSV1);
+    final public function hasRsv1(): bool {
+        return (bool) ($this->rsv & self::RSV1);
     }
 
     /**
      * @return bool
      */
-    final public function hasRsv2 (): bool {
-        return (bool)($this->rsv & self::RSV2);
+    final public function hasRsv2(): bool {
+        return (bool) ($this->rsv & self::RSV2);
     }
 
     /**
      * @return bool
      */
-    final public function hasRsv3 (): bool {
-        return (bool)($this->rsv & self::RSV3);
+    final public function hasRsv3(): bool {
+        return (bool) ($this->rsv & self::RSV3);
     }
 
     /**
      * @return bool
      */
-    final public function isBinary (): bool {
+    final public function isBinary(): bool {
         return $this->opCode === self::OP_BINARY;
     }
 
     /**
      * @return bool
      */
-    final public function isClose (): bool {
+    final public function isClose(): bool {
         return $this->opCode === self::OP_CLOSE;
     }
 
     /**
      * @return bool
      */
-    final public function isContinuation (): bool {
+    final public function isContinuation(): bool {
         return $this->opCode === self::OP_CONTINUATION;
     }
 
     /**
      * @return bool
      */
-    final public function isControl (): bool {
+    final public function isControl(): bool {
         return $this->opCode >= self::OP_CLOSE;
     }
 
     /**
      * @return bool
      */
-    final public function isData (): bool {
+    final public function isData(): bool {
         return $this->opCode < self::OP_CLOSE;
     }
 
     /**
      * @return bool
      */
-    final public function isFinal (): bool {
+    final public function isFinal(): bool {
         return $this->final;
     }
 
     /**
      * @return bool
      */
-    final public function isPing (): bool {
+    final public function isPing(): bool {
         return $this->opCode === self::OP_PING;
     }
 
     /**
      * @return bool
      */
-    final public function isPong (): bool {
+    final public function isPong(): bool {
         return $this->opCode === self::OP_PONG;
     }
 
     /**
      * @return bool
      */
-    final public function isText (): bool {
+    final public function isText(): bool {
         return $this->opCode === self::OP_TEXT;
     }
 

src/WebSocket/FrameReader.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
     /**
      * @param WebSocketClient $client
      */
-    public function __construct (WebSocketClient $client) {
+    public function __construct(WebSocketClient $client) {
         $this->client = $client;
     }
 
@@ -72,7 +72,7 @@ 
      * @return null|Frame
      * @throws WebSocketError
      */
-    protected function getFrame (): ?Frame {
+    protected function getFrame(): ?Frame {
         // wait for the header
         if (!$this->header ??= $this->getFrame_header()) {
             return null;
@@ -110,7 +110,7 @@ 
      * https://tools.ietf.org/html/rfc6455#section-5.2
      * @return null|array
      */
-    protected function getFrame_header (): ?array {
+    protected function getFrame_header(): ?array {
         if (!preg_match(self::REGEXP, $this->buffer, $match)) {
             if (strlen($this->buffer) >= 14) { // max head room
                 throw new WebSocketError(Frame::CLOSE_PROTOCOL_ERROR, 'Bad frame.');
@@ -166,7 +166,7 @@ 
      *
      * @return Generator|Frame[]
      */
-    public function getFrames () {
+    public function getFrames() {
         // read into the buffer
         $this->buffer .= $bytes = $this->client->recvAll();
 
@@ -184,14 +184,14 @@ 
     /**
      * @return int
      */
-    public function getMaxLength (): int {
+    public function getMaxLength(): int {
         return $this->maxLength;
     }
 
     /**
      * @return int
      */
-    public function getRsv (): int {
+    public function getRsv(): int {
         return $this->rsv;
     }
 
@@ -201,7 +201,7 @@ 
      * @param string $payload
      * @return Frame
      */
-    protected function newFrame (string $payload): Frame {
+    protected function newFrame(string $payload): Frame {
         return new Frame($this->header['final'], $this->header['rsv'], $this->header['opCode'], $payload);
     }
 
@@ -209,7 +209,7 @@ 
      * @param int $bytes
      * @return $this
      */
-    public function setMaxLength (int $bytes) {
+    public function setMaxLength(int $bytes) {
         $this->maxLength = min(max(125, $bytes), 2 ** 63 - 1);
         return $this;
     }
@@ -218,7 +218,7 @@ 
      * @param int $rsv
      * @return $this
      */
-    public function setRsv (int $rsv) {
+    public function setRsv(int $rsv) {
         $this->rsv = $rsv;
         return $this;
     }

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

Spacing +28 added lines, -28 removed lines

@@ -67,7 +67,7 @@ 
     /**
      * @param WebSocketClient $client
      */
-    public function __construct (WebSocketClient $client) {
+    public function __construct(WebSocketClient $client) {
         $this->client = $client;
         $this->reader = new FrameReader($client);
     }
@@ -75,21 +75,21 @@ 
     /**
      * @return int
      */
-    public function getFragmentSize (): int {
+    public function getFragmentSize(): int {
         return $this->fragmentSize;
     }
 
     /**
      * @return int
      */
-    public function getMaxLength (): int {
+    public function getMaxLength(): int {
         return $this->maxLength;
     }
 
     /**
      * @return bool
      */
-    public function isStream (): bool {
+    public function isStream(): bool {
         return $this->stream;
     }
 
@@ -102,7 +102,7 @@ 
      * @param Frame $frame
      * @throws WebSocketError
      */
-    protected function onBinary (Frame $frame): void {
+    protected function onBinary(Frame $frame): void {
         if ($this->stream) {
             $this->client->onBinary($frame->getPayload());
         }
@@ -128,7 +128,7 @@ 
      *
      * @param Frame $frame
      */
-    protected function onClose (Frame $frame): void {
+    protected function onClose(Frame $frame): void {
         $this->client->onClose($frame->getCloseCode(), $frame->getCloseReason());
     }
 
@@ -138,7 +138,7 @@ 
      * @param Frame $frame
      * @throws WebSocketError
      */
-    protected function onContinuation (Frame $frame): void {
+    protected function onContinuation(Frame $frame): void {
         if (!$this->continue) {
             throw new WebSocketError(
                 Frame::CLOSE_PROTOCOL_ERROR,
@@ -170,7 +170,7 @@ 
      *
      * @param Frame $frame
      */
-    protected function onControl (Frame $frame): void {
+    protected function onControl(Frame $frame): void {
         if ($frame->isClose()) {
             $this->onClose($frame);
         }
@@ -190,7 +190,7 @@ 
      *
      * @param Frame $frame
      */
-    protected function onData (Frame $frame): void {
+    protected function onData(Frame $frame): void {
         // did we get a continuation?
         if ($frame->isContinuation()) {
             $this->onContinuation($frame);
@@ -199,7 +199,7 @@ 
         elseif ($this->continue) {
             throw new WebSocketError(
                 Frame::CLOSE_PROTOCOL_ERROR,
-                "Received interleaved {$frame->getName()} against existing " . Frame::NAMES[$this->continue],
+                "Received interleaved {$frame->getName()} against existing ".Frame::NAMES[$this->continue],
                 $frame
             );
         }
@@ -226,7 +226,7 @@ 
      * @param Frame $frame
      * @throws WebSocketError
      */
-    protected function onData_CheckLength (Frame $frame): void {
+    protected function onData_CheckLength(Frame $frame): void {
         if (strlen($this->buffer) + $frame->getLength() > $this->maxLength) {
             throw new WebSocketError(
                 Frame::CLOSE_TOO_LARGE,
@@ -245,7 +245,7 @@ 
      *
      * @param Frame $frame
      */
-    public function onFrame (Frame $frame): void {
+    public function onFrame(Frame $frame): void {
         if ($frame->isControl()) {
             $this->onControl($frame);
         }
@@ -259,7 +259,7 @@ 
      *
      * @param Frame $frame
      */
-    protected function onPing (Frame $frame): void {
+    protected function onPing(Frame $frame): void {
         $this->client->onPing($frame->getPayload());
     }
 
@@ -268,14 +268,14 @@ 
      *
      * @param Frame $frame
      */
-    protected function onPong (Frame $frame): void {
+    protected function onPong(Frame $frame): void {
         $this->client->onPong($frame->getPayload());
     }
 
     /**
      * Uses {@link FrameReader} to read frames and passes them off to {@link onFrame()}
      */
-    public function onReadable (): void {
+    public function onReadable(): void {
         foreach ($this->reader->getFrames() as $frame) {
             $this->onFrame($frame);
         }
@@ -288,7 +288,7 @@ 
      * @param Frame $frame
      * @throws WebSocketError
      */
-    protected function onText (Frame $frame): void {
+    protected function onText(Frame $frame): void {
         $this->onData_CheckLength($frame);
         $this->buffer .= $frame->getPayload();
         if ($frame->isFinal()) {
@@ -305,7 +305,7 @@ 
      * @param int $bytes
      * @return $this
      */
-    public function setFragmentSize (int $bytes) {
+    public function setFragmentSize(int $bytes) {
         $this->fragmentSize = $bytes;
         return $this;
     }
@@ -314,7 +314,7 @@ 
      * @param int $bytes
      * @return $this
      */
-    public function setMaxLength (int $bytes) {
+    public function setMaxLength(int $bytes) {
         $this->maxLength = $bytes;
         return $this;
     }
@@ -323,7 +323,7 @@ 
      * @param bool $stream
      * @return $this
      */
-    public function setStream (bool $stream) {
+    public function setStream(bool $stream) {
         $this->stream = $stream;
         return $this;
     }
@@ -334,7 +334,7 @@ 
      * @param int $opCode
      * @param string $payload
      */
-    public function write (int $opCode, string $payload): void {
+    public function write(int $opCode, string $payload): void {
         $offset = 0;
         $total = strlen($payload);
         do {
@@ -350,7 +350,7 @@ 
     /**
      * @param string $payload
      */
-    public function writeBinary (string $payload): void {
+    public function writeBinary(string $payload): void {
         $this->write(Frame::OP_BINARY, $payload);
     }
 
@@ -358,8 +358,8 @@ 
      * @param int $code
      * @param string $reason
      */
-    public function writeClose (int $code = Frame::CLOSE_NORMAL, string $reason = ''): void {
-        $this->writeFrame(true, Frame::OP_CLOSE, pack('n', $code) . $reason);
+    public function writeClose(int $code = Frame::CLOSE_NORMAL, string $reason = ''): void {
+        $this->writeFrame(true, Frame::OP_CLOSE, pack('n', $code).$reason);
     }
 
     /**
@@ -369,7 +369,7 @@ 
      * @param int $opCode
      * @param string $payload
      */
-    protected function writeFrame (bool $final, int $opCode, string $payload): void {
+    protected function writeFrame(bool $final, int $opCode, string $payload): void {
         if ($opCode & 0x08 and !$final) {
             throw new LogicException("Would have sent a fragmented control frame ({$opCode}) {$payload}");
         }
@@ -386,27 +386,27 @@ 
         else {
             $head .= chr($length);
         }
-        $this->client->write($head . $payload);
+        $this->client->write($head.$payload);
     }
 
     /**
      * @param string $payload
      */
-    public function writePing (string $payload = ''): void {
+    public function writePing(string $payload = ''): void {
         $this->writeFrame(true, Frame::OP_PING, $payload);
     }
 
     /**
      * @param string $payload
      */
-    public function writePong (string $payload = ''): void {
+    public function writePong(string $payload = ''): void {
         $this->writeFrame(true, Frame::OP_PONG, $payload);
     }
 
     /**
      * @param string $payload
      */
-    public function writeText (string $payload): void {
+    public function writeText(string $payload): void {
         $this->write(Frame::OP_TEXT, $payload);
     }
 }
\ No newline at end of file

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);