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

SimonFrings · web-flow · commit 3f4dced1f154 · 2021-12-06T10:33:55.000+01:00
Avoid dependency on `ext-filter`
diff --git a/src/SshSocksConnector.php b/src/SshSocksConnector.php
@@ -78,7 +78,7 @@ public function __construct($uri, LoopInterface $loop = null)
         \parse_str(parse_url($uri, \PHP_URL_QUERY), $args);
         if (isset($args['bind'])) {
             $parts = parse_url('tcp://' . $args['bind']);
-            if (!isset($parts['scheme'], $parts['host'], $parts['port']) || \filter_var(\trim($parts['host'], '[]'), \FILTER_VALIDATE_IP) === false) {
+            if (!isset($parts['scheme'], $parts['host'], $parts['port']) || @\inet_pton(\trim($parts['host'], '[]')) === false) {
                 throw new \InvalidArgumentException('Invalid bind address given');
             }
             $this->bind = $args['bind'];

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function __construct($uri, LoopInterface $loop = null)`
`78`	`78`	`\parse_str(parse_url($uri, \PHP_URL_QUERY), $args);`
`79`	`79`	`if (isset($args['bind'])) {`
`80`	`80`	`$parts = parse_url('tcp://' . $args['bind']);`
`81`		`- if (!isset($parts['scheme'], $parts['host'], $parts['port']) \|\| \filter_var(\trim($parts['host'], '[]'), \FILTER_VALIDATE_IP) === false) {`
	`81`	`+ if (!isset($parts['scheme'], $parts['host'], $parts['port']) \|\| @\inet_pton(\trim($parts['host'], '[]')) === false) {`
`82`	`82`	`throw new \InvalidArgumentException('Invalid bind address given');`
`83`	`83`	`}`
`84`	`84`	`$this->bind = $args['bind'];`