Merge pull request #537 from clue-labs/nullable-v1

[1.x] Improve PHP 8.4+ support by avoiding implicitly nullable types
reactphp · Aug 18, 2024 · c4855ce · c4855ce
2 parents 8111281 + 88128ac
commit c4855ce
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -31,18 +31,18 @@
         "fig/http-message-util": "^1.1",
         "psr/http-message": "^1.0",
         "react/event-loop": "^1.2",
-        "react/promise": "^3 || ^2.3 || ^1.2.1",
-        "react/socket": "^1.12",
-        "react/stream": "^1.2"
+        "react/promise": "^3.2 || ^2.3 || ^1.2.1",
+        "react/socket": "^1.16",
+        "react/stream": "^1.4"
     },
     "require-dev": {
         "clue/http-proxy-react": "^1.8",
         "clue/reactphp-ssh-proxy": "^1.4",
         "clue/socks-react": "^1.4",
         "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
-        "react/async": "^4 || ^3 || ^2",
+        "react/async": "^4.2 || ^3 || ^2",
         "react/promise-stream": "^1.4",
-        "react/promise-timer": "^1.9"
+        "react/promise-timer": "^1.11"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Browser.php b/src/Browser.php
@@ -10,6 +10,7 @@
 use React\Http\Message\Request;
 use React\Http\Message\Uri;
 use React\Promise\PromiseInterface;
+use React\Socket\Connector;
 use React\Socket\ConnectorInterface;
 use React\Stream\ReadableStreamInterface;
 use InvalidArgumentException;
@@ -88,7 +89,7 @@ public function __construct($connector = null, $loop = null)
 
         $loop = $loop ?: Loop::get();
         $this->transaction = new Transaction(
-            Sender::createFromLoop($loop, $connector),
+            Sender::createFromLoop($loop, $connector ?: new Connector(array(), $loop)),
             $loop
         );
     }

diff --git a/src/Io/Sender.php b/src/Io/Sender.php
@@ -8,7 +8,6 @@
 use React\Http\Client\Client as HttpClient;
 use React\Promise\PromiseInterface;
 use React\Promise\Deferred;
-use React\Socket\Connector;
 use React\Socket\ConnectorInterface;
 use React\Stream\ReadableStreamInterface;
 
@@ -48,12 +47,8 @@ class Sender
      * @param ConnectorInterface|null $connector
      * @return self
      */
-    public static function createFromLoop(LoopInterface $loop, ConnectorInterface $connector = null)
+    public static function createFromLoop(LoopInterface $loop, ConnectorInterface $connector)
     {
-        if ($connector === null) {
-            $connector = new Connector(array(), $loop);
-        }
-
         return new self(new HttpClient(new ClientConnectionManager($connector, $loop)));
     }
 

diff --git a/tests/Io/SenderTest.php b/tests/Io/SenderTest.php
@@ -28,7 +28,9 @@ public function setUpLoop()
 
     public function testCreateFromLoop()
     {
-        $sender = Sender::createFromLoop($this->loop, null);
+        $connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
+
+        $sender = Sender::createFromLoop($this->loop, $connector);
 
         $this->assertInstanceOf('React\Http\Io\Sender', $sender);
     }

diff --git a/tests/Io/StreamingServerTest.php b/tests/Io/StreamingServerTest.php
@@ -32,7 +32,7 @@ public function setUpConnectionMockAndSocket()
     }
 
 
-    private function mockConnection(array $additionalMethods = null)
+    private function mockConnection(array $additionalMethods = array())
     {
         $connection = $this->getMockBuilder('React\Socket\Connection')
             ->disableOriginalConstructor()
@@ -49,7 +49,7 @@ private function mockConnection(array $additionalMethods = null)
                     'getLocalAddress',
                     'pipe'
                 ),
-                (is_array($additionalMethods) ? $additionalMethods : array())
+                $additionalMethods
             ))
             ->getMock();