Coverage

Author: sirn-se

.github/workflows/acceptance.yml

@@ -48,21 +48,6 @@ jobs:
     - name: Test
       run: make test
 
-  test-8-1:
-    runs-on: ubuntu-latest
-    name: Test PHP 8.1
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up PHP 8.1
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '8.1'
-    - name: Composer
-      run: make install
-    - name: Test
-      run: make test
-
   cs-check:
     runs-on: ubuntu-latest
     name: Code standard

lib/Client.php

@@ -71,71 +71,6 @@ public function __toString(): string
     }
 
 
-    /* ---------- Client operations -------------------------------------------------- */
-
-    /**
-     * Set client to listen to incoming requests.
-     * @param Closure $callback A callback function that will be called when client receives message.
-     *   function (Message $message, Connection $connection = null)
-     *   If callback function returns non-null value, the listener will halt and return that value.
-     *   Otherwise it will continue listening and propagating messages.
-     * @return mixed Returns any non-null value returned by callback function.
-     */
-    public function listen(Closure $callback)
-    {
-        $this->listen = true;
-        while ($this->listen) {
-            // Connect
-            if (!$this->isConnected()) {
-                $this->connect();
-            }
-
-            // Handle incoming
-            $read = $this->connection->getStream();
-            $write = [];
-            $except = [];
-            if (stream_select($read, $write, $except, 0)) {
-                foreach ($read as $stream) {
-                    try {
-                        $result = null;
-                        $peer = stream_socket_get_name($stream, true);
-                        if (empty($peer)) {
-                            $this->logger->warning("[client] Got detached stream '{$peer}'");
-                            continue;
-                        }
-                        $this->logger->debug("[client] Handling {$peer}");
-                        $message = $this->connection->pullMessage();
-                        if (!$this->connection->isConnected()) {
-                            $this->connection = null;
-                        }
-                        // Trigger callback according to filter
-                        $opcode = $message->getOpcode();
-                        if (in_array($opcode, $this->options['filter'])) {
-                            $this->last_opcode = $opcode;
-                            $result = $callback($message, $this->connection);
-                        }
-                        // If callback returns not null, exit loop and return that value
-                        if (!is_null($result)) {
-                            return $result;
-                        }
-                    } catch (Throwable $e) {
-                        $this->logger->error("[client] Error occured on {$peer}; {$e->getMessage()}");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Tell client to stop listening to incoming requests.
-     * Active connections are still available when restarting listening.
-     */
-    public function stop(): void
-    {
-        $this->listen = false;
-    }
-
-
     /* ---------- Client option functions -------------------------------------------- */
 
     /**

lib/Server.php

@@ -16,7 +16,7 @@
 
 class Server implements LoggerAwareInterface
 {
-    use LoggerAwareTrait; // provides setLogger(LoggerInterface $logger)
+    use LoggerAwareTrait; // Provides setLogger(LoggerInterface $logger)
     use OpcodeTrait;
 
     // Default options
@@ -29,10 +29,10 @@ class Server implements LoggerAwareInterface
       'timeout'       => null,
     ];
 
-    private $port;
-    private $listening;
-    private $request;
-    private $request_path;
+    protected $port;
+    protected $listening;
+    protected $request;
+    protected $request_path;
     private $connections = [];
     private $options = [];
     private $listen = false;

tests/ClientTest.php

@@ -475,4 +475,16 @@ public function testConvenicanceMethods(): void
         $this->assertEquals('127.0.0.1:8000', $client->getPier());
         $this->assertEquals('WebSocket\Client(127.0.0.1:12345)', "{$client}");
     }
+
+    public function testUnconnectedClient(): void
+    {
+        $client = new Client('ws://localhost:8000/my/mock/path');
+        $this->assertFalse($client->isConnected());
+        $client->setTimeout(30);
+        $client->close();
+        $this->assertFalse($client->isConnected());
+        $this->assertNull($client->getName());
+        $this->assertNull($client->getPeer());
+        $this->assertNull($client->getCloseStatus());
+    }
 }

tests/README.md

@@ -14,8 +14,7 @@ make test
 
 ## Continuous integration
 
-[Travis](https://travis-ci.org/Textalk/websocket-php) is run on PHP versions
-`5.4`, `5.5`, `5.6`, `7.0`, `7.1`, `7.2`, `7.3` and `7.4`.
+GitHub Actions are run on PHP versions 7.3, 7.4, 8.0 and 8.1.
 
 Code coverage by [Coveralls](https://coveralls.io/github/Textalk/websocket-php).
 

tests/ServerTest.php

@@ -445,4 +445,18 @@ public function testConvenicanceMethods(): void
         $this->assertEquals('WebSocket\Server(127.0.0.1:12345)', "{$server}");
         $this->assertTrue(MockSocket::isEmpty());
     }
+
+    public function testUnconnectedServer(): void
+    {
+        MockSocket::initialize('server.construct', $this);
+        $server = new Server();
+        $this->assertFalse($server->isConnected());
+        $server->setTimeout(30);
+        $server->close();
+        $this->assertFalse($server->isConnected());
+        $this->assertNull($server->getName());
+        $this->assertNull($server->getPeer());
+        $this->assertNull($server->getCloseStatus());
+        $this->assertTrue(MockSocket::isEmpty());
+    }
 }