Merge pull request #66 from tim-massey/options

pilot · pilot · commit e55c465f1eea · 2013-08-30T14:41:55.000-07:00
Fixes bug where supplied option for timeout was ignored in constructor.
diff --git a/lib/Github/HttpClient/HttpClient.php b/lib/Github/HttpClient/HttpClient.php
@@ -55,7 +55,8 @@ class HttpClient implements HttpClientInterface
     public function __construct(array $options = array(), ClientInterface $client = null)
     {
         $client = $client ?: new Curl();
-        $client->setTimeout($this->options['timeout']);
+        $timeout = isset($options['timeout']) ? $options['timeout'] : $this->options['timeout'];
+        $client->setTimeout($timeout);
         $client->setVerifyPeer(false);
 
         $this->options = array_merge($this->options, $options);

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ class HttpClient implements HttpClientInterface`
`55`	`55`	`public function __construct(array $options = array(), ClientInterface $client = null)`
`56`	`56`	`{`
`57`	`57`	`$client = $client ?: new Curl();`
`58`		`- $client->setTimeout($this->options['timeout']);`
	`58`	`+ $timeout = isset($options['timeout']) ? $options['timeout'] : $this->options['timeout'];`
	`59`	`+ $client->setTimeout($timeout);`
`59`	`60`	`$client->setVerifyPeer(false);`
`60`	`61`
`61`	`62`	`$this->options = array_merge($this->options, $options);`