Merge pull request #325 from alexpott/wait-rtrim

stof · web-flow · commit 06af99850faf · 2020-10-28T10:49:02.000+01:00
Trim trailing semi-colons for BC
diff --git a/src/Selenium2Driver.php b/src/Selenium2Driver.php
@@ -972,7 +972,7 @@ public function evaluateScript($script)
      */
     public function wait($timeout, $condition)
     {
-        $script = 'return (' . $condition . ');';
+        $script = 'return (' . rtrim($condition, " \t\n\r;") . ');';
         $start = microtime(true);
         $end = $start + $timeout / 1000.0;
 

Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,7 @@ public function evaluateScript($script)`
`972`	`972`	`*/`
`973`	`973`	`public function wait($timeout, $condition)`
`974`	`974`	`{`
`975`		`- $script = 'return (' . $condition . ');';`
	`975`	`+ $script = 'return (' . rtrim($condition, " \t\n\r;") . ');';`
`976`	`976`	`$start = microtime(true);`
`977`	`977`	`$end = $start + $timeout / 1000.0;`
`978`	`978`