Add PHP >= 8 support + updated tests and workflow.

.github/workflows/ci.yml

@@ -14,39 +14,61 @@ jobs:
     runs-on: "ubuntu-20.04"
 
     strategy:
+      fail-fast: false
       matrix:
-        php-version:
-          - "5.4"
-          - "5.5"
-          - "5.6"
-          - "7.0"
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-        dependencies:
-          - "highest"
         include:
-          - dependencies: "lowest"
-            php-version: "5.4"
+          - php: 5.4
+            phpunit: phpunit/phpunit ^4
+            can-fail: false
+          - php: 5.5
+            phpunit: phpunit/phpunit ^4
+            can-fail: false
+          - php: 5.6
+            phpunit: phpunit/phpunit ^5
+            can-fail: false
+          - php: 7.0
+            phpunit: phpunit/phpunit ^5
+            can-fail: false
+          - php: 7.1
+            phpunit: phpunit/phpunit ^5
+            can-fail: false
+          - php: 7.2
+            phpunit: phpunit/phpunit ^5
+            can-fail: false
+          - php: 7.3
+            phpunit: phpunit/phpunit ^5
+            can-fail: false
+          - php: 7.4
+            phpunit: phpunit/phpunit ^5
+            can-fail: false
+          - php: 8.0
+            phpunit: phpunit/phpunit ^9
+            can-fail: false
+          - php: 8.1
+            phpunit: phpunit/phpunit ^9
+            can-fail: false
+          - php: 8.2
+            phpunit: phpunit/phpunit ^9
+            can-fail: false
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
         with:
           fetch-depth: 2
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ matrix.php }}"
           coverage: "none"
           ini-values: "zend.assertions=1"
 
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          dependency-versions: "${{ matrix.dependencies }}"
+      - name: "Update PHPUnit version"
+        run: composer require --dev --with-all-dependencies --no-install ${{ matrix.phpunit }}
+
+      - name: "Install dependencies"
+        run: composer update
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit"

.gitignore

@@ -2,4 +2,5 @@ phpunit.xml
 reports
 sandbox
 vendor
-composer.lock
+composer.lock
+.idea/

composer.json

@@ -35,6 +35,6 @@
       , "symfony/routing": "^2.6|^3.0|^4.0|^5.0|^6.0"
     }
   , "require-dev": {
-        "phpunit/phpunit": "~4.8"
+        "phpunit/phpunit": "^9"
     }
 }

phpunit.xml.dist

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     forceCoversAnnotation="true"
-    mapTestClassNameToCoveredClassName="true"
     bootstrap="tests/bootstrap.php"
     colors="true"
     backupGlobals="false"
     backupStaticAttributes="false"
-    syntaxCheck="false"
     stopOnError="false"
 >
 
@@ -15,16 +13,4 @@
             <directory>./tests/unit/</directory>
         </testsuite>
     </testsuites>
-
-    <testsuites>
-        <testsuite name="integration">
-            <directory>./tests/integration/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+</phpunit>

src/Ratchet/Http/HttpRequestParser.php

@@ -3,13 +3,16 @@
 use Ratchet\MessageInterface;
 use Ratchet\ConnectionInterface;
 use GuzzleHttp\Psr7\Message;
+use Ratchet\Traits\DynamicPropertiesTrait;
 
 /**
  * This class receives streaming data from a client request
  * and parses HTTP headers, returning a PSR-7 Request object
  * once it's been buffered
  */
 class HttpRequestParser implements MessageInterface {
+    use DynamicPropertiesTrait;
+
     const EOM = "\r\n\r\n";
 
     /**

src/Ratchet/Http/HttpServer.php

@@ -1,10 +1,11 @@
 <?php
 namespace Ratchet\Http;
-use Ratchet\MessageComponentInterface;
 use Ratchet\ConnectionInterface;
+use Ratchet\MessageComponentInterface;
+use Ratchet\Traits\DynamicPropertiesTrait;
 
 class HttpServer implements MessageComponentInterface {
-    use CloseResponseTrait;
+    use CloseResponseTrait, DynamicPropertiesTrait;
 
     /**
      * Buffers incoming HTTP requests returning a Guzzle Request when coalesced
@@ -26,6 +27,7 @@ public function __construct(HttpServerInterface $component) {
         $this->_reqParser  = new HttpRequestParser;
     }
 
+
     /**
      * {@inheritdoc}
      */

src/Ratchet/Http/OriginCheck.php

@@ -62,4 +62,4 @@ function onClose(ConnectionInterface $conn) {
     function onError(ConnectionInterface $conn, \Exception $e) {
         return $this->_component->onError($conn, $e);
     }
-}
+}

src/Ratchet/Http/Router.php

@@ -1,11 +1,11 @@
 <?php
 namespace Ratchet\Http;
-use Ratchet\ConnectionInterface;
+use GuzzleHttp\Psr7\Query;
 use Psr\Http\Message\RequestInterface;
-use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
+use Ratchet\ConnectionInterface;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use GuzzleHttp\Psr7\Query;
+use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 
 class Router implements HttpServerInterface {
     use CloseResponseTrait;

src/Ratchet/Server/IoConnection.php

@@ -1,18 +1,19 @@
 <?php
 namespace Ratchet\Server;
 use Ratchet\ConnectionInterface;
+use Ratchet\Traits\DynamicPropertiesTrait;
 use React\Socket\ConnectionInterface as ReactConn;
 
 /**
  * {@inheritdoc}
  */
 class IoConnection implements ConnectionInterface {
+    use DynamicPropertiesTrait;
     /**
      * @var \React\Socket\ConnectionInterface
      */
     protected $conn;
 
-
     /**
      * @param \React\Socket\ConnectionInterface $conn
      */

src/Ratchet/Server/IoServer.php

@@ -1,6 +1,7 @@
 <?php
 namespace Ratchet\Server;
 use Ratchet\MessageComponentInterface;
+use Ratchet\Traits\DynamicPropertiesTrait;
 use React\EventLoop\LoopInterface;
 use React\Socket\ServerInterface;
 use React\EventLoop\Factory as LoopFactory;
@@ -12,6 +13,8 @@
  * Events are delegated through this to attached applications
  */
 class IoServer {
+    use DynamicPropertiesTrait;
+
     /**
      * @var \React\EventLoop\LoopInterface
      */
@@ -80,61 +83,61 @@ public function run() {
      * @param \React\Socket\ConnectionInterface $conn
      */
     public function handleConnect($conn) {
-        $conn->decor = new IoConnection($conn);
-        $conn->decor->resourceId = (int)$conn->stream;
+        $io_conn = new IoConnection($conn);
+        $io_conn->resourceId = (int)$conn->stream;
 
         $uri = $conn->getRemoteAddress();
-        $conn->decor->remoteAddress = trim(
+        $io_conn->remoteAddress = trim(
             parse_url((strpos($uri, '://') === false ? 'tcp://' : '') . $uri, PHP_URL_HOST),
             '[]'
         );
 
-        $this->app->onOpen($conn->decor);
+        $this->app->onOpen($io_conn);
 
-        $conn->on('data', function ($data) use ($conn) {
-            $this->handleData($data, $conn);
+        $conn->on('data', function ($data) use ($io_conn) {
+            $this->handleData($data, $io_conn);
         });
-        $conn->on('close', function () use ($conn) {
-            $this->handleEnd($conn);
+        $conn->on('close', function () use ($io_conn) {
+            $this->handleEnd($io_conn);
         });
-        $conn->on('error', function (\Exception $e) use ($conn) {
-            $this->handleError($e, $conn);
+        $conn->on('error', function (\Exception $e) use ($io_conn) {
+            $this->handleError($e, $io_conn);
         });
     }
 
     /**
      * Data has been received from React
      * @param string                            $data
-     * @param \React\Socket\ConnectionInterface $conn
+     * @param \Ratchet\ConnectionInterface $io_conn
      */
-    public function handleData($data, $conn) {
+    public function handleData($data, $io_conn) {
         try {
-            $this->app->onMessage($conn->decor, $data);
+            $this->app->onMessage($io_conn, $data);
         } catch (\Exception $e) {
-            $this->handleError($e, $conn);
+            $this->handleError($e, $io_conn);
         }
     }
 
     /**
      * A connection has been closed by React
-     * @param \React\Socket\ConnectionInterface $conn
+     * @param \Ratchet\ConnectionInterface $io_conn
      */
-    public function handleEnd($conn) {
+    public function handleEnd($io_conn) {
         try {
-            $this->app->onClose($conn->decor);
+            $this->app->onClose($io_conn);
         } catch (\Exception $e) {
-            $this->handleError($e, $conn);
+            $this->handleError($e, $io_conn);
         }
 
-        unset($conn->decor);
+        unset($io_conn);
     }
 
     /**
      * An error has occurred, let the listening application know
      * @param \Exception                        $e
-     * @param \React\Socket\ConnectionInterface $conn
+     * @param \Ratchet\ConnectionInterface $io_conn
      */
-    public function handleError(\Exception $e, $conn) {
-        $this->app->onError($conn->decor, $e);
+    public function handleError(\Exception $e, $io_conn) {
+        $this->app->onError($io_conn, $e);
     }
 }

src/Ratchet/Session/SessionProvider.php

@@ -12,7 +12,7 @@
  * This component will allow access to session data from your website for each user connected
  * Symfony HttpFoundation is required for this component to work
  * Your website must also use Symfony HttpFoundation Sessions to read your sites session data
- * If your are not using at least PHP 5.4 you must include a SessionHandlerInterface stub (is included in Symfony HttpFoundation, loaded w/ composer)
+ * If you're not using at least PHP 5.4 you must include a SessionHandlerInterface stub (is included in Symfony HttpFoundation, loaded w/ composer)
  */
 class SessionProvider implements HttpServerInterface {
     /**

src/Ratchet/Session/Storage/Proxy/VirtualProxy-HttpFoundation6+.php

@@ -0,0 +1,54 @@
+<?php
+namespace Ratchet\Session\Storage\Proxy;
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
+
+class VirtualProxy extends SessionHandlerProxy {
+    /**
+     * @var string
+     */
+    protected $_sessionId;
+
+    /**
+     * @var string
+     */
+    protected $_sessionName;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(\SessionHandlerInterface $handler) {
+        parent::__construct($handler);
+
+        $this->saveHandlerName = 'user';
+        $this->_sessionName    = ini_get('session.name');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId(): string {
+        return $this->_sessionId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setId($id) {
+        $this->_sessionId = $id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return $this->_sessionName;
+    }
+
+    /**
+     * DO NOT CALL THIS METHOD
+     * @internal
+     */
+    public function setName($name) {
+        throw new \RuntimeException("Can not change session name in VirtualProxy");
+    }
+}