W3C Compatability Fixes

.github/workflows/tests.yml

@@ -5,8 +5,9 @@ on:
   pull_request:
   workflow_dispatch:
 
-env:
-  DRIVER_URL: "http://localhost:4444/wd/hub"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 defaults:
   run:
@@ -43,6 +44,7 @@ jobs:
     strategy:
       matrix:
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        selenium: ['2.53.1', 'latest']
       fail-fast: false
 
     steps:
@@ -71,16 +73,26 @@ jobs:
 
       - name: Start Selenium
         run: |
-          docker run --net host --name selenium --volume /dev/shm:/dev/shm --shm-size 2g selenium/standalone-firefox:2.53.1 &> ./logs/selenium.log &
+          docker run --net host --name selenium --volume /dev/shm:/dev/shm --shm-size 2g selenium/standalone-firefox:"${{ matrix.selenium }}" &> ./logs/selenium.log &
 
       - name: Wait for browser & PHP to start
         run: |
           while ! nc -z localhost 4444 </dev/null; do echo Waiting for remote driver to start...; sleep 1; done
           while ! nc -z localhost 8002 </dev/null; do echo Waiting for PHP server to start...; sleep 1; done
 
+      - name: Replace instaclick/php-webdriver for new selenium versions
+        run: |
+          if [ "${{ matrix.selenium }}" == "latest" ]; then
+            composer require lullabot/php-webdriver:dev-main
+          fi
+
       - name: Run tests
         run: |
-          vendor/bin/phpunit -v --coverage-clover=coverage.xml
+          if [ "${{ matrix.selenium }}" == "latest" ]; then
+            DRIVER_URL="http://localhost:4444" ./vendor/bin/phpunit -v --coverage-clover=coverage.xml
+          else
+            DRIVER_URL="http://localhost:4444/wd/hub" ./vendor/bin/phpunit -v --coverage-clover=coverage.xml
+          fi
 
       - name: Upload coverage
         uses: codecov/codecov-action@v2

src/Selenium2Driver.php

@@ -214,6 +214,23 @@ public static function getDefaultCapabilities()
         );
     }
 
+    /**
+     * Checks if the WebDriver session is W3C compatible.
+     *
+     * @return bool
+     *
+     * @throws UnknownCommand
+     */
+    public function isW3C() {
+        try {
+            // This method doesn't exist in older versions of php-webdriver.
+            /** @phpstan-ignore-next-line variable.undefined */
+            return $this->wdSession->isW3C();
+        } catch (UnknownCommand $e) {
+            return false;
+        }
+    }
+
     /**
      * Makes sure that the Syn event library has been injected into the current page,
      * and return $this for a fluid interface,
@@ -317,10 +334,23 @@ private function executeJsOnElement(Element $element, string $script, bool $sync
     {
         $script  = str_replace('{{ELEMENT}}', 'arguments[0]', $script);
 
-        $options = array(
-            'script' => $script,
-            'args'   => array($element),
-        );
+        if ($this->isW3C()) {
+            $options = array(
+                'script' => $script,
+                'args'   => [
+                    [
+                        'ELEMENT' => $element->getID(),
+                        'element-6066-11e4-a52e-4f735466cecf' => $element->getID(),
+                    ]
+                ],
+            );
+        }
+        else {
+            $options = [
+                'script' => $script,
+                'args'   => [['ELEMENT' => $element->getID()]],
+            ];
+        }
 
         if ($sync) {
             return $this->getWebDriverSession()->execute($options);
@@ -549,6 +579,11 @@ public function getAttribute(string $xpath, string $name)
     public function getValue(string $xpath)
     {
         $element = $this->findElement($xpath);
+        if ($this->isW3C()) {
+            // This method doesn't exist in older versions of php-webdriver.
+            /** @phpstan-ignore-next-line variable.undefined */
+            return $element->property('value');
+        }
         $elementName = strtolower($element->name());
         $elementType = strtolower($element->attribute('type') ?: '');
 
@@ -658,7 +693,12 @@ public function setValue(string $xpath, $value)
                     throw new DriverException('Only string values can be used for a file input.');
                 }
 
-                $element->postValue(array('value' => array(strval($value))));
+                if ($this->isW3C()) {
+                    $element->postValue(array('text' => $value));
+                }
+                else {
+                    $element->postValue(array('value' => array($value)));
+                }
 
                 return;
             }
@@ -675,7 +715,12 @@ public function setValue(string $xpath, $value)
             $value = str_repeat(Key::BACKSPACE . Key::DELETE, $existingValueLength) . $value;
         }
 
-        $element->postValue(array('value' => array($value)));
+        if ($this->isW3C()) {
+            $element->postValue(array('text' => $value));
+        }
+        else {
+            $element->postValue(array('value' => array($value)));
+        }
         // Remove the focus from the element if the field still has focus in
         // order to trigger the change event. By doing this instead of simply
         // triggering the change event for the given xpath we ensure that the
@@ -800,7 +845,12 @@ public function attachFile(string $xpath, string $path)
           $remotePath = $path;
         }
 
-        $element->postValue(array('value' => array($remotePath)));
+        if ($this->isW3C()) {
+            $element->postValue(array('text' => $remotePath));
+        }
+        else {
+            $element->postValue(array('value' => array($remotePath)));
+        }
     }
 
     public function isVisible(string $xpath)
@@ -921,11 +971,20 @@ public function wait(int $timeout, string $condition)
 
     public function resizeWindow(int $width, int $height, ?string $name = null)
     {
-        $window = $this->getWebDriverSession()->window($name ?: 'current');
-        \assert($window instanceof Window);
-        $window->postSize(
-            array('width' => $width, 'height' => $height)
-        );
+        if ($this->isW3C()) {
+            // This method doesn't exist in older versions of php-webdriver.
+            /** @phpstan-ignore-next-line variable.undefined */
+            $this->wdSession->window($name ? $name : 'current')->postRect(
+                array('width' => $width, 'height' => $height)
+            );
+        }
+        else {
+            $window = $this->getWebDriverSession()->window($name ?: 'current');
+            \assert($window instanceof Window);
+            $window->postSize(
+                array('width' => $width, 'height' => $height)
+            );
+        }
     }
 
     public function submitForm(string $xpath)