Updates for w3c compatability (#5)

Author: justafish

lib/WebDriver/Service/CurlService.php

@@ -41,8 +41,8 @@ public function __construct($defaultOptions = array())
     public function execute($requestMethod, $url, $parameters = null, $extraOptions = array())
     {
         $customHeaders = array(
-            'Content-Type: application/json;charset=UTF-8',
-            'Accept: application/json;charset=UTF-8',
+            'Content-Type: application/json;charset=utf-8',
+            'Accept: application/json',
         );
 
         $curl = curl_init($url);
@@ -56,7 +56,8 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
                 if ($parameters && is_array($parameters)) {
                     curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($parameters));
                 } else {
-                    $customHeaders[] = 'Content-Length: 0';
+                    curl_setopt($curl, CURLOPT_POSTFIELDS, "{}");
+                    $customHeaders[] = 'Content-Length: 2';
 
                     // Suppress "Transfer-Encoding: chunked" header automatically added by cURL that
                     // causes a 400 bad request (bad content-length).
@@ -78,7 +79,8 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
                 if ($parameters && is_array($parameters)) {
                     curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($parameters));
                 } else {
-                    $customHeaders[] = 'Content-Length: 0';
+                    curl_setopt($curl, CURLOPT_POSTFIELDS, "{}");
+                    $customHeaders[] = 'Content-Length: 2';
 
                     // Suppress "Transfer-Encoding: chunked" header automatically added by cURL that
                     // causes a 400 bad request (bad content-length).

lib/WebDriver/WebDriver.php

@@ -38,14 +38,41 @@ protected function methods()
     /**
      * {@inheritdoc}
      */
-    public function session($browserName = Browser::FIREFOX, $desiredCapabilities = null, $requiredCapabilities = null)
+    public function session($browserName = Browser::FIREFOX, $desiredCapabilities = array(), $requiredCapabilities = array())
     {
-        // default to W3C WebDriver API
+        // Filter capabilities.
+        $filterCapabilites = function($key) {
+          // See https://github.com/jlipps/simple-wd-spec#capabilities
+          if (str_contains($key, ':')) {
+            return true;
+          }
+
+          return in_array($key, [
+            'browserName',
+            'browserVersion',
+            'platformName',
+            'acceptInsecureCerts',
+            'pageLoadStrategy',
+            'proxy',
+            'setWindowRect',
+            'timeouts',
+            'timeouts',
+          ]);
+        };
+
+        $w3c_mode = true;
+        if (isset($desiredCapabilities['w3c']) && $desiredCapabilities['w3c'] === false) {
+          $w3c_mode = false;
+        }
+
+        if ($w3c_mode) {
+          $requiredCapabilities = array_filter($requiredCapabilities, $filterCapabilites, ARRAY_FILTER_USE_KEY);
+          $desiredCapabilities = array_filter($desiredCapabilities, $filterCapabilites, ARRAY_FILTER_USE_KEY);
+        }
+
         $firstMatch = $desiredCapabilities ?: array();
         $firstMatch['browserName'] = $browserName;
-
         $parameters = array('capabilities' => array('firstMatch' => [$firstMatch]));
-
         if (is_array($requiredCapabilities) && count($requiredCapabilities)) {
             $parameters['capabilities']['alwaysMatch'] = $requiredCapabilities;
         }
@@ -77,7 +104,6 @@ public function session($browserName = Browser::FIREFOX, $desiredCapabilities =
         }
 
         $this->capabilities = isset($result['value']['capabilities']) ? $result['value']['capabilities'] : null;
-
         $session = new Session($result['sessionUrl'], $this->capabilities);
 
         return $session;