Merge pull request #317 from clue-labs/nullable-v3

WyriHaximus · web-flow · commit e04478a14b22 · 2024-07-25T23:18:07.000+02:00
[3.x] Improve PHP 8.4+ support by avoiding implicitly nullable types
diff --git a/composer.json b/composer.json
@@ -28,16 +28,16 @@
     "require": {
         "php": ">=7.1",
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
-        "react/dns": "^1.11",
+        "react/dns": "^1.13",
         "react/event-loop": "^1.2",
-        "react/promise": "^3 || ^2.6 || ^1.2.1",
-        "react/stream": "^1.2"
+        "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+        "react/stream": "^1.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6 || ^7.5",
-        "react/async": "^4 || ^3",
+        "react/async": "^4.3 || ^3",
         "react/promise-stream": "^1.4",
-        "react/promise-timer": "^1.10"
+        "react/promise-timer": "^1.11"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Connector.php b/src/Connector.php
@@ -50,7 +50,7 @@ final class Connector implements ConnectorInterface
      * @param ?LoopInterface $loop
      * @throws \InvalidArgumentException for invalid arguments
      */
-    public function __construct(array $context = array(), LoopInterface $loop = null)
+    public function __construct(array $context = [], ?LoopInterface $loop = null)
     {
         // apply default options if not explicitly given
         $context += [
diff --git a/src/FdServer.php b/src/FdServer.php
@@ -75,7 +75,7 @@ final class FdServer extends EventEmitter implements ServerInterface
      * @throws \InvalidArgumentException if the listening address is invalid
      * @throws \RuntimeException if listening on this address fails (already in use etc.)
      */
-    public function __construct($fd, LoopInterface $loop = null)
+    public function __construct($fd, ?LoopInterface $loop = null)
     {
         if (\preg_match('#^php://fd/(\d+)$#', $fd, $m)) {
             $fd = (int) $m[1];
diff --git a/src/SecureConnector.php b/src/SecureConnector.php
@@ -13,7 +13,7 @@ final class SecureConnector implements ConnectorInterface
     private $streamEncryption;
     private $context;
 
-    public function __construct(ConnectorInterface $connector, LoopInterface $loop = null, array $context = [])
+    public function __construct(ConnectorInterface $connector, ?LoopInterface $loop = null, array $context = [])
     {
         $this->connector = $connector;
         $this->streamEncryption = new StreamEncryption($loop ?? Loop::get(), false);
diff --git a/src/SecureServer.php b/src/SecureServer.php
@@ -119,7 +119,7 @@ final class SecureServer extends EventEmitter implements ServerInterface
      * @see TcpServer
      * @link https://www.php.net/manual/en/context.ssl.php for TLS context options
      */
-    public function __construct(ServerInterface $tcp, LoopInterface $loop = null, array $context = [])
+    public function __construct(ServerInterface $tcp, ?LoopInterface $loop = null, array $context = [])
     {
         // default to empty passphrase to suppress blocking passphrase prompt
         $context += [
diff --git a/src/SocketServer.php b/src/SocketServer.php
@@ -31,7 +31,7 @@ final class SocketServer extends EventEmitter implements ServerInterface
      * @throws \InvalidArgumentException if the listening address is invalid
      * @throws \RuntimeException if listening on this address fails (already in use etc.)
      */
-    public function __construct($uri, array $context = [], LoopInterface $loop = null)
+    public function __construct($uri, array $context = [], ?LoopInterface $loop = null)
     {
         // apply default options if not explicitly given
         $context += [
diff --git a/src/TcpConnector.php b/src/TcpConnector.php
@@ -12,7 +12,7 @@ final class TcpConnector implements ConnectorInterface
     private $loop;
     private $context;
 
-    public function __construct(LoopInterface $loop = null, array $context = [])
+    public function __construct(?LoopInterface $loop = null, array $context = [])
     {
         $this->loop = $loop ?? Loop::get();
         $this->context = $context;
diff --git a/src/TcpServer.php b/src/TcpServer.php
@@ -126,7 +126,7 @@ final class TcpServer extends EventEmitter implements ServerInterface
      * @throws \InvalidArgumentException if the listening address is invalid
      * @throws \RuntimeException if listening on this address fails (already in use etc.)
      */
-    public function __construct($uri, LoopInterface $loop = null, array $context = [])
+    public function __construct($uri, ?LoopInterface $loop = null, array $context = [])
     {
         $this->loop = $loop ?? Loop::get();
 
diff --git a/src/TimeoutConnector.php b/src/TimeoutConnector.php
@@ -12,7 +12,7 @@ final class TimeoutConnector implements ConnectorInterface
     private $timeout;
     private $loop;
 
-    public function __construct(ConnectorInterface $connector, $timeout, LoopInterface $loop = null)
+    public function __construct(ConnectorInterface $connector, $timeout, ?LoopInterface $loop = null)
     {
         $this->connector = $connector;
         $this->timeout = $timeout;
diff --git a/src/UnixConnector.php b/src/UnixConnector.php
@@ -17,7 +17,7 @@ final class UnixConnector implements ConnectorInterface
 {
     private $loop;
 
-    public function __construct(LoopInterface $loop = null)
+    public function __construct(?LoopInterface $loop = null)
     {
         $this->loop = $loop ?? Loop::get();
     }
diff --git a/src/UnixServer.php b/src/UnixServer.php
@@ -48,7 +48,7 @@ final class UnixServer extends EventEmitter implements ServerInterface
      * @throws \InvalidArgumentException if the listening address is invalid
      * @throws \RuntimeException if listening on this address fails (already in use etc.)
      */
-    public function __construct($path, LoopInterface $loop = null, array $context = [])
+    public function __construct($path, ?LoopInterface $loop = null, array $context = [])
     {
         $this->loop = $loop ?? Loop::get();
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ final class Connector implements ConnectorInterface`
`50`	`50`	`* @param ?LoopInterface $loop`
`51`	`51`	`* @throws \InvalidArgumentException for invalid arguments`
`52`	`52`	`*/`
`53`		`- public function __construct(array $context = array(), LoopInterface $loop = null)`
	`53`	`+ public function __construct(array $context = [], ?LoopInterface $loop = null)`
`54`	`54`	`{`
`55`	`55`	`// apply default options if not explicitly given`
`56`	`56`	`$context += [`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ final class FdServer extends EventEmitter implements ServerInterface`
`75`	`75`	`* @throws \InvalidArgumentException if the listening address is invalid`
`76`	`76`	`* @throws \RuntimeException if listening on this address fails (already in use etc.)`
`77`	`77`	`*/`
`78`		`- public function __construct($fd, LoopInterface $loop = null)`
	`78`	`+ public function __construct($fd, ?LoopInterface $loop = null)`
`79`	`79`	`{`
`80`	`80`	`if (\preg_match('#^php://fd/(\d+)$#', $fd, $m)) {`
`81`	`81`	`$fd = (int) $m[1];`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class SecureConnector implements ConnectorInterface`
`13`	`13`	`private $streamEncryption;`
`14`	`14`	`private $context;`
`15`	`15`
`16`		`- public function __construct(ConnectorInterface $connector, LoopInterface $loop = null, array $context = [])`
	`16`	`+ public function __construct(ConnectorInterface $connector, ?LoopInterface $loop = null, array $context = [])`
`17`	`17`	`{`
`18`	`18`	`$this->connector = $connector;`
`19`	`19`	`$this->streamEncryption = new StreamEncryption($loop ?? Loop::get(), false);`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ final class SecureServer extends EventEmitter implements ServerInterface`
`119`	`119`	`* @see TcpServer`
`120`	`120`	`* @link https://www.php.net/manual/en/context.ssl.php for TLS context options`
`121`	`121`	`*/`
`122`		`- public function __construct(ServerInterface $tcp, LoopInterface $loop = null, array $context = [])`
	`122`	`+ public function __construct(ServerInterface $tcp, ?LoopInterface $loop = null, array $context = [])`
`123`	`123`	`{`
`124`	`124`	`// default to empty passphrase to suppress blocking passphrase prompt`
`125`	`125`	`$context += [`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class SocketServer extends EventEmitter implements ServerInterface`
`31`	`31`	`* @throws \InvalidArgumentException if the listening address is invalid`
`32`	`32`	`* @throws \RuntimeException if listening on this address fails (already in use etc.)`
`33`	`33`	`*/`
`34`		`- public function __construct($uri, array $context = [], LoopInterface $loop = null)`
	`34`	`+ public function __construct($uri, array $context = [], ?LoopInterface $loop = null)`
`35`	`35`	`{`
`36`	`36`	`// apply default options if not explicitly given`
`37`	`37`	`$context += [`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ final class TcpConnector implements ConnectorInterface`
`12`	`12`	`private $loop;`
`13`	`13`	`private $context;`
`14`	`14`
`15`		`- public function __construct(LoopInterface $loop = null, array $context = [])`
	`15`	`+ public function __construct(?LoopInterface $loop = null, array $context = [])`
`16`	`16`	`{`
`17`	`17`	`$this->loop = $loop ?? Loop::get();`
`18`	`18`	`$this->context = $context;`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ final class TcpServer extends EventEmitter implements ServerInterface`
`126`	`126`	`* @throws \InvalidArgumentException if the listening address is invalid`
`127`	`127`	`* @throws \RuntimeException if listening on this address fails (already in use etc.)`
`128`	`128`	`*/`
`129`		`- public function __construct($uri, LoopInterface $loop = null, array $context = [])`
	`129`	`+ public function __construct($uri, ?LoopInterface $loop = null, array $context = [])`
`130`	`130`	`{`
`131`	`131`	`$this->loop = $loop ?? Loop::get();`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ final class TimeoutConnector implements ConnectorInterface`
`12`	`12`	`private $timeout;`
`13`	`13`	`private $loop;`
`14`	`14`
`15`		`- public function __construct(ConnectorInterface $connector, $timeout, LoopInterface $loop = null)`
	`15`	`+ public function __construct(ConnectorInterface $connector, $timeout, ?LoopInterface $loop = null)`
`16`	`16`	`{`
`17`	`17`	`$this->connector = $connector;`
`18`	`18`	`$this->timeout = $timeout;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ final class UnixConnector implements ConnectorInterface`
`17`	`17`	`{`
`18`	`18`	`private $loop;`
`19`	`19`
`20`		`- public function __construct(LoopInterface $loop = null)`
	`20`	`+ public function __construct(?LoopInterface $loop = null)`
`21`	`21`	`{`
`22`	`22`	`$this->loop = $loop ?? Loop::get();`
`23`	`23`	`}`