Added http proxy and port vars to support tests running on a remote server that's behind a proxy

Author: jdq22

lib/Remote/HttpCommandExecutor.php

@@ -117,11 +117,20 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
 
   /**
    * @param string $url
+   * @param string|null $http_proxy
+   * @param int|null $http_proxy_port
    */
-  public function __construct($url) {
+  public function __construct($url, $http_proxy = null, $http_proxy_port = null) {
     $this->url = $url;
     $this->curl = curl_init();
 
+    if (!empty($http_proxy)) {
+      curl_setopt($this->curl, CURLOPT_PROXY, $http_proxy);
+      if (!empty($http_proxy_port)) {
+        curl_setopt($this->curl, CURLOPT_PROXYPORT, $http_proxy_port);
+      }
+    }
+
     // Get credentials from $url (if any)
     $matches = null;
     if (preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches)) {

lib/Remote/RemoteWebDriver.php

@@ -60,13 +60,17 @@ protected function __construct() {}
    * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
    * @param int|null $connection_timeout_in_ms
    * @param int|null $request_timeout_in_ms
+   * @param string|null $http_proxy The proxy to tunnel requests through
+   * @param int|null $http_proxy_port
    * @return RemoteWebDriver
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
     $connection_timeout_in_ms = null,
-    $request_timeout_in_ms = null
+    $request_timeout_in_ms = null,
+    $http_proxy = null,
+    $http_proxy_port = null
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
@@ -76,7 +80,7 @@ public static function create(
       $desired_capabilities = $desired_capabilities->toArray();
     }
 
-    $executor = new HttpCommandExecutor($url);
+    $executor = new HttpCommandExecutor($url, $http_proxy, $http_proxy_port);
     if ($connection_timeout_in_ms !== null) {
       $executor->setConnectionTimeout($connection_timeout_in_ms);
     }