add $session->isW3C() and flip the $legacy logic

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -295,7 +295,8 @@ public function __call($name, $arguments)
         if (preg_match('/^(get|post|delete)/', $name, $matches)) {
             $requestMethod = strtoupper($matches[0]);
             $webdriverCommand = strtolower(substr($name, strlen($requestMethod)));
-            $dontcare = getRequestMethod($webDriverCommand); // validation
+
+            $this->getRequestMethod($webdriverCommand); // validation
         } else {
             $webdriverCommand = $name;
             $requestMethod = $this->getRequestMethod($webdriverCommand);

lib/WebDriver/Container.php

@@ -32,7 +32,8 @@ public function __construct($url)
     {
         parent::__construct($url);
 
-        $locatorStrategy  = new \ReflectionClass('WebDriver\LocatorStrategy');
+        $locatorStrategy = new \ReflectionClass('WebDriver\LocatorStrategy');
+
         $this->strategies = $locatorStrategy->getConstants();
     }
 

lib/WebDriver/Exception.php

@@ -185,7 +185,7 @@ public static function factory($code, $message = null, $previousException = null
 
         $errorDefinition = self::$errs[$code];
 
-        if (trim($message) === '') {
+        if ($message === null || trim($message) === '') {
             $message = $errorDefinition[1];
         }
 

lib/WebDriver/Service/CurlService.php

@@ -99,7 +99,8 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
 
         curl_setopt($curl, CURLOPT_HTTPHEADER, $customHeaders);
 
-        $rawResult = trim(curl_exec($curl));
+        $rawResult = curl_exec($curl);
+        $rawResult = is_string($rawResult) ? trim($rawResult) : '';
 
         $info = curl_getinfo($curl);
         $info['request_method'] = $requestMethod;

lib/WebDriver/Session.php

@@ -60,7 +60,7 @@ class Session extends Container
     /**
      * @var boolean
      */
-    private $legacy = null;
+    private $w3c = null;
 
     /**
      * {@inheritdoc}
@@ -114,6 +114,30 @@ protected function obsoleteMethods()
         );
     }
 
+    /**
+     * Constructor
+     *
+     * @param string     $url URL to Selenium server
+     * @param array|null $capabilities
+     */
+    public function __construct($url, $capabilities)
+    {
+        parent::__construct($url);
+
+        $this->capabilities = $capabilities;
+        $this->w3c          = !! $capabilities;
+    }
+
+    /**
+     * Is W3C webdriver?
+     *
+     * @return boolean
+     */
+    public function isW3C()
+    {
+        return $this->w3c;
+    }
+
     /**
      * Open URL: /session/:sessionId/url (POST)
      * An alternative to $session->url($url);
@@ -228,7 +252,7 @@ public function deleteCookie($cookieName)
      */
     public function getWindowHandle()
     {
-        $result = $this->curl('GET', $this->legacy ? '/window_handle' : '/window');
+        $result = $this->curl('GET', $this->w3c ? '/window' : '/window_handle');
 
         return $result['value'];
     }
@@ -274,7 +298,7 @@ public function window()
         }
 
         // chaining (with optional handle in $arg)
-        return $this->legacy ? new LegacyWindow($this->url . '/window', $arg) : new Window($this->url . '/window', $arg);
+        return $this->w3c ? new Window($this->url . '/window', $arg) : new LegacyWindow($this->url . '/window', $arg);
     }
 
     /**
@@ -359,7 +383,7 @@ public function timeouts()
             $type    = func_get_arg(0); // 'script', 'implicit', or 'pageLoad' (legacy: 'pageLoad')
             $timeout = func_get_arg(1); // timeout in milliseconds
 
-            $arg = $this->legacy ? array('type' => $type, 'ms' => $timeout) : array($type => $timeout);
+            $arg = $this->w3c ? array($type => $timeout) : array('type' => $type, 'ms' => $timeout);
 
             $this->curl('POST', '/timeouts', $arg);
 
@@ -489,7 +513,7 @@ public function execute()
     {
         // execute script
         if (func_num_args() > 0) {
-            $execute = $this->legacy ? new LegacyExecute($this->url) : new Execute($this->url . '/execute');
+            $execute = $this->w3c ? new Execute($this->url . '/execute') : new LegacyExecute($this->url);
             $result  = $execute->sync(func_get_arg(0));
 
             return $result;
@@ -507,32 +531,12 @@ public function execute()
      */
     public function execute_async()
     {
-        $execute = $this->legacy ? new LegacyExecute($this->url) : new Execute($this->url . '/execute');
+        $execute = $this->w3c ? new Execute($this->url . '/execute') : new LegacyExecute($this->url);
         $result  = $execute->async(func_get_arg(0));
 
         return $result;
     }
 
-    /**
-     * Set capabilities
-     *
-     * @param array $capabilities
-     */
-    public function setCapabilities($capabilities)
-    {
-        $this->capabilities = $capabilities;
-    }
-
-    /**
-     * Set legacy
-     *
-     * @param boolean $legacy
-     */
-    public function setLegacy($legacy)
-    {
-        $this->legacy = $legacy;
-    }
-
     /**
      * {@inheritdoc}
      */

lib/WebDriver/WebDriver.php

@@ -25,11 +25,6 @@ class WebDriver extends AbstractWebDriver implements WebDriverInterface
      */
     private $capabilities;
 
-    /**
-     * @var boolean
-     */
-    private $legacy;
-
     /**
      * {@inheritdoc}
      */
@@ -86,11 +81,8 @@ public function session($browserName = Browser::FIREFOX, $desiredCapabilities =
         }
 
         $this->capabilities = isset($result['value']['capabilities']) ? $result['value']['capabilities'] : null;
-        $this->legacy       = ! $this->capabilities; // initially
 
-        $session = new Session($result['sessionUrl']);
-        $session->setCapabilities($this->capabilities);
-        $session->setLegacy($this->legacy);
+        $session = new Session($result['sessionUrl'], $this->capabilities);
 
         return $session;
     }
@@ -109,9 +101,7 @@ public function sessions()
         $sessions = array();
 
         foreach ($result['value'] as $session) {
-            $session = new Session($this->url . '/session/' . $session['id']);
-            $session->setCapabilities($this->capabilities);
-            $session->setLegacy($this->legacy);
+            $session = new Session($this->url . '/session/' . $session['id'], $this->capabilities);
 
             $sessions[] = $session;
         }