Merge branch 'hotfix/121' into develop

Forward port #121

CHANGELOG.md

@@ -44,7 +44,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#121](https://github.com/zendframework/zend-http/pull/121) adds detection for non-numeric connection timeout values as well as
+  integer casting to ensure the timeout is set properly in both the Curl and
+  Socket adapters.
 
 ## 2.8.2 - 2018-08-13
 

src/Client/Adapter/Curl.php

@@ -208,6 +208,18 @@ public function connect($host, $port = 80, $secure = false)
         } else {
             $connectTimeout = null;
         }
+
+        if ($connectTimeout !== null && (! is_int($connectTimeout) || ! is_numeric($connectTimeout))) {
+            throw new AdapterException\InvalidArgumentException(sprintf(
+                'integer or numeric string expected, got %s',
+                gettype($connectTimeout)
+            ));
+        }
+
+        if ($connectTimeout !== null) {
+            $connectTimeout = (int) $connectTimeout;
+        }
+
         if ($connectTimeout !== null) {
             if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
                 curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, $connectTimeout * 1000);

src/Client/Adapter/Socket.php

@@ -262,6 +262,14 @@ public function connect($host, $port = 80, $secure = false)
             } else {
                 $connectTimeout = $this->config['timeout'];
             }
+
+            if ($connectTimeout !== null && (! is_int($connectTimeout) || ! is_numeric($connectTimeout))) {
+                throw new AdapterException\InvalidArgumentException(sprintf(
+                    'integer or numeric string expected, got %s',
+                    gettype($connectTimeout)
+                ));
+            }
+
             ErrorHandler::start();
             $this->socket = stream_socket_client(
                 $host . ':' . $port,

test/Client/CurlTest.php

@@ -96,6 +96,36 @@ public function testConfigSetAsZendConfig()
         $this->assertEquals($config->nested->item, $hasConfig['nested']['item']);
     }
 
+    public function provideValidTimeoutConfig()
+    {
+        return [
+            'integer' => [10],
+            'numeric' => ['10'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideValidTimeoutConfig
+     */
+    public function testPassValidTimeout($timeout)
+    {
+        $adapter = new Adapter\Curl();
+        $adapter->setOptions(['timeout' => $timeout]);
+
+        $adapter->connect('http://framework.zend.com');
+    }
+
+    public function testThrowInvalidArgumentExceptionOnNonIntegerAndNonNumericStringTimeout()
+    {
+        $adapter = new Adapter\Curl();
+        $adapter->setOptions(['timeout' => 'timeout']);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('integer or numeric string expected, got string');
+
+        $adapter->connect('http://framework.zend.com');
+    }
+
     /**
      * Check that an exception is thrown when trying to set invalid config
      *

test/Client/SocketTest.php

@@ -171,6 +171,36 @@ public function testSetConfigInvalidConfig($config)
         $this->_adapter->setOptions($config);
     }
 
+    public function provideValidTimeoutConfig()
+    {
+        return [
+            'integer' => [10],
+            'numeric' => ['10'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideValidTimeoutConfig
+     */
+    public function testPassValidTimeout($timeout)
+    {
+        $adapter = new Adapter\Socket();
+        $adapter->setOptions(['timeout' => $timeout]);
+
+        $adapter->connect('http://framework.zend.com');
+    }
+
+    public function testThrowInvalidArgumentExceptionOnNonIntegerAndNonNumericStringTimeout()
+    {
+        $adapter = new Adapter\Socket();
+        $adapter->setOptions(['timeout' => 'timeout']);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('integer or numeric string expected, got string');
+
+        $adapter->connect('http://framework.zend.com');
+    }
+
     /**
      * Stream context related tests
      */