hfw / socket

src/WebSocket/FrameHandler.php

Spacing +27 added lines, -27 removed lines

@@ -51,21 +51,21 @@ 
     /**
      * @param WebSocketClient $client
      */
-    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;
     }
 
@@ -75,7 +75,7 @@ 
      * @param Frame $binary
      * @throws WebSocketError
      */
-    protected function onBinary (Frame $binary): void {
+    protected function onBinary(Frame $binary): void {
         $this->buffer .= $binary->getPayload();
         if ($binary->isFinal()) {
             $message = $this->buffer;
@@ -95,7 +95,7 @@ 
      *
      * @param Frame $close
      */
-    protected function onClose (Frame $close): void {
+    protected function onClose(Frame $close): void {
         $this->client->close($close->getCloseCode());
     }
 
@@ -105,7 +105,7 @@ 
      * @param Frame $fragment
      * @throws WebSocketError
      */
-    protected function onContinue (Frame $fragment): void {
+    protected function onContinue(Frame $fragment): void {
         if (!$this->continue) {
             throw new WebSocketError(
                 Frame::CLOSE_PROTOCOL_ERROR,
@@ -137,7 +137,7 @@ 
      *
      * @param Frame $control
      */
-    protected function onControl (Frame $control): void {
+    protected function onControl(Frame $control): void {
         if ($control->isClose()) {
             $this->onClose($control);
         }
@@ -154,7 +154,7 @@ 
      *
      * @param Frame $data
      */
-    protected function onData (Frame $data): void {
+    protected function onData(Frame $data): void {
         $this->onData_SetContinue($data);
         if ($data->isText()) {
             $this->onText($data);
@@ -168,11 +168,11 @@ 
      * @param Frame $data
      * @throws WebSocketError
      */
-    protected function onData_SetContinue (Frame $data): void {
+    protected function onData_SetContinue(Frame $data): void {
         if ($this->continue) {
             throw new WebSocketError(
                 Frame::CLOSE_PROTOCOL_ERROR,
-                "Received interleaved {$data->getName()} against existing " . Frame::NAMES[$this->continue],
+                "Received interleaved {$data->getName()} against existing ".Frame::NAMES[$this->continue],
                 $data
             );
         }
@@ -188,7 +188,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()) {
@@ -206,7 +206,7 @@ 
      * @param Frame $frame
      * @throws WebSocketError
      */
-    protected function onFrame_CheckLength (Frame $frame): void {
+    protected function onFrame_CheckLength(Frame $frame): void {
         if ($frame->isData()) {
             $length = strlen($this->buffer);
             if ($length + $frame->getLength() > $this->maxLength) {
@@ -225,7 +225,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(
@@ -243,7 +243,7 @@ 
      *
      * @param Frame $ping
      */
-    protected function onPing (Frame $ping): void {
+    protected function onPing(Frame $ping): void {
         $this->writePong($ping->getPayload());
     }
 
@@ -254,7 +254,7 @@ 
      *
      * @param Frame $pong
      */
-    protected function onPong (Frame $pong): void {
+    protected function onPong(Frame $pong): void {
         // stub
     }
 
@@ -264,7 +264,7 @@ 
      * @param Frame $text
      * @throws WebSocketError
      */
-    protected function onText (Frame $text): void {
+    protected function onText(Frame $text): void {
         $this->buffer .= $text->getPayload();
         if ($text->isFinal()) {
             $message = $this->buffer;
@@ -277,7 +277,7 @@ 
      * @param int $bytes
      * @return $this
      */
-    public function setFragmentSize (int $bytes) {
+    public function setFragmentSize(int $bytes) {
         $this->fragmentSize = $bytes;
         return $this;
     }
@@ -286,7 +286,7 @@ 
      * @param int $bytes
      * @return $this
      */
-    public function setMaxLength (int $bytes) {
+    public function setMaxLength(int $bytes) {
         $this->maxLength = $bytes;
         return $this;
     }
@@ -297,7 +297,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 {
@@ -313,7 +313,7 @@ 
     /**
      * @param string $payload
      */
-    public function writeBinary (string $payload): void {
+    public function writeBinary(string $payload): void {
         $this->write(Frame::OP_BINARY, $payload);
     }
 
@@ -321,8 +321,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);
     }
 
     /**
@@ -332,7 +332,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}");
         }
@@ -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

src/Reactor.php

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) {
+    public function onError(int $channel, $socket, Throwable $error) {
         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;
     }

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