Add support for execute args

minkphp · Apr 15, 2022 · b37c535 · b37c535
1 parent 19e5890
commit b37c535
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/Driver/CoreDriver.php b/src/Driver/CoreDriver.php
@@ -428,23 +428,23 @@ public function dragTo($sourceXpath, $destinationXpath)
     /**
      * {@inheritdoc}
      */
-    public function executeScript($script)
+    public function executeScript($script, array $args = [])
     {
         throw new UnsupportedDriverActionException('JS is not supported by %s', $this);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function evaluateScript($script)
+    public function evaluateScript($script, array $args = [])
     {
         throw new UnsupportedDriverActionException('JS is not supported by %s', $this);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function wait($timeout, $condition)
+    public function wait($timeout, $condition, array $args = [])
     {
         throw new UnsupportedDriverActionException('JS is not supported by %s', $this);
     }

diff --git a/src/Driver/DriverInterface.php b/src/Driver/DriverInterface.php
@@ -569,11 +569,12 @@ public function dragTo($sourceXpath, $destinationXpath);
      * Executes JS script.
      *
      * @param string $script
+     * @param array  $args
      *
      * @throws UnsupportedDriverActionException When operation not supported by the driver
      * @throws DriverException                  When the operation cannot be done
      */
-    public function executeScript($script);
+    public function executeScript($script, array $args = []);
 
     /**
      * Evaluates JS script.
@@ -582,26 +583,28 @@ public function executeScript($script);
      * must accept the expression both with and without the keyword.
      *
      * @param string $script
+     * @param array  $args
      *
      * @return mixed
      *
      * @throws UnsupportedDriverActionException When operation not supported by the driver
      * @throws DriverException                  When the operation cannot be done
      */
-    public function evaluateScript($script);
+    public function evaluateScript($script, array $args = []);
 
     /**
      * Waits some time or until JS condition turns true.
      *
      * @param int    $timeout   timeout in milliseconds
      * @param string $condition JS condition
+     * @param array  $args
      *
      * @return bool
      *
      * @throws UnsupportedDriverActionException When operation not supported by the driver
      * @throws DriverException                  When the operation cannot be done
      */
-    public function wait($timeout, $condition);
+    public function wait($timeout, $condition, array $args = []);
 
     /**
      * Set the dimensions of the window.

diff --git a/src/Session.php b/src/Session.php
@@ -325,35 +325,38 @@ public function switchToIFrame($name = null)
      * Execute JS in browser.
      *
      * @param string $script javascript
+     * @param array  $args
      */
-    public function executeScript($script)
+    public function executeScript($script, array $args = [])
     {
-        $this->driver->executeScript($script);
+        $this->driver->executeScript($script, $args);
     }
 
     /**
      * Execute JS in browser and return its response.
      *
      * @param string $script javascript
+     * @param array  $args
      *
      * @return mixed
      */
-    public function evaluateScript($script)
+    public function evaluateScript($script, array $args = [])
     {
-        return $this->driver->evaluateScript($script);
+        return $this->driver->evaluateScript($script, $args);
     }
 
     /**
      * Waits some time or until JS condition turns true.
      *
      * @param int    $time      time in milliseconds
      * @param string $condition JS condition
+     * @param array  $args
      *
      * @return bool
      */
-    public function wait($time, $condition = 'false')
+    public function wait($time, $condition = 'false', array $args = [])
     {
-        return $this->driver->wait($time, $condition);
+        return $this->driver->wait($time, $condition, $args);
     }
 
     /**