hfw / socket

src/AbstractClient.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
      *
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         try {
             return implode(':', $this->getPeerName());
         }
@@ -41,7 +41,7 @@ 
      * @return $this
      * @throws SocketError
      */
-    public function connect (string $address, int $port = 0) {
+    public function connect(string $address, int $port = 0) {
         if (!@socket_connect($this->resource, $address, $port)) {
             // ignore expected errors for non-blocking connections
             $errno = SocketError::getLast($this->resource);
@@ -61,7 +61,7 @@ 
      * @return array `[ 0 => address, 1 => port ]`
      * @throws SocketError
      */
-    public function getPeerName (): array {
+    public function getPeerName(): array {
         if ($this->getDomain() === AF_UNIX) {
             return [$this->getOption(17), 0]; // SO_PEERCRED is not exposed by PHP
         }
@@ -81,7 +81,7 @@ 
      * @return int Total bytes sent.
      * @throws SocketError
      */
-    public function send (string $data, int $flags = 0): int {
+    public function send(string $data, int $flags = 0): int {
         $count = @socket_send($this->resource, $data, strlen($data), $flags);
         if ($count === false) {
             throw new SocketError($this->resource); // reliable errno
@@ -96,7 +96,7 @@ 
      * @return $this
      * @throws SocketError `int` total bytes sent is set as the extra data.
      */
-    public function write (string $data) {
+    public function write(string $data) {
         $length = strlen($data);
         $total = 0;
         while ($total < $length) {

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
     public function __toString () {
         try {
             return implode(':', $this->getPeerName());
-        }
-        catch (Throwable $e) {
+        } catch (Throwable $e) {
             return "?{$this->resource}";
         }
     }
@@ -102,8 +101,7 @@ 
         while ($total < $length) {
             try {
                 $total += $this->awaitWritable()->send(substr($data, $total));
-            }
-            catch (SocketError $e) {
+            } catch (SocketError $e) {
                 $e->setExtra($total);
                 throw $e;
             }

src/SocketInterface.php

Spacing +3 added lines, -3 removed lines

@@ -27,20 +27,20 @@
      *
      * @return int
      */
-    public function getId (): int;
+    public function getId(): int;
 
     /**
      * Returns the underlying socket resource.
      *
      * @return resource
      */
-    public function getResource ();
+    public function getResource();
 
     /**
      * Whether the underlying resource is usable.
      *
      * @return bool
      */
-    public function isOpen (): bool;
+    public function isOpen(): bool;
 
 }
\ No newline at end of file

src/SocketError.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
      * @param resource $resource PHP socket resource, or `null` for the global error.
      * @return int If the resource is closed or not a socket, `SOCKET_EBADF` is returned.
      */
-    public static function getLast ($resource = null) {
+    public static function getLast($resource = null) {
         if (isset($resource)) {
             if (@get_resource_type($resource) !== 'Socket') {
                 return SOCKET_EBADF; // Bad file descriptor
@@ -62,7 +62,7 @@ 
      * @param int $fallback Code to assume if one can't be found via the subject.
      * @param SocketError|null $previous Slippage of a prior error.
      */
-    public function __construct ($subject = null, $fallback = 0, SocketError $previous = null) {
+    public function __construct($subject = null, $fallback = 0, SocketError $previous = null) {
         if ($errno = is_int($subject) ? $subject : static::getLast($subject)) {
             $message = socket_strerror($errno);
         }
@@ -77,7 +77,7 @@ 
     /**
      * @return mixed
      */
-    public function getExtra () {
+    public function getExtra() {
         return $this->extra;
     }
 
@@ -85,7 +85,7 @@ 
      * @param mixed $extra
      * @return $this
      */
-    public function setExtra ($extra) {
+    public function setExtra($extra) {
         $this->extra = $extra;
         return $this;
     }

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
     public function __construct ($subject = null, $fallback = 0, SocketError $previous = null) {
         if ($errno = is_int($subject) ? $subject : static::getLast($subject)) {
             $message = socket_strerror($errno);
-        }
-        else {
+        } else {
             $errno = $fallback;
             $last = error_get_last();
             $message = "{$last['message']} in {$last['file']}:{$last['line']}";

src/StreamClient.php

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
                 $length -= $chunkSize = strlen($chunk);
             } while ($chunkSize and $length);
             return $data;
-        }
-        catch (SocketError $e) {
+        } catch (SocketError $e) {
             $e->setExtra($data);
             throw $e;
         }
@@ -91,8 +90,7 @@ 
         $length = $this->getOption(SO_RCVBUF);
         try {
             return $this->recv($length, $msgFlags);
-        }
-        catch (SocketError $e) {
+        } catch (SocketError $e) {
             if ($e->getCode() === SOCKET_EAGAIN) { // would block
                 return '';
             }

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      * @link https://php.net/socket_create_pair
      *
      * @param array $extra Variadic constructor arguments.
-     * @return static[] Two instances at indices `0` and `1`.
+     * @return StreamClient[] Two instances at indices `0` and `1`.
      * @throws SocketError
      */
     public static function newUnixPair (...$extra) {

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
      *
      * @return int
      */
-    final public static function getType (): int {
+    final public static function getType(): int {
         return SOCK_STREAM;
     }
 
@@ -26,7 +26,7 @@ 
      * @return static[] Two instances at indices `0` and `1`.
      * @throws SocketError
      */
-    public static function newUnixPair (...$extra) {
+    public static function newUnixPair(...$extra) {
         if (!@socket_create_pair(AF_UNIX, SOCK_STREAM, 0, $fd)) {
             throw new SocketError; // reliable errno
         }
@@ -45,7 +45,7 @@ 
      * @return string
      * @throws SocketError The partially read data is attached.
      */
-    public function read (int $length): string {
+    public function read(int $length): string {
         try {
             $data = '';
             do {
@@ -72,11 +72,11 @@ 
      * @return string
      * @throws SocketError
      */
-    public function recv (int $maxLength, int $msgFlags = 0): string {
+    public function recv(int $maxLength, int $msgFlags = 0): string {
         if (false === @socket_recv($this->resource, $data, $maxLength, $msgFlags)) {
             throw new SocketError($this->resource, SOCKET_EINVAL);
         }
-        return (string)$data; // cast needed, will be null if 0 bytes are read.
+        return (string) $data; // cast needed, will be null if 0 bytes are read.
     }
 
     /**
@@ -86,7 +86,7 @@ 
      * @return string
      * @throws SocketError
      */
-    public function recvAll (int $msgFlags = 0): string {
+    public function recvAll(int $msgFlags = 0): string {
         $msgFlags = ($msgFlags & ~MSG_WAITALL) | MSG_DONTWAIT;
         $length = $this->getOption(SO_RCVBUF);
         try {

src/AbstractSocket.php

Braces +2 added lines, -4 removed lines

@@ -52,11 +52,9 @@
     public function __construct ($resource) {
         if (!is_resource($resource) or get_resource_type($resource) !== 'Socket') {
             throw new InvalidArgumentException('Expected an open socket resource.', SOCKET_EBADF);
-        }
-        elseif (socket_get_option($resource, SOL_SOCKET, SO_TYPE) !== static::getType()) {
+        } elseif (socket_get_option($resource, SOL_SOCKET, SO_TYPE) !== static::getType()) {
             throw new InvalidArgumentException('Invalid socket type for ' . static::class, SOCKET_ESOCKTNOSUPPORT);
-        }
-        elseif ($errno = SocketError::getLast($resource)) {
+        } elseif ($errno = SocketError::getLast($resource)) {
             // "File descriptor in bad state"
             throw new SocketError(SOCKET_EBADFD, 0, new SocketError($errno));
         }

Doc Comments +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
      * @link https://php.net/socket_get_option
      *
      * @param int $option `SO_*` option constant.
-     * @return mixed The option's value. This is never `false`.
+     * @return integer The option's value. This is never `false`.
      * @throws SocketError
      */
     public function getOption (int $option) {
@@ -222,7 +222,7 @@ 
      * @see await()
      *
      * @param int $channel `SocketInterface` channel constant.
-     * @param float|null $timeout Maximum seconds to block. `NULL` blocks forever. Defaults to a poll.
+     * @param integer $timeout Maximum seconds to block. `NULL` blocks forever. Defaults to a poll.
      * @return bool
      * @throws SocketError
      */

Spacing +29 added lines, -29 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return int
      */
-    abstract public static function getType (): int;
+    abstract public static function getType(): int;
 
     /**
      * The underlying PHP resource.
@@ -33,7 +33,7 @@ 
      * @return static
      * @throws SocketError
      */
-    public static function create (int $domain = AF_INET, ...$extra) {
+    public static function create(int $domain = AF_INET, ...$extra) {
         if (!$resource = @socket_create($domain, static::getType(), 0)) { // auto-protocol
             throw new SocketError; // reliable errno
         }
@@ -49,12 +49,12 @@ 
      * @throws InvalidArgumentException Not a socket resource, or the socket is of the wrong type.
      * @throws SocketError Slippage of an existing error on the resource.
      */
-    public function __construct ($resource) {
+    public function __construct($resource) {
         if (!is_resource($resource) or get_resource_type($resource) !== 'Socket') {
             throw new InvalidArgumentException('Expected an open socket resource.', SOCKET_EBADF);
         }
         elseif (socket_get_option($resource, SOL_SOCKET, SO_TYPE) !== static::getType()) {
-            throw new InvalidArgumentException('Invalid socket type for ' . static::class, SOCKET_ESOCKTNOSUPPORT);
+            throw new InvalidArgumentException('Invalid socket type for '.static::class, SOCKET_ESOCKTNOSUPPORT);
         }
         elseif ($errno = SocketError::getLast($resource)) {
             // "File descriptor in bad state"
@@ -68,7 +68,7 @@ 
      *
      * @see close()
      */
-    public function __destruct () {
+    public function __destruct() {
         if ($this->isOpen()) {
             $this->close();
         }
@@ -85,7 +85,7 @@ 
      * @return $this
      * @throws SocketError
      */
-    public function await (int $channel) {
+    public function await(int $channel) {
         $rwe = [$channel => [$this->resource]];
         if (!@socket_select($rwe[0], $rwe[1], $rwe[2], null)) {
             throw new SocketError($this->resource);
@@ -98,7 +98,7 @@ 
      *
      * @return $this
      */
-    final public function awaitOutOfBand () {
+    final public function awaitOutOfBand() {
         return $this->await(self::CH_EXCEPT);
     }
 
@@ -107,7 +107,7 @@ 
      *
      * @return $this
      */
-    final public function awaitReadable () {
+    final public function awaitReadable() {
         return $this->await(self::CH_READ);
     }
 
@@ -116,7 +116,7 @@ 
      *
      * @return $this
      */
-    final public function awaitWritable () {
+    final public function awaitWritable() {
         return $this->await(self::CH_WRITE);
     }
 
@@ -127,7 +127,7 @@ 
      *
      * @return $this
      */
-    public function close () {
+    public function close() {
         socket_close($this->resource); // never errors
         return $this;
     }
@@ -137,15 +137,15 @@ 
      *
      * @return int
      */
-    final public function getDomain (): int {
+    final public function getDomain(): int {
         return $this->getOption(39); // SO_DOMAIN is not exposed by PHP
     }
 
     /**
      * @inheritDoc
      */
-    final public function getId (): int {
-        return (int)$this->resource;
+    final public function getId(): int {
+        return (int) $this->resource;
     }
 
     /**
@@ -157,7 +157,7 @@ 
      * @return mixed The option's value. This is never `false`.
      * @throws SocketError
      */
-    public function getOption (int $option) {
+    public function getOption(int $option) {
         $value = @socket_get_option($this->resource, SOL_SOCKET, $option);
         if ($value === false) {
             throw new SocketError($this->resource, SOCKET_EINVAL);
@@ -168,7 +168,7 @@ 
     /**
      * @inheritDoc
      */
-    final public function getResource () {
+    final public function getResource() {
         return $this->resource;
     }
 
@@ -180,7 +180,7 @@ 
      * @return array `[ 0 => address, 1 => port ]`
      * @throws SocketError
      */
-    public function getSockName (): array {
+    public function getSockName(): array {
         if (!@socket_getsockname($this->resource, $addr, $port)) {
             throw new SocketError($this->resource, SOCKET_EOPNOTSUPP);
         }
@@ -190,7 +190,7 @@ 
     /**
      * @inheritDoc
      */
-    public function isOpen (): bool {
+    public function isOpen(): bool {
         return is_resource($this->resource);
     }
 
@@ -201,7 +201,7 @@ 
      *
      * @return bool
      */
-    final public function isOutOfBand (): bool {
+    final public function isOutOfBand(): bool {
         return $this->isReady(self::CH_EXCEPT);
     }
 
@@ -212,7 +212,7 @@ 
      *
      * @return bool
      */
-    final public function isReadable (): bool {
+    final public function isReadable(): bool {
         return $this->isReady(self::CH_READ);
     }
 
@@ -226,15 +226,15 @@ 
      * @return bool
      * @throws SocketError
      */
-    public function isReady (int $channel, ?float $timeout = 0): bool {
+    public function isReady(int $channel, ?float $timeout = 0): bool {
         $rwe = [$channel => [$this->resource]];
         // core casts non-null timeout to int.
         // usec is ignored if timeout is null.
-        $usec = (int)(fmod($timeout, 1) * 1000000);
+        $usec = (int) (fmod($timeout, 1) * 1000000);
         if (false === $count = @socket_select($rwe[0], $rwe[1], $rwe[2], $timeout, $usec)) {
             throw new SocketError($this->resource);
         }
-        return (bool)$count;
+        return (bool) $count;
     }
 
     /**
@@ -244,7 +244,7 @@ 
      *
      * @return bool
      */
-    final public function isWritable (): bool {
+    final public function isWritable(): bool {
         return $this->isReady(self::CH_WRITE);
     }
 
@@ -266,7 +266,7 @@ 
      * @return $this
      * @throws SocketError
      */
-    public function setBlocking (bool $blocking) {
+    public function setBlocking(bool $blocking) {
         if ($blocking ? @socket_set_block($this->resource) : @socket_set_nonblock($this->resource)) {
             return $this;
         }
@@ -283,7 +283,7 @@ 
      * @return $this
      * @throws SocketError
      */
-    public function setOption (int $option, $value) {
+    public function setOption(int $option, $value) {
         if (!@socket_set_option($this->resource, SOL_SOCKET, $option, $value)) {
             throw new SocketError($this->resource, SOCKET_EINVAL);
         }
@@ -296,10 +296,10 @@ 
      * @param float $timeout Zero means "no timeout" (block forever).
      * @return $this
      */
-    public function setTimeout (float $timeout) {
+    public function setTimeout(float $timeout) {
         $tv = [
-            'sec' => (int)$timeout,
-            'usec' => (int)(fmod($timeout, 1) * 1000000)
+            'sec' => (int) $timeout,
+            'usec' => (int) (fmod($timeout, 1) * 1000000)
         ];
         $this->setOption(SO_RCVTIMEO, $tv);
         $this->setOption(SO_SNDTIMEO, $tv);
@@ -329,7 +329,7 @@ 
      * @return $this
      * @throws SocketError
      */
-    public function shutdown (int $channel) {
+    public function shutdown(int $channel) {
         if (!@socket_shutdown($this->resource, $channel)) {
             throw new SocketError($this->resource); // reliable errno
         }

src/WebSocket/FrameHandler.php

Spacing +26 added lines, -26 removed lines

@@ -53,21 +53,21 @@ 
      */
     protected $text = '';
 
-    public function __construct (WebSocketClient $client) {
+    public function __construct(WebSocketClient $client) {
         $this->client = $client;
     }
 
     /**
      * @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;
     }
 
@@ -79,7 +79,7 @@ 
      * @param Frame $binary
      * @throws WebSocketError
      */
-    protected function onBinary (Frame $binary): void {
+    protected function onBinary(Frame $binary): void {
         $this->binary .= $binary->getPayload();
         if ($binary->isFinal()) {
             $message = $this->binary;
@@ -99,7 +99,7 @@ 
      *
      * @param Frame $close
      */
-    protected function onClose (Frame $close): void {
+    protected function onClose(Frame $close): void {
         $this->client->close($close->getCloseCode());
     }
 
@@ -109,7 +109,7 @@ 
      * @param Frame $frame
      * @throws WebSocketError
      */
-    protected function onContinue (Frame $frame): void {
+    protected function onContinue(Frame $frame): void {
         switch ($this->continue) {
             case Frame::OP_TEXT:
                 $this->onText($frame);
@@ -135,7 +135,7 @@ 
      *
      * @param Frame $control
      */
-    protected function onControl (Frame $control): void {
+    protected function onControl(Frame $control): void {
         if ($control->isClose()) {
             $this->onClose($control);
         }
@@ -152,7 +152,7 @@ 
      *
      * @param Frame $data
      */
-    protected function onData (Frame $data): void {
+    protected function onData(Frame $data): void {
         if (!$data->isFinal()) {
             $this->onData_SetContinue($data);
         }
@@ -164,7 +164,7 @@ 
         }
     }
 
-    protected function onData_SetContinue (Frame $data): void {
+    protected function onData_SetContinue(Frame $data): void {
         if ($this->continue) {
             $existing = Frame::NAMES[$this->continue];
             throw new WebSocketError(
@@ -183,7 +183,7 @@ 
      *
      * @param Frame $frame
      */
-    public function onFrame (Frame $frame): void {
+    public function onFrame(Frame $frame): void {
         $this->onFrame_CheckRsv($frame);
         $this->onFrame_CheckLength($frame);
         if ($frame->isControl()) {
@@ -200,7 +200,7 @@ 
     /**
      * @param Frame $frame
      */
-    protected function onFrame_CheckLength (Frame $frame): void {
+    protected function onFrame_CheckLength(Frame $frame): void {
         if ($frame->isData()) {
             if ($frame->isBinary()) {
                 $length = strlen($this->binary);
@@ -224,7 +224,7 @@ 
      * @param Frame $frame
      * @throws WebSocketError
      */
-    protected function onFrame_CheckRsv (Frame $frame): void {
+    protected function onFrame_CheckRsv(Frame $frame): void {
         if ($badRsv = $frame->getRsv() & ~$this->client->getHandshake()->getRsv()) {
             $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}");
@@ -238,7 +238,7 @@ 
      *
      * @param Frame $ping
      */
-    protected function onPing (Frame $ping): void {
+    protected function onPing(Frame $ping): void {
         $this->writePong($ping->getPayload());
     }
 
@@ -249,7 +249,7 @@ 
      *
      * @param Frame $pong
      */
-    protected function onPong (Frame $pong): void {
+    protected function onPong(Frame $pong): void {
         // stub
     }
 
@@ -261,7 +261,7 @@ 
      * @param Frame $text
      * @throws WebSocketError
      */
-    protected function onText (Frame $text): void {
+    protected function onText(Frame $text): void {
         $this->text .= $text->getPayload();
         if ($text->isFinal()) {
             $message = $this->text;
@@ -274,7 +274,7 @@ 
      * @param int $bytes
      * @return $this
      */
-    public function setFragmentSize (int $bytes) {
+    public function setFragmentSize(int $bytes) {
         $this->fragmentSize = $bytes;
         return $this;
     }
@@ -283,7 +283,7 @@ 
      * @param int $bytes
      * @return $this
      */
-    public function setMaxLength (int $bytes) {
+    public function setMaxLength(int $bytes) {
         $this->maxLength = $bytes;
         return $this;
     }
@@ -294,7 +294,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 {
@@ -310,7 +310,7 @@ 
     /**
      * @param string $payload
      */
-    public function writeBinary (string $payload): void {
+    public function writeBinary(string $payload): void {
         $this->write(Frame::OP_BINARY, $payload);
     }
 
@@ -318,8 +318,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);
     }
 
     /**
@@ -329,7 +329,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 WebSocketError(
                 Frame::CLOSE_INTERNAL_ERROR,
@@ -349,27 +349,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 +8 added lines, -16 removed lines

@@ -138,11 +138,9 @@ 
     protected function onControl (Frame $control): void {
         if ($control->isClose()) {
             $this->onClose($control);
-        }
-        elseif ($control->isPing()) {
+        } elseif ($control->isPing()) {
             $this->onPing($control);
-        }
-        elseif ($control->isPong()) {
+        } elseif ($control->isPong()) {
             $this->onPong($control);
         }
     }
@@ -158,8 +156,7 @@ 
         }
         if ($data->isText()) {
             $this->onText($data);
-        }
-        elseif ($data->isBinary()) {
+        } elseif ($data->isBinary()) {
             $this->onBinary($data);
         }
     }
@@ -188,11 +185,9 @@ 
         $this->onFrame_CheckLength($frame);
         if ($frame->isControl()) {
             $this->onControl($frame);
-        }
-        elseif ($frame->isContinue()) {
+        } elseif ($frame->isContinue()) {
             $this->onContinue($frame);
-        }
-        else {
+        } else {
             $this->onData($frame);
         }
     }
@@ -204,8 +199,7 @@ 
         if ($frame->isData()) {
             if ($frame->isBinary()) {
                 $length = strlen($this->binary);
-            }
-            else {
+            } else {
                 $length = strlen($this->text);
             }
             if ($length + $frame->getLength() > $this->maxLength) {
@@ -341,12 +335,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);

src/WebSocket/WebSocketServer.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,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;
@@ -38,7 +38,7 @@ 
     /**
      * @return WebSocketClient
      */
-    public function accept () {
+    public function accept() {
         /** @var WebSocketClient $client */
         $client = parent::accept();
         $this->clients[$client->getId()] = $client;
@@ -52,7 +52,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);
@@ -63,7 +63,7 @@ 
     /**
      * @param string $payload
      */
-    public function broadcastBinary (string $payload) {
+    public function broadcastBinary(string $payload) {
         $this->broadcast(Frame::OP_BINARY, $payload);
     }
 
@@ -72,7 +72,7 @@ 
      *
      * @param string $payload
      */
-    public function broadcastPing (string $payload = '') {
+    public function broadcastPing(string $payload = '') {
         $this->broadcast(Frame::OP_PING, $payload);
     }
 
@@ -81,7 +81,7 @@ 
      *
      * @param string $text
      */
-    public function broadcastText (string $text) {
+    public function broadcastText(string $text) {
         $this->broadcast(Frame::OP_TEXT, $text);
     }
 
@@ -92,7 +92,7 @@ 
      * @param string $reason
      * @return StreamServer
      */
-    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);
@@ -110,14 +110,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;
     }
 
@@ -125,7 +125,7 @@ 
      * @param resource $resource
      * @return WebSocketClient
      */
-    protected function newClient ($resource) {
+    protected function newClient($resource) {
         return new WebSocketClient($resource, $this);
     }
 
@@ -134,13 +134,13 @@ 
      *
      * @inheritDoc
      */
-    final public function onOutOfBand (): void {
+    final public function onOutOfBand(): void {
     }
 
     /**
      * @inheritDoc
      */
-    public function onReadable (): void {
+    public function onReadable(): void {
         $this->accept();
     }
 
@@ -149,7 +149,7 @@ 
      *
      * @param WebSocketClient $client
      */
-    public function remove (WebSocketClient $client) {
+    public function remove(WebSocketClient $client) {
         unset($this->clients[$client->getId()]);
         $this->reactor->remove($client);
     }

src/WebSocket/WebSocketClient.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
      * @param $resource
      * @param WebSocketServer $server
      */
-    public function __construct ($resource, WebSocketServer $server) {
+    public function __construct($resource, WebSocketServer $server) {
         parent::__construct($resource);
         $this->server = $server;
     }
@@ -74,7 +74,7 @@ 
      * @param string $reason
      * @return StreamClient|void
      */
-    public function close (int $code = null, string $reason = '') {
+    public function close(int $code = null, string $reason = '') {
         try {
             if ($code >= 1000 and $this->state === self::STATE_OK) {
                 $this->getFrameHandler()->writeClose($code, $reason);
@@ -91,49 +91,49 @@ 
     /**
      * @return FrameHandler
      */
-    public function getFrameHandler () {
+    public function getFrameHandler() {
         return $this->frameHandler ?? $this->frameHandler = new FrameHandler($this);
     }
 
     /**
      * @return FrameReader
      */
-    public function getFrameReader () {
+    public function getFrameReader() {
         return $this->frameReader ?? $this->frameReader = new FrameReader($this);
     }
 
     /**
      * @return HandShake
      */
-    public function getHandshake () {
+    public function getHandshake() {
         return $this->handshake ?? $this->handshake = new HandShake($this);
     }
 
     /**
      * @return MessageHandler
      */
-    public function getMessageHandler () {
+    public function getMessageHandler() {
         return $this->messageHandler ?? $this->messageHandler = new MessageHandler($this);
     }
 
     /**
      * @return WebSocketServer
      */
-    public function getServer () {
+    public function getServer() {
         return $this->server;
     }
 
     /**
      * @return int
      */
-    public function getState (): int {
+    public function getState(): int {
         return $this->state;
     }
 
     /**
      * @return bool
      */
-    final public function isOk (): bool {
+    final public function isOk(): bool {
         return $this->state === self::STATE_OK;
     }
 
@@ -142,7 +142,7 @@ 
      *
      * The RFC says the connection must be dropped if any unsupported activity occurs.
      */
-    final public function onOutOfBand (): void {
+    final public function onOutOfBand(): void {
         $this->close(Frame::CLOSE_PROTOCOL_ERROR, "Received out-of-band data.");
     }
 
@@ -151,7 +151,7 @@ 
      *
      * @throws Exception
      */
-    public function onReadable (): void {
+    public function onReadable(): void {
         if (!strlen($this->recv(1, MSG_PEEK))) { // peer has shut down writing, or closed.
             $this->close();
             return;
@@ -187,7 +187,7 @@ 
     /**
      * Stub.
      */
-    protected function onStateOk (): void {
+    protected function onStateOk(): void {
 
     }
 
@@ -195,7 +195,7 @@ 
      * @param FrameHandler $frameHandler
      * @return $this
      */
-    public function setFrameHandler (FrameHandler $frameHandler) {
+    public function setFrameHandler(FrameHandler $frameHandler) {
         $this->frameHandler = $frameHandler;
         return $this;
     }
@@ -204,7 +204,7 @@ 
      * @param FrameReader $frameReader
      * @return $this
      */
-    public function setFrameReader (FrameReader $frameReader) {
+    public function setFrameReader(FrameReader $frameReader) {
         $this->frameReader = $frameReader;
         return $this;
     }
@@ -213,7 +213,7 @@ 
      * @param MessageHandler $messageHandler
      * @return $this
      */
-    public function setMessageHandler (MessageHandler $messageHandler) {
+    public function setMessageHandler(MessageHandler $messageHandler) {
         $this->messageHandler = $messageHandler;
         return $this;
     }

Braces +3 added lines, -6 removed lines

@@ -80,8 +80,7 @@ 
                 $this->getFrameHandler()->writeClose($code, $reason);
                 $this->shutdown(self::CH_WRITE);
             }
-        }
-        finally {
+        } finally {
             $this->state = self::STATE_CLOSE;
             $this->server->remove($this);
             parent::close();
@@ -173,12 +172,10 @@ 
                 case self::STATE_CLOSE:
                     return;
             }
-        }
-        catch (WebSocketError $e) {
+        } catch (WebSocketError $e) {
             $this->close($e->getCode(), $e->getMessage());
             throw $e;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->close(Frame::CLOSE_INTERNAL_ERROR);
             throw $e;
         }

src/WebSocket/MessageHandler.php

Spacing +4 added lines, -4 removed lines

@@ -12,14 +12,14 @@ 
     /**
      * @param WebSocketClient $client
      */
-    public function __construct (WebSocketClient $client) {
+    public function __construct(WebSocketClient $client) {
         $this->client = $client;
     }
 
     /**
      * @param string $binary
      */
-    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.");
     }
@@ -27,7 +27,7 @@ 
     /**
      * @param string $text
      */
-    public function onText (string $text): void {
+    public function onText(string $text): void {
         $this->onText_CheckUtf8($text);
         throw new WebSocketError(Frame::CLOSE_UNHANDLED_DATA, "I don't handle text.");
     }
@@ -37,7 +37,7 @@ 
      *
      * @param string $text
      */
-    protected function onText_CheckUtf8 (string $text): void {
+    protected function onText_CheckUtf8(string $text): void {
         if (!mb_detect_encoding($text, 'UTF-8', true)) {
             throw new WebSocketError(Frame::CLOSE_BAD_DATA, "Received TEXT is not UTF-8.");
         }