Add support for http proxy

Author: stevenmaguire

CHANGELOG.md

@@ -1,6 +1,23 @@
 #Changelog
 All Notable changes to `trello-php` will be documented in this file
 
+## 0.4.0 - 2016-09-23
+
+### Added
+- Add support for HTTP proxy configuration.
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Nothing
+
+### Removed
+- Nothing
+
+### Security
+- Nothing
+
 ## 0.3.6 - 2015-10-26
 
 ### Added

README.md

@@ -42,6 +42,7 @@ Setting | Description
 `callbackUrl` | Required when using package to help get access tokens.
 `expiration` | Required when using package to help get access tokens.
 `scope` | Required when using package to help get access tokens.
+`proxy` | Optional setting to declare a host to use for proxy; [Read more on the Guzzle Docs](http://docs.guzzlephp.org/en/latest/request-options.html#proxy).
 
 #### Set configuration when creating client
 

src/Client.php

@@ -18,6 +18,7 @@ class Client
     protected static $defaultOptions = [
         'domain' => 'https://trello.com',
         'key' => null,
+        'proxy' => null,
         'version' => '1',
         'secret' => null,
     ];

src/Http.php

@@ -231,7 +231,8 @@ protected function sendRequest(RequestInterface $request)
     {
         try {
             $response = $this->httpClient->send($request, [
-                'multipart' => $this->multipartResources
+                'multipart' => $this->multipartResources,
+                'proxy' => Configuration::get('proxy')
             ]);
 
             $this->multipartResources = [];

tests/ApiTestTrait.php

@@ -3888,5 +3888,4 @@ public function testUpdateWebhookIdModel()
 
         $this->assertExpectedEqualsResult($payload, $result);
     }
-
 }

tests/ClientTest.php

@@ -79,7 +79,7 @@ protected function getTestString()
         return uniqid();
     }
 
-    protected function prepareFor($method, $path, $query = "", $payload = [], $status = 200)
+    protected function prepareFor($method, $path, $query = "", $payload = [], $status = 200, $proxy = null)
     {
         $path = $this->getFullPathFromPath($path);
         $domain = $this->getDomain();
@@ -95,7 +95,10 @@ protected function prepareFor($method, $path, $query = "", $payload = [], $statu
                 && strpos($uri->getQuery(), $authorizedQuery) > -1;
         });
 
-        $requestOptions = m::on(function ($options) {
+        $requestOptions = m::on(function ($options) use ($proxy) {
+            if ($proxy && (!isset($options['proxy']) || $options['proxy'] != $proxy)) {
+                return false;
+            }
             return is_array($options);
         });
 
@@ -200,4 +203,19 @@ public function testBadMethodCallThrowsException()
 
         $result = $this->client->$method();
     }
+
+    public function testGetCurrentUserWithProxy()
+    {
+        $proxy = $this->getTestString();
+        $payload = $this->getSuccessPayload();
+        $this->prepareFor("GET", "/members/me", "", $payload, 200, $proxy);
+
+        $this->client->addConfig('proxy', $proxy);
+
+        $result = $this->client->getCurrentUser();
+
+        $this->client->addConfig('proxy', null);
+
+        $this->assertExpectedEqualsResult($payload, $result);
+    }
 }