Fix for timeout config parameter validation

klimser · weierophinney · commit cd6c61011ff4 · 2019-02-07T11:44:47.000-06:00
diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
@@ -209,7 +209,7 @@ public function connect($host, $port = 80, $secure = false)
             $connectTimeout = null;
         }
 
-        if ($connectTimeout !== null && (! is_int($connectTimeout) || ! is_numeric($connectTimeout))) {
+        if ($connectTimeout !== null && !is_int($connectTimeout) && !is_numeric($connectTimeout)) {
             throw new AdapterException\InvalidArgumentException(sprintf(
                 'integer or numeric string expected, got %s',
                 gettype($connectTimeout)
diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
@@ -263,7 +263,7 @@ public function connect($host, $port = 80, $secure = false)
                 $connectTimeout = $this->config['timeout'];
             }
 
-            if ($connectTimeout !== null && (! is_int($connectTimeout) || ! is_numeric($connectTimeout))) {
+            if ($connectTimeout !== null && !is_int($connectTimeout) && !is_numeric($connectTimeout)) {
                 throw new AdapterException\InvalidArgumentException(sprintf(
                     'integer or numeric string expected, got %s',
                     gettype($connectTimeout)

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public function connect($host, $port = 80, $secure = false)`
`209`	`209`	`$connectTimeout = null;`
`210`	`210`	`}`
`211`	`211`
`212`		`- if ($connectTimeout !== null && (! is_int($connectTimeout) \|\| ! is_numeric($connectTimeout))) {`
	`212`	`+ if ($connectTimeout !== null && !is_int($connectTimeout) && !is_numeric($connectTimeout)) {`
`213`	`213`	`throw new AdapterException\InvalidArgumentException(sprintf(`
`214`	`214`	`'integer or numeric string expected, got %s',`
`215`	`215`	`gettype($connectTimeout)`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ public function connect($host, $port = 80, $secure = false)`
`263`	`263`	`$connectTimeout = $this->config['timeout'];`
`264`	`264`	`}`
`265`	`265`
`266`		`- if ($connectTimeout !== null && (! is_int($connectTimeout) \|\| ! is_numeric($connectTimeout))) {`
	`266`	`+ if ($connectTimeout !== null && !is_int($connectTimeout) && !is_numeric($connectTimeout)) {`
`267`	`267`	`throw new AdapterException\InvalidArgumentException(sprintf(`
`268`	`268`	`'integer or numeric string expected, got %s',`
`269`	`269`	`gettype($connectTimeout)`