fix issue #38 - fix capabilities handling

Author: robocoder

lib/WebDriver/WebDriver.php

@@ -45,33 +45,34 @@ protected function methods()
      * New Session: /session (POST)
      * Get session object for chaining
      *
-     * @param mixed $requiredCapabilities Required capabilities (or browser name)
-     * @param array $desiredCapabilities  Desired capabilities
+     * @param array|string $requiredCapabilities Required capabilities (or browser name)
+     * @param array        $desiredCapabilities  Desired capabilities
      *
      * @return \WebDriver\Session
      */
     public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabilities = array())
     {
-        if (!is_array($desiredCapabilities)) {
-            $desiredCapabilities = array();
+        // for backwards compatibility when the only required capability was browser name
+        if (! is_array($requiredCapabilities)) {
+            $desiredCapabilities[Capability::BROWSER_NAME] = $requiredCapabilities ?: Browser::FIREFOX;
+
+            $requiredCapabilities = array();
         }
 
-        if (!is_array($requiredCapabilities)) {
-            $desiredCapabilities = array_merge(
-                $desiredCapabilities,
-                array(Capability::BROWSER_NAME => $requiredCapabilities)
-            );
+        // required
+        $parameters = array(
+            'desiredCapabilities' => array_merge($desiredCapabilities, $requiredCapabilities)
+        );
 
-            $requiredCapabilities = array();
+        // optional
+        if ( ! empty($requiredCapabilities)) {
+            $parameters['requiredCapabilities'] = $requiredCapabilities;
         }
 
         $results = $this->curl(
             'POST',
             '/session',
-            array(
-                'desiredCapabilities' => $desiredCapabilities,
-                'requiredCapabilities' => $requiredCapabilities,
-            ),
+            $parameters,
             array(CURLOPT_FOLLOWLOCATION => true)
         );