Merge pull request #41 from clue-labs/nullable

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,9 +13,9 @@
     "require": {
         "php": ">=5.3",
         "react/event-loop": "^1.2",
-        "react/promise": "^3 || ^2.1 || ^1.2.1",
-        "react/promise-timer": "^1.9",
-        "react/socket": "^1.12"
+        "react/promise": "^3.2 || ^2.1 || ^1.2.1",
+        "react/promise-timer": "^1.11",
+        "react/socket": "^1.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"

src/ConnectionManagerDelay.php

@@ -23,8 +23,12 @@ class ConnectionManagerDelay implements ConnectorInterface
      * @param float $delay
      * @param ?LoopInterface $loop
      */
-    public function __construct(ConnectorInterface $connectionManager, $delay, LoopInterface $loop = null)
+    public function __construct(ConnectorInterface $connectionManager, $delay, $loop = null)
     {
+        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->connectionManager = $connectionManager;
         $this->delay = $delay;
         $this->loop = $loop ?: Loop::get();

src/ConnectionManagerTimeout.php

@@ -23,8 +23,12 @@ class ConnectionManagerTimeout implements ConnectorInterface
      * @param float $timeout
      * @param ?LoopInterface $loop
      */
-    public function __construct(ConnectorInterface $connectionManager, $timeout, LoopInterface $loop = null)
+    public function __construct(ConnectorInterface $connectionManager, $timeout, $loop = null)
     {
+        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->connectionManager = $connectionManager;
         $this->timeout = $timeout;
         $this->loop = $loop ?: Loop::get();

tests/ConnectionManagerDelayTest.php

@@ -21,14 +21,22 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
     {
         $unused = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
         $cm = new ConnectionManagerDelay($unused, 0);
-        
+
         $ref = new \ReflectionProperty($cm, 'loop');
         $ref->setAccessible(true);
         $loop = $ref->getValue($cm);
-        
+
         $this->assertInstanceOf('React\EventLoop\LoopInterface', $loop);
     }
 
+    public function testContructorThrowsExceptionForInvalidLoop()
+    {
+        $unused = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
+
+        $this->setExpectedException('InvalidArgumentException', 'Argument #3 ($loop) expected null|React\EventLoop\LoopInterface');
+        new ConnectionManagerDelay($unused, 0, 'loop');
+    }
+
     public function testDelayTenth()
     {
         $will = $this->createConnectionManagerMock(true);

tests/ConnectionManagerTimeoutTest.php

@@ -31,6 +31,14 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
         $this->assertInstanceOf('React\EventLoop\LoopInterface', $loop);
     }
 
+    public function testContructorThrowsExceptionForInvalidLoop()
+    {
+        $unused = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
+
+        $this->setExpectedException('InvalidArgumentException', 'Argument #3 ($loop) expected null|React\EventLoop\LoopInterface');
+        new ConnectionManagerTimeout($unused, 0, 'loop');
+    }
+
     public function testTimeoutOkay()
     {
         $will = $this->createConnectionManagerMock(true);