Merge pull request #203 from clue-labs/nullable

Improve PHP 8.4+ support by avoiding implicitly nullable types

Author: WyriHaximus

README.md

@@ -107,7 +107,7 @@ will not have to wait for an actual underlying connection.
 
 #### __construct()
 
-The `new MysqlClient(string $uri, ConnectorInterface $connector = null, LoopInterface $loop = null)` constructor can be used to
+The `new MysqlClient(string $uri, ?ConnectorInterface $connector = null, ?LoopInterface $loop = null)` constructor can be used to
 create a new `MysqlClient` instance.
 
 The `$uri` parameter must contain the database host, optional

composer.json

@@ -7,14 +7,14 @@
         "php": ">=5.4.0",
         "evenement/evenement": "^3.0 || ^2.1 || ^1.1",
         "react/event-loop": "^1.2",
-        "react/promise": "^3 || ^2.7",
+        "react/promise": "^3.2 || ^2.7",
         "react/promise-stream": "^1.6",
-        "react/promise-timer": "^1.9",
-        "react/socket": "^1.12"
+        "react/promise-timer": "^1.11",
+        "react/socket": "^1.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
-        "react/async": "^4 || ^3 || ^2"
+        "react/async": "^4.3 || ^3 || ^2"
     },
     "autoload": {
         "psr-4": {

src/Io/Factory.php

@@ -60,8 +60,12 @@ class Factory
      * @param ?LoopInterface $loop
      * @param ?ConnectorInterface $connector
      */
-    public function __construct(LoopInterface $loop = null, ConnectorInterface $connector = null)
+    public function __construct($loop = null, $connector = null)
     {
+        // manual type check to support legacy PHP < 7.1
+        assert($loop === null || $loop instanceof LoopInterface);
+        assert($connector === null || $connector instanceof ConnectorInterface);
+
         $this->loop = $loop ?: Loop::get();
         $this->connector = $connector ?: new Connector([], $this->loop);
     }

src/MysqlClient.php

@@ -76,12 +76,24 @@ class MysqlClient extends EventEmitter
      */
     private $quitting = false;
 
+    /**
+     * @param string $uri
+     * @param ?ConnectorInterface $connector
+     * @param ?LoopInterface $loop
+     */
     public function __construct(
         #[\SensitiveParameter]
         $uri,
-        ConnectorInterface $connector = null,
-        LoopInterface $loop = null
+        $connector = null,
+        $loop = null
     ) {
+        if ($connector !== null && !$connector instanceof ConnectorInterface) { // manual type check to support legacy PHP < 7.1
+            throw new \InvalidArgumentException('Argument #2 ($connector) expected null|React\Socket\ConnectorInterface');
+        }
+        if ($loop !== null && !$loop instanceof LoopInterface) { // manual type check to support legacy PHP < 7.1
+            throw new \InvalidArgumentException('Argument #3 ($loop) expected null|React\EventLoop\LoopInterface');
+        }
+
         $this->factory = new Factory($loop, $connector);
         $this->uri = $uri;
     }

tests/MysqlClientTest.php

@@ -56,6 +56,18 @@ public function testConstructWithConnectorAndLoopAssignsGivenConnectorAndLoop()
         $this->assertSame($loop, $ref->getValue($factory));
     }
 
+    public function testContructorThrowsExceptionForInvalidConnector()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'Argument #2 ($connector) expected null|React\Socket\ConnectorInterface');
+        new MysqlClient('localhost', 'connector');
+    }
+
+    public function testContructorThrowsExceptionForInvalidLoop()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'Argument #3 ($loop) expected null|React\EventLoop\LoopInterface');
+        new MysqlClient('localhost', null, 'loop');
+    }
+
     public function testPingWillNotCloseConnectionWhenPendingConnectionFails()
     {
         $deferred = new Deferred();