Merge branch 'MarkMaldaba-allow_curl_param_overrides'

Author: asimlqt

src/Google/Spreadsheet/DefaultServiceRequest.php

@@ -47,7 +47,7 @@ class DefaultServiceRequest implements ServiceRequestInterface
      * 
      * @var array
      */
-    protected $headers = array();
+    protected $headers = [];
 
     /**
      * Service url
@@ -70,6 +70,19 @@ class DefaultServiceRequest implements ServiceRequestInterface
      */
     protected $sslVerifyPeer = true;
 
+    /**
+     * cURL parameters
+     * 
+     * @var array
+     */
+    protected $curlParams = [
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_FOLLOWLOCATION => true,
+        CURLOPT_FAILONERROR => false,
+        CURLOPT_SSL_VERIFYPEER => true,
+        CURLOPT_VERBOSE => false,
+    ];
+
     /**
      * Initializes the service request object.
      * 
@@ -174,7 +187,7 @@ public function setUserAgent($userAgent)
      */
     public function getSslVerifyPeer()
     {
-        return $this->sslVerifyPeer;
+        return $this->curlParams[CURLOPT_SSL_VERIFYPEER];
     }
 
     /**
@@ -186,7 +199,31 @@ public function getSslVerifyPeer()
      */
     public function setSslVerifyPeer($sslVerifyPeer)
     {
-        $this->sslVerifyPeer = (bool) $sslVerifyPeer;
+        $this->curlParams[CURLOPT_SSL_VERIFYPEER] = (bool) $sslVerifyPeer;
+        return $this;
+    }
+
+    /**
+     * Get currently set curl params
+     * 
+     * @return array
+     */
+    public function getCurlParams()
+    {
+        return $this->curlParams;
+    }
+
+    /**
+     * Add an extra curl parameter or override an existing one
+     * 
+     * @param string $name  'CURLOPT_*' constant
+     * @param mixed  $value
+     *
+     * @return DefaultServiceRequest
+     */
+    public function addCurlParam($name, $value)
+    {
+        $this->curlParams[$name] = $value;
         return $this;
     }
 
@@ -268,20 +305,12 @@ public function delete($url)
      */
     protected function initRequest($url, $requestHeaders = array())
     {
-        $curlParams = array (
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_FAILONERROR => false,
-            CURLOPT_SSL_VERIFYPEER => $this->sslVerifyPeer,
-            CURLOPT_VERBOSE => false,
-        );
-
         if(substr($url, 0, 4) !== "http") {
             $url = $this->serviceUrl . $url;
         }
 
         $ch = curl_init();
-        curl_setopt_array($ch, $curlParams);
+        curl_setopt_array($ch, $this->curlParams);
         curl_setopt($ch, CURLOPT_URL, $url);
 
         $headers = array();

tests/Google/Spreadsheet/DefaultServiceRequestTest.php

@@ -64,6 +64,22 @@ public function testSetSslVerifyPeer()
         $this->assertFalse($request->getSslVerifyPeer());
     }
 
+    public function testGetCurlParams()
+    {
+        $request = new DefaultServiceRequest("token");
+        $this->assertTrue(count($request->getCurlParams()) === 5);
+    }
+
+    public function testAddCurlParam()
+    {
+        $request = new DefaultServiceRequest("token");
+        $request->addCurlParam(CURLOPT_SSL_VERIFYPEER, false);
+
+        $params = $request->getCurlParams();
+
+        $this->assertFalse($params[CURLOPT_SSL_VERIFYPEER]);
+    }
+
     public function testGet()
     {
         $mockRequest = $this->getMockBuilder(DefaultServiceRequest::class)