Fixes new proxy code

lib/Buzz/Client/AbstractClient.php

@@ -3,13 +3,15 @@
 namespace Buzz\Client;
 
 use Buzz\Message;
+use Buzz\Util;
 
 abstract class AbstractClient
 {
     protected $ignoreErrors = true;
     protected $maxRedirects = 5;
     protected $timeout = 5;
     protected $verifyPeer = true;
+    protected $proxy;
 
     public function setIgnoreErrors($ignoreErrors)
     {
@@ -50,4 +52,14 @@ public function getVerifyPeer()
     {
         return $this->verifyPeer;
     }
+
+    public function setProxy(Util\Url $proxy)
+    {
+        $this->proxy = $proxy;
+    }
+
+    public function getProxy()
+    {
+        return $this->proxy;
+    }
 }

lib/Buzz/Client/AbstractStream.php

@@ -15,7 +15,7 @@ abstract class AbstractStream extends AbstractClient
      */
     public function getStreamContextArray(Message\Request $request)
     {
-        return array(
+        $options = array(
             'http' => array(
                 // values from the request
                 'method'           => $request->getMethod(),
@@ -32,5 +32,43 @@ public function getStreamContextArray(Message\Request $request)
                 'verify_peer'      => $this->getVerifyPeer(),
             ),
         );
+
+        if ($proxyOption = $this->getProxyOption()) {
+            $options['http']['proxy'] = $proxyOption;
+            $options['http']['request_fulluri'] = true;
+        }
+
+        return $options;
+    }
+
+    protected function getProxyOption()
+    {
+        if (!$this->getProxy()) {
+            return null;
+        }
+
+        if ($user = $this->getProxy()->getUser()) {
+            if ($password = $this->getProxy()->getPassword()) {
+                $proxyAuth = $user.':'.$password.'@';
+            } else {
+                $proxyAuth = $user.'@';
+            }
+        } else {
+            $proxyAuth = '';
+        }
+
+        // We actually need the port otherwise stream croaks. Had initially
+        // tried proxy->getHost() and it did not work since it removed the
+        // port it matched the scheme default.
+        $proxy = $this->proxy->getHostname() . ':' . $this->proxy->getPort();
+
+        if ('htttps' === $this->proxy->getScheme()) {
+            if (!extension_loaded('openssl')) {
+                throw new \RuntimeException('You must enable the openssl extension to use a proxy over https');
+            }
+            return 'ssl://'.$proxyAuth.$proxy;
+        }
+
+        return 'tcp://'.$proxyAuth.$proxy;
     }
 }

lib/Buzz/Client/Curl.php

@@ -140,6 +140,21 @@ protected function prepare(Message\Request $request, Message\Response $response,
         curl_setopt($curl, CURLOPT_MAXREDIRS, $this->maxRedirects);
         curl_setopt($curl, CURLOPT_FAILONERROR, !$this->ignoreErrors);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifyPeer);
+
+        if ($proxy = $this->getProxy()) {
+            // We actually need the port otherwise curl croaks. Had initially
+            // tried proxy->getHost() and it did not work since it removed the
+            // port it matched the scheme default.
+            curl_setopt($curl, CURLOPT_PROXY, $proxy->getHost().':'.$proxy->getPort());
+            if ($user = $proxy->getUser()) {
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $user.':'.$proxy->getPassword());
+            } else {
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, null);
+            }
+        } else {
+            curl_setopt($curl, CURLOPT_PROXY, null);
+            curl_setopt($curl, CURLOPT_PROXYUSERPWD, null);
+        }
     }
 
     public function __destruct()

lib/Buzz/Util/Url.php

@@ -29,6 +29,17 @@ public function __construct($url)
             $components['path'] = '/'.$path;
         }
 
+        if (isset($components['scheme']) && !isset($components['port'])) {
+            switch($components['scheme']) {
+                case 'http':
+                    $components['port'] = 80;
+                    break;
+                case 'https':
+                    $components['port'] = 443;
+                    break;
+            }
+        }
+
         $this->url = $url;
         $this->components = $components;
     }