Merge pull request #756 from Adyen/DR-1284

[DR-1284] Add CURLOPT_CONNECTTIMEOUT setting and define default values for timeouts

Author: Kwok-he-Chu

src/Adyen/Client.php

@@ -49,6 +49,8 @@ class Client
     const MANAGEMENT_API_TEST = "https://management-test.adyen.com";
     const MANAGEMENT_API_LIVE = "https://management-live.adyen.com";
     const MANAGEMENT_API = "v1";
+    const DEFAULT_CURLOPT_TIMEOUT = 60;
+    const DEFAULT_CURLOPT_CONNECTTIMEOUT = 30;
 
     /**
      * @var Config
@@ -299,6 +301,14 @@ public function setTimeout($value)
         $this->config->set('timeout', $value);
     }
 
+    /**
+     * @param $value
+     */
+    public function setConnectionTimeout($value)
+    {
+        $this->config->set('connectionTimeout', $value);
+    }
+
     /**
      * Get the library name
      *

src/Adyen/Config.php

@@ -141,7 +141,19 @@ public function getOutputType()
      */
     public function getTimeout()
     {
-        return !empty($this->data['timeout']) ? $this->data['timeout'] : null;
+        return !empty($this->data['timeout']) ?
+            $this->data['timeout'] :
+            Client::DEFAULT_CURLOPT_TIMEOUT;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getConnectionTimeout()
+    {
+        return !empty($this->data['connectionTimeout']) ?
+            $this->data['connectionTimeout'] :
+            Client::DEFAULT_CURLOPT_CONNECTTIMEOUT;
     }
 
     /**

src/Adyen/HttpClient/CurlClient.php

@@ -336,6 +336,11 @@ public function requestHttp(Service $service, $requestUrl, $params, $method, $re
             curl_setopt($ch, CURLOPT_TIMEOUT, $config->getTimeout());
         }
 
+        // Set the connection timeout
+        if ($config->getConnectionTimeout() != null) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $config->getConnectionTimeout());
+        }
+
         // Set the headers
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 

tests/Unit/TestCaseMock.php

@@ -32,6 +32,8 @@ protected function createMockClient($jsonFile, $httpStatus, $errno = null, $envi
         $client->setApplicationName("My Test Application");
         $client->setEnvironment($environment);
         $client->setXApiKey("MockAPIKey");
+        $client->setTimeout(60);
+        $client->setConnectionTimeout(30);
 
         $json = null;
         if ($jsonFile != null) {