Merge pull request #279 from clue-labs/no-filter

Avoid dependency on `ext-filter`
reactphp · Dec 6, 2021 · ead9efb · ead9efb
2 parents d132fde + 28bd075
commit ead9efb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/DnsConnector.php b/src/DnsConnector.php
@@ -39,7 +39,7 @@ public function connect($uri)
         $connector = $this->connector;
 
         // skip DNS lookup / URI manipulation if this URI already contains an IP
-        if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton($host) !== false) {
             return $connector->connect($original);
         }
 

diff --git a/src/HappyEyeBallsConnector.php b/src/HappyEyeBallsConnector.php
@@ -50,7 +50,7 @@ public function connect($uri)
         $host = \trim($parts['host'], '[]');
 
         // skip DNS lookup / URI manipulation if this URI already contains an IP
-        if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton($host) !== false) {
             return $this->connector->connect($original);
         }
 

diff --git a/src/TcpConnector.php b/src/TcpConnector.php
@@ -34,7 +34,7 @@ public function connect($uri)
         }
 
         $ip = \trim($parts['host'], '[]');
-        if (false === \filter_var($ip, \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton($ip) === false) {
             return Promise\reject(new \InvalidArgumentException(
                 'Given URI "' . $uri . '" does not contain a valid host IP (EINVAL)',
                 \defined('SOCKET_EINVAL') ? \SOCKET_EINVAL : 22

diff --git a/src/TcpServer.php b/src/TcpServer.php
@@ -160,7 +160,7 @@ public function __construct($uri, LoopInterface $loop = null, array $context = a
             );
         }
 
-        if (false === \filter_var(\trim($parts['host'], '[]'), \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton(\trim($parts['host'], '[]')) === false) {
             throw new \InvalidArgumentException(
                 'Given URI "' . $uri . '" does not contain a valid host IP (EINVAL)',
                 \defined('SOCKET_EINVAL') ? \SOCKET_EINVAL : 22

diff --git a/tests/FunctionalConnectorTest.php b/tests/FunctionalConnectorTest.php
@@ -90,7 +90,7 @@ public function connectionToRemoteTCP4n6ServerShouldResultInOurIP()
 
         $ip = Block\await($this->request('dual.tlund.se', $connector), $loop, self::TIMEOUT);
 
-        $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6), $ip);
+        $this->assertNotFalse(inet_pton($ip));
     }
 
     /**
@@ -110,8 +110,8 @@ public function connectionToRemoteTCP4ServerShouldResultInOurIP()
             throw $e;
         }
 
-        $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4), $ip);
-        $this->assertFalse(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6), $ip);
+        $this->assertNotFalse(inet_pton($ip));
+        $this->assertEquals(4, strlen(inet_pton($ip)));
     }
 
     /**
@@ -131,8 +131,8 @@ public function connectionToRemoteTCP6ServerShouldResultInOurIP()
             throw $e;
         }
 
-        $this->assertFalse(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4), $ip);
-        $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6), $ip);
+        $this->assertNotFalse(inet_pton($ip));
+        $this->assertEquals(16, strlen(inet_pton($ip)));
     }
 
     public function testCancelPendingTlsConnectionDuringTlsHandshakeShouldCloseTcpConnectionToServer()