Merge pull request #46 from clue-labs/php8.4

Improve PHP 8.4+ support by avoiding implicitly nullable types

Author: clue

.github/workflows/ci.yml

@@ -11,6 +11,7 @@ jobs:
     strategy:
       matrix:
         php:
+          - 8.4
           - 8.3
           - 8.2
           - 8.1

composer.json

@@ -13,16 +13,16 @@
     "require": {
         "php": ">=5.3",
         "clue/socks-react": "^1.5",
-        "react/child-process": "^0.6",
+        "react/child-process": "^0.6.6",
         "react/event-loop": "^1.2",
-        "react/promise": "^3 || ^2.1 || ^1.2.1",
-        "react/socket": "^1.12.0",
-        "react/stream": "^1.2"
+        "react/promise": "^3.2 || ^2.11 || ^1.3",
+        "react/socket": "^1.16",
+        "react/stream": "^1.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6 || ^8.5 || ^5.7 || ^4.8.36",
-        "react/async": "^4 || ^3 || ^2",
-        "react/http": "^1.5",
+        "react/async": "^4.3 || ^3.2 || ^2.2",
+        "react/http": "^1.11",
         "react/mysql": "^0.5.5",
         "react/promise-timer": "^1.11"
     },

examples/31-mysql-ssh-tunnel.php

@@ -20,7 +20,13 @@
 $proxy = new Clue\React\SshProxy\SshProcessConnector($url);
 
 $url = getenv('MYSQL_LOGIN') !== false ? getenv('MYSQL_LOGIN') : 'user:pass@localhost';
+
+// create MySQL factory without raising deprecation notice on PHP 8.4+
+// need this hack until react/mysql v0.7.0 ships https://github.com/friends-of-reactphp/mysql/pull/203
+set_error_handler(function () { }, E_DEPRECATED);
 $factory = new React\MySQL\Factory(null, $proxy);
+restore_error_handler();
+
 $client = $factory->createLazyConnection($url);
 
 $client->query('SELECT * FROM (SELECT "foo" UNION SELECT "bar") data')->then(function (React\MySQL\QueryResult $query) {

src/SshProcessConnector.php

@@ -41,7 +41,7 @@ class SshProcessConnector implements ConnectorInterface
     public function __construct(
         #[\SensitiveParameter]
         $uri,
-        LoopInterface $loop = null
+        $loop = null
     ) {
         // URI must use optional ssh:// scheme, must contain host and neither pass nor target must start with dash
         $parts = \parse_url((\strpos($uri, '://') === false ? 'ssh://' : '') . $uri);
@@ -51,6 +51,10 @@ public function __construct(
             throw new \InvalidArgumentException('Invalid SSH server URI');
         }
 
+        if ($loop !== null && !$loop instanceof LoopInterface) { // manual type check to support legacy PHP < 7.1
+            throw new \InvalidArgumentException('Argument #2 ($loop) expected null|React\EventLoop\LoopInterface');
+        }
+
         $this->cmd = 'exec ';
         if ($pass !== null) {
             $this->cmd .= 'sshpass -p ' . \escapeshellarg($pass) . ' ';

src/SshSocksConnector.php

@@ -52,7 +52,7 @@ class SshSocksConnector implements ConnectorInterface
     public function __construct(
         #[\SensitiveParameter]
         $uri,
-        LoopInterface $loop = null
+        $loop = null
     ) {
         // URI must use optional ssh:// scheme, must contain host and neither pass nor target must start with dash
         $parts = \parse_url((\strpos($uri, '://') === false ? 'ssh://' : '') . $uri);
@@ -62,6 +62,10 @@ public function __construct(
             throw new \InvalidArgumentException('Invalid SSH server URI');
         }
 
+        if ($loop !== null && !$loop instanceof LoopInterface) { // manual type check to support legacy PHP < 7.1
+            throw new \InvalidArgumentException('Argument #2 ($loop) expected null|React\EventLoop\LoopInterface');
+        }
+
         $this->cmd = 'exec ';
         if ($pass !== null) {
             $this->cmd .= 'sshpass -p ' . \escapeshellarg($pass) . ' ';

tests/SshProcessConnectorTest.php

@@ -93,6 +93,12 @@ public function testConstructorThrowsForInvalidHost()
         new SshProcessConnector('-host', $loop);
     }
 
+    public function testConstructorThrowsForInvalidLoop()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'Argument #2 ($loop) expected null|React\EventLoop\LoopInterface');
+        new SshProcessConnector('host', 'loop');
+    }
+
     /**
      * @doesNotPerformAssertions
      */

tests/SshSocksConnectorTest.php

@@ -123,6 +123,12 @@ public function testConstructorThrowsForInvalidBindHost()
         new SshSocksConnector('host?bind=example:1080', $loop);
     }
 
+    public function testConstructorThrowsForInvalidLoop()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'Argument #2 ($loop) expected null|React\EventLoop\LoopInterface');
+        new SshSocksConnector('host', 'loop');
+    }
+
     /**
      * @doesNotPerformAssertions
      */