Dependency injection; fixes #73

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -40,6 +40,13 @@ abstract class AbstractWebDriver
      */
     protected $url;
 
+    /**
+     * Curl service
+     *
+     * @var \WebDriver\Service\CurlService
+     */
+    private $curlService;
+
     /**
      * Return array of supported method names and corresponding HTTP request methods
      *
@@ -87,6 +94,26 @@ public function getURL()
         return $this->url;
     }
 
+    /**
+     * Set curl service
+     *
+     * @param \WebDriver\Service\CurlService $curlService
+     */
+    public function setCurlService($curlService)
+    {
+        $this->curlService = $curlService;
+    }
+
+    /**
+     * Get curl service
+     *
+     * @return \WebDriver\Service\CurlService
+     */
+    public function getCurlService()
+    {
+        return $this->curlService ?: ServiceFactory::getInstance()->getService('service.curl');
+    }
+
     /**
      * Curl request to webdriver server.
      *
@@ -120,7 +147,7 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             $url .= '/' . $parameters;
         }
 
-        list($rawResult, $info) = ServiceFactory::getInstance()->getService('service.curl')->execute($requestMethod, $url, $parameters, $extraOptions);
+        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, $extraOptions);
 
         $httpCode = $info['http_code'];
 

lib/WebDriver/SauceLabs/SauceRest.php

@@ -41,6 +41,13 @@ class SauceRest
      */
     private $accessKey;
 
+    /**
+     * Curl service
+     *
+     * @var \WebDriver\Service\CurlService
+     */
+    private $curlService;
+
     /**
      * Constructor
      *
@@ -53,6 +60,26 @@ public function __construct($userId, $accessKey)
         $this->accessKey = $accessKey;
     }
 
+    /**
+     * Set curl service
+     *
+     * @param \WebDriver\Service\CurlService $curlService
+     */
+    public function setCurlService($curlService)
+    {
+        $this->curlService = $curlService;
+    }
+
+    /**
+     * Get curl service
+     *
+     * @return \WebDriver\Service\CurlService
+     */
+    public function getCurlService()
+    {
+        return $this->curlService ?: ServiceFactory::getInstance()->getService('service.curl');
+    }
+
     /**
      * Execute Sauce Labs REST API command
      *
@@ -82,7 +109,7 @@ protected function execute($requestMethod, $url, $parameters = null)
 
         $url = 'https://saucelabs.com/rest/v1/' . $url;
 
-        list($rawResult, $info) = ServiceFactory::getInstance()->getService('service.curl')->execute($requestMethod, $url, $parameters, $extraOptions);
+        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, $extraOptions);
 
         return json_decode($rawResult, true);
     }

lib/WebDriver/Service/CurlService.php

@@ -32,6 +32,21 @@
  */
 class CurlService implements CurlServiceInterface
 {
+    /**
+     * @var array
+     */
+    private $defaultOptions;
+
+    /**
+     * Constructor
+     *
+     * @param array $defaultOptions
+     */
+    public function __construct($defaultOptions = array())
+    {
+        $this->defaultOptions = is_array($defaultOptions) ? $defaultOptions : array();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -82,7 +97,7 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
                 break;
         }
 
-        foreach ($extraOptions as $option => $value) {
+        foreach (array_merge($this->defaultOptions, $extraOptions) as $option => $value) {
             curl_setopt($curl, $option, $value);
         }