Add the ability to add additional HTTP options to the HttpClient [messagebird#48]

Author: Matthijs van Dorp

src/MessageBird/Client.php

@@ -212,4 +212,10 @@ private function getPhpVersion()
 
         return 'PHP/' . PHP_VERSION_ID;
     }
+
+    public function addHttpOption($key, $value) {
+        $this->ChatAPIHttpClient->addHttpOption($key, $value);
+        $this->HttpClient->addHttpOption($key, $value);
+        $this->VoiceAPIHttpClient->addHttpOption($key, $value);
+    }
 }

src/MessageBird/Common/HttpClient.php

@@ -50,6 +50,12 @@ class HttpClient
      */
     private $headers = array();
 
+
+    /**
+     * @var array
+     */
+    private $httpOptions = array();
+
     /**
      * @param string $endpoint
      * @param int    $timeout           > 0
@@ -123,6 +129,15 @@ public function setHeaders(array $headers)
         $this->headers = $headers;
     }
 
+
+    public function addHttpOption($key, $value) {
+        $this->httpOptions[$key] = $value;
+    }
+
+    public function getHttpOption( $key) {
+        return isset($this->httpOptions[$key]) ? $this->httpOptions[$key] : null;
+    }
+
     /**
      * @param string      $method
      * @param string      $resourceName
@@ -159,6 +174,10 @@ public function performHttpRequest($method, $resourceName, $query = null, $body
         curl_setopt($curl, CURLOPT_TIMEOUT, $this->timeout);
         curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $this->connectionTimeout);
 
+        foreach( $this->httpOptions as $key=>$value) {
+            curl_setopt($curl, $key, $value);
+        }
+
         if ($method === self::REQUEST_GET) {
             curl_setopt($curl, CURLOPT_HTTPGET, true);
         } elseif ($method === self::REQUEST_POST) {

tests/integration/HttpClientTest.php

@@ -60,4 +60,19 @@ public function testHttpClientWithoutAuthenticationException()
         $client = new HttpClient(Client::ENDPOINT);
         $client->performHttpRequest('foo', 'bar');
     }
+
+    /**
+     * Test that it allows additional CURL options 
+     */
+     public function testHttpClientWithHttpOptions() 
+     {
+        $client = new HttpClient(Client::ENDPOINT);
+        $url = "127.0.0.1:8080";
+
+        $client->addHttpOption(CURLOPT_PROXY, $url);
+
+        $this->assertSame($client->getHttpOption(CURLOPT_PROXY), $url);
+
+     }
+     
 }