Fixes #105 - fix curl option array and w3c property

- option arrays must be merge with `array_replace` to keep correct keys (index)
- property `transientOptions` can be `null`
- property `$w3c` must be protected

Author: kadse

lib/WebDriver/AbstractWebDriver.php

@@ -43,7 +43,7 @@ abstract class AbstractWebDriver
     /**
      * @var boolean
      */
-    private $w3c;
+    protected $w3c;
 
     /**
      * Curl service
@@ -86,6 +86,7 @@ public function __construct($url = 'http://localhost:4444/wd/hub', $w3c = false)
     {
         $this->url = $url;
         $this->w3c = $w3c;
+        $this->transientOptions = array();
     }
 
     /**
@@ -138,6 +139,14 @@ public function setTransientOptions($transientOptions)
         $this->transientOptions = is_array($transientOptions) ? $transientOptions : array();
     }
 
+    /**
+     * @return array
+     */
+    public function getTransientOptions()
+    {
+        return $this->transientOptions;
+    }
+
     /**
      * Is w3c driver?
      *
@@ -181,7 +190,7 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             $url .= '/' . $parameters;
         }
 
-        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, array_merge($extraOptions, $this->transientOptions));
+        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, array_replace($extraOptions, $this->transientOptions));
 
         $this->transientOptions = array();
 

lib/WebDriver/SauceLabs/SauceRest.php

@@ -127,7 +127,7 @@ protected function execute($requestMethod, $url, $parameters = null, $extraOptio
 
         $url = 'https://saucelabs.com/rest/v1/' . $url;
 
-        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, array_merge($extraOptions, $this->transientOptions));
+        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, array_replace($extraOptions, $this->transientOptions));
 
         $this->transientOptions = array();
 

lib/WebDriver/Service/CurlService.php

@@ -105,7 +105,7 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
                 break;
         }
 
-        foreach (array_merge($this->defaultOptions, $extraOptions) as $option => $value) {
+        foreach (array_replace($this->defaultOptions, $extraOptions) as $option => $value) {
             curl_setopt($curl, $option, $value);
         }