Fix error/exception handling

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -228,7 +228,7 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             );
         }
 
-        if (is_array($result) && ! array_key_exists('status', $result) && ! isset($result['value']['ready']) && ! isset($result['value']['error'])) {
+        if (is_array($result) && ! array_key_exists('status', $result) && ! array_key_exists('value', $result)) {
             throw WebDriverException::factory(
                 WebDriverException::CURL_EXEC,
                 'Payload received from webdriver is valid but unexpected json: ' . substr($rawResult, 0, 1000)
@@ -253,13 +253,6 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             );
         }
 
-        if (isset($value['ready']) && $value['ready'] !== true) {
-            throw WebDriverException::factory(
-                WebDriverException::CURL_EXEC,
-                $message
-            );
-        }
-
         $sessionId = isset($result['sessionId'])
            ? $result['sessionId']
            : (isset($value['webdriver.remote.sessionid'])

lib/WebDriver/Exception.php

@@ -87,6 +87,7 @@ abstract class Exception extends \Exception
     const UNEXPECTED_PARAMETERS = -5;
     const INVALID_REQUEST = -6;
     const UNKNOWN_LOCATOR_STRATEGY = -7;
+    const W3C_WEBDRIVER_ERROR = -8;
 
     private static $errs = array(
 //      self::SUCCESS => array('Success', 'This should never be thrown!'),
@@ -178,6 +179,10 @@ public static function factory($code, $message = null, $previousException = null
             $message = $errorDefinition[1];
         }
 
+        if (! is_numeric($code)) {
+            $code = self::W3C_WEBDRIVER_ERROR;
+        }
+
         $className = __CLASS__ . '\\' . $errorDefinition[0];
 
         return new $className($message, $code, $previousException);