hfw / socket

src/WebSocket/Handshake.php

Spacing +7 added lines, -7 removed lines

@@ -45,21 +45,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;
     }
 
@@ -70,7 +70,7 @@ 
      * @throws WebSocketError
      * @throws Throwable
      */
-    public function onReadable (): bool {
+    public function onReadable(): bool {
         // read into the buffer
         $this->buffer .= $bytes = $this->client->recvAll();
 
@@ -128,8 +128,8 @@ 
     /**
      * Sends the connection upgrade headers.
      */
-    protected function upgrade (): void {
-        $key = base64_encode(sha1(current($this->headers['sec-websocket-key']) . self::RFC_GUID, true));
+    protected function upgrade(): void {
+        $key = base64_encode(sha1(current($this->headers['sec-websocket-key']).self::RFC_GUID, true));
         $this->client->write(implode("\r\n", [
             "HTTP/1.1 101 Switching Protocols",
             "Connection: Upgrade",
@@ -143,7 +143,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 +2 added lines, -4 removed lines

@@ -107,12 +107,10 @@
             }
             $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;
         }