Merge pull request php-webdriver#92 from blackakula/master

Remove restriction from script execution

Author: whhone

lib/remote/RemoteWebDriver.php

@@ -152,32 +152,38 @@ public function quit() {
   }
 
   /**
-   * Inject a snippet of JavaScript into the page for execution in the context
-   * of the currently selected frame. The executed script is assumed to be
-   * synchronous and the result of evaluating the script will be returned.
+   * Prepare arguments for JavaScript injection
    *
-   * @param string $script The script to inject.
-   * @param array $arguments The arguments of the script.
-   * @return mixed The return value of the script.
+   * @param array $arguments
+   * @return array
    */
-  public function executeScript($script, array $arguments = array()) {
-    $script = str_replace('"', '\"', $script);
+  private function prepareScriptArguments(array $arguments)
+  {
     $args = array();
     foreach ($arguments as $arg) {
       if ($arg instanceof WebDriverElement) {
         array_push($args, array('ELEMENT' => $arg->getID()));
       } else {
-        // TODO: Handle the case where arg is a collection
         if (is_array($arg)) {
-          throw new Exception(
-            "executeScript with collection paramatar is unimplemented"
-          );
+          $arg = $this->prepareScriptArguments($arg);
         }
         array_push($args, $arg);
       }
     }
+    return $args;
+  }
 
-    $params = array('script' => $script, 'args' => $args);
+  /**
+   * Inject a snippet of JavaScript into the page for execution in the context
+   * of the currently selected frame. The executed script is assumed to be
+   * synchronous and the result of evaluating the script will be returned.
+   *
+   * @param string $script The script to inject.
+   * @param array $arguments The arguments of the script.
+   * @return mixed The return value of the script.
+   */
+  public function executeScript($script, array $arguments = array()) {
+    $params = array('script' => $script, 'args' => $this->prepareScriptArguments($arguments));
     $response = $this->executor->execute('executeScript', $params);
     return $response;
   }