Merge pull request #43 from DavidePastore/add-parameter-to-configure-…

…curl-options

First draft of creating a curlOptions key in settings

README.md

@@ -46,23 +46,17 @@ $ipInfo = new DavidePastore\Ipinfo\Ipinfo(array(
 ));
 ```
 
-#### Timeout of the connection
+#### cURL options
 
-The number of seconds to wait while trying to connect when you instantiate the object:
+The cURL options to use while trying to connect when you instantiate the object:
 
 ```php
 $ipInfo = new DavidePastore\Ipinfo\Ipinfo(array(
-	"connectionTimeout" => 100
-));
-```
-
-#### Timeout of cURL
-
-You can set the maximum number of seconds to allow cURL functions to execute when you instantiate the object:
-
-```php
-$ipInfo = new DavidePastore\Ipinfo\Ipinfo(array(
-	"timeout" => 100
+	"curlOptions" => array(
+            CURLOPT_CONNECTTIMEOUT => 1,
+            CURLOPT_TIMEOUT => 2,
+            CURLOPT_CAINFO => __DIR__ . "/cacert.pem"
+    )
 ));
 ```
 

src/DavidePastore/Ipinfo/Ipinfo.php

@@ -109,9 +109,8 @@ public function __construct($settings = array())
         //Merge user settings
         $this->settings = array_merge(array(
                 'token' => '',
-                'connectionTimeout' => 0,
-                'timeout' => 0,
                 'debug' => false,
+                'curlOptions' => array()
         ), $settings);
     }
 
@@ -245,13 +244,14 @@ private function makeCurlRequest($address)
             echo 'Request address: '.$address."\n";
         }
 
-        curl_setopt_array($curl, array(
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_URL => $address,
-            CURLOPT_CONNECTTIMEOUT => $this->settings['connectionTimeout'],
-            CURLOPT_TIMEOUT => $this->settings['timeout'],
-            CURLOPT_CAINFO => __DIR__ . "/cacert.pem"
-        ));
+        curl_setopt_array($curl,
+            array_replace($this->settings['curlOptions'],
+                array(
+                    CURLOPT_RETURNTRANSFER => 1,
+                    CURLOPT_URL => $address
+                )
+            )
+        );
 
         $response = curl_exec($curl);