Get W3C session ID

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -255,9 +255,12 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
 
         $sessionId = isset($result['sessionId'])
            ? $result['sessionId']
-           : (isset($value['webdriver.remote.sessionid'])
-               ? $value['webdriver.remote.sessionid']
-               : null
+           : (isset($value['sessionId'])
+               ? $value['sessionId']
+               : (isset($value['webdriver.remote.sessionid'])
+                   ? $value['webdriver.remote.sessionid']
+                   : null
+               )
            );
 
         return array(

lib/WebDriver/Browser.php

@@ -32,22 +32,24 @@ final class Browser
 {
     /**
      * Check browser names used in static functions in the selenium source:
-     * @see http://code.google.com/p/selenium/source/browse/java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java
-     *
-     * Note: Capability array takes these browserNames and not the "browserTypes"
+     * @see https://github.com/SeleniumHQ/selenium/blob/trunk/java/client/src/org/openqa/selenium/remote/BrowserType.java
      *
      * Also check
      * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Capabilities_JSON_Object
      */
     const ANDROID           = 'android';
     const CHROME            = 'chrome';
+    const EDGE              = 'edge';
+    const EDGEHTML          = 'EdgeHTML';
     const FIREFOX           = 'firefox';
     const HTMLUNIT          = 'htmlunit';
     const IE                = 'internet explorer';
     const INTERNET_EXPLORER = 'internet explorer';
     const IPHONE            = 'iPhone';
     const IPAD              = 'iPad';
+    const MSEDGE            = 'MicrosoftEdge';
     const OPERA             = 'opera';
+    const OPERA_BLINK       = 'operablink';
     const PHANTOMJS         = 'phantomjs';
     const SAFARI            = 'safari';
 }

lib/WebDriver/Session.php

@@ -249,6 +249,8 @@ public function window()
      * - $session->legacyWindow($name) - set focus
      * - $session->legacyWindow($window_handle)->method() - chaining
      *
+     * @deprecated
+     *
      * @return \WebDriver\LegacyWindow|\WebDriver\Session
      */
     public function legacyWindow()

lib/WebDriver/WebDriver.php

@@ -47,21 +47,34 @@ protected function methods()
      */
     public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabilities = array())
     {
-        // for backwards compatibility when the only required capability was browser name
-        if (! is_array($requiredCapabilities)) {
-            $desiredCapabilities[Capability::BROWSER_NAME] = $requiredCapabilities ?: Browser::FIREFOX;
+        if ($this->legacy) {
+            // for backwards compatibility when the only required capability was browser name
+            if (! is_array($requiredCapabilities)) {
+                $desiredCapabilities[Capability::BROWSER_NAME] = $requiredCapabilities ?: Browser::FIREFOX;
 
-            $requiredCapabilities = array();
-        }
+                $requiredCapabilities = array();
+            }
 
-        // required
-        $parameters = array(
-            'desiredCapabilities' => array_merge($desiredCapabilities, $requiredCapabilities)
-        );
+            // required
+            $parameters = array(
+                'desiredCapabilities' => array_merge($desiredCapabilities, $requiredCapabilities)
+            );
 
-        // optional
-        if (! empty($requiredCapabilities)) {
-            $parameters['requiredCapabilities'] = $requiredCapabilities;
+            // optional
+            if (! empty($requiredCapabilities)) {
+                $parameters['requiredCapabilities'] = $requiredCapabilities;
+            }
+        } else {
+            if (! is_array($requiredCapabilities)) {
+                $parameters = array(
+                    'capabilities' => array(
+                        'firstMatch' => array(
+                            array('browserName' => Browser::CHROME),
+                            array('browserName' => Browser::FIREFOX)
+                        )
+                    )
+                );
+            }
         }
 
         $result = $this->curl(
@@ -85,10 +98,9 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi
      */
     public function sessions()
     {
-        $result   = $this->curl('GET', '/sessions');
+        $result = $this->curl('GET', '/sessions');
         $sessions = array();
 
-        // @todo initialize $this->legacy if sessions() is called before session()
         foreach ($result['value'] as $session) {
             $sessions[] = new Session($this->url . '/session/' . $session['id'], $this->legacy);
         }

lib/WebDriver/WebDriverInterface.php

@@ -42,8 +42,11 @@ interface WebDriverInterface
     public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabilities = array());
 
     /**
+     * Get Sessions: /sessions (GET)
      * Get list of currently active sessions
      *
+     * @deprecated
+     *
      * @return array an array of \WebDriver\Session objects
      */
     public function sessions();