#55: Fix $isMasked, Add more comments + Fix tests with phpunit >= 9.4

.gitignore

@@ -1,4 +1,5 @@
 .idea/
 vendor/
 tests/tests.log
-composer.lock
+composer.lock
+.phpunit.result.cache

src/Components/WscMain.php

@@ -49,6 +49,9 @@ class WscMain implements WscCommonsContract
      */
     private ?string $hugePayload;
 
+    /**
+     * @var array|int[]
+     */
     private static array $opcodes = [
         CommonsContract::EVENT_TYPE_CONTINUATION => 0,
         CommonsContract::EVENT_TYPE_TEXT => 1,
@@ -58,7 +61,14 @@ class WscMain implements WscCommonsContract
         CommonsContract::EVENT_TYPE_PONG => 10,
     ];
 
+    /**
+     * @var string
+     */
     protected string $socketUrl = '';
+
+    /**
+     * @var ClientConfig
+     */
     protected ClientConfig $config;
 
     /**

src/Components/WssMain.php

@@ -16,6 +16,9 @@
  */
 class WssMain implements CommonsContract
 {
+    /**
+     * @var bool
+     */
     private bool $isPcntlLoaded = false;
 
     /**
@@ -76,18 +79,13 @@ protected function decode(string $data)
             return false;
         }
 
-        if ($isMasked) {
-            for ($i = $payloadOffset; $i < $dataLength; $i++) {
-                $j = $i - $payloadOffset;
-                if (isset($data[$i])) {
-                    $unmaskedPayload .= $data[$i] ^ $mask[$j % 4];
-                }
+        for ($i = $payloadOffset; $i < $dataLength; $i++) {
+            $j = $i - $payloadOffset;
+            if (isset($data[$i])) {
+                $unmaskedPayload .= $data[$i] ^ $mask[$j % 4];
             }
-            $decodedData['payload'] = $unmaskedPayload;
-        } else {
-            $payloadOffset -= 4;
-            $decodedData['payload'] = substr($data, $payloadOffset);
         }
+        $decodedData['payload'] = $unmaskedPayload;
 
         return $decodedData;
     }

src/Contracts/WebSocket.php

@@ -11,7 +11,10 @@
  */
 abstract class WebSocket implements WebSocketContract, MessageContract
 {
-    public $pathParams = [];
+    /**
+     * @var array
+     */
+    public array $pathParams = [];
 
     /**
      * You may want to implement these methods to bring ping/pong events

tests/ServerHandler.php

@@ -17,10 +17,20 @@ class ServerHandler extends WebSocket
      *  Otherwise leave $pathParams as an empty array
      */
 
-    public $pathParams = [':entity', ':context', ':token'];
-    private $clients = [];
+    /**
+     * @var array|string[]
+     */
+    public array $pathParams = [':entity', ':context', ':token'];
 
-    private $log;
+    /**
+     * @var array
+     */
+    private array $clients = [];
+
+    /**
+     * @var Logger
+     */
+    private Logger $log;
 
     /**
      * ServerHandler constructor.

tests/WebSocketClientTest.php

@@ -16,7 +16,7 @@ class WebSocketClientTest extends TestCase
 
     private $url;
 
-    public function setUp()/* The :void return type declaration that should be here would cause a BC issue */
+    public function setUp(): void
     {
         $this->url = self::WS_SCHEME . self::WS_HOST . self::WS_PORT . self::WS_URI;
     }