Merge pull request #348 from stof/drop_old_deps

Drop support for PHP <7.2

Author: stof

.github/workflows/tests.yml

@@ -18,10 +18,8 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
       fail-fast: false
-    env:
-      MATRIX_PHP: ${{ matrix.php }}
 
     steps:
       - name: Checkout
@@ -38,20 +36,13 @@ jobs:
           # PHP 7.1 development web server segfaults if timezone not set.
           ini-values: date.timezone=Europe/Paris, error_reporting=-1, display_errors=On
 
-      - name: Configure for PHP >= 7.1
-        if: "${{ matrix.php >= '7.1' }}"
-        run: |
-          composer require --no-update --dev symfony/error-handler "^4.4 || ^5.0"
-
       - name: Install dependencies
         run: |
           composer update --no-interaction --prefer-dist
 
       - name: Setup Mink test server
-        # PHP 7.1 development web server segfaults if USE_ZEND_ALLOC not set to 0.
         run: |
           mkdir ./logs
-          export USE_ZEND_ALLOC=0
           ./vendor/bin/mink-test-server &> ./logs/mink-test-server.log &
 
       - name: Start Selenium

composer.json

@@ -19,12 +19,15 @@
         }
     ],
     "require": {
-        "php":                       ">=5.4",
-        "behat/mink":                "~1.7@dev",
-        "instaclick/php-webdriver":  "~1.1"
+        "php":                       ">=7.2",
+        "ext-json": "*",
+        "behat/mink":                "^1.9@dev",
+        "instaclick/php-webdriver":  "^1.4"
     },
     "require-dev": {
-        "mink/driver-testsuite": "dev-master"
+        "mink/driver-testsuite": "dev-master",
+        "phpunit/phpunit": "^8.5.22 || ^9.5.11",
+        "symfony/error-handler": "^4.4 || ^5.0"
     },
 
     "autoload": {

phpunit.xml.dist

@@ -30,4 +30,8 @@
             <directory>./src</directory>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
 </phpunit>

src/Selenium2Driver.php

@@ -17,7 +17,6 @@
 use WebDriver\Exception\StaleElementReference;
 use WebDriver\Exception\UnknownCommand;
 use WebDriver\Exception\UnknownError;
-use WebDriver\Exception;
 use WebDriver\Key;
 use WebDriver\WebDriver;
 
@@ -416,7 +415,7 @@ public function back()
      */
     public function switchToWindow($name = null)
     {
-        $this->wdSession->focusWindow($name ? $name : '');
+        $this->wdSession->focusWindow($name ?: '');
     }
 
     /**
@@ -800,7 +799,7 @@ private function clickOnElement(Element $element)
         } catch (UnknownCommand $e) {
             // If the Webdriver implementation does not support moveto (which is not part of the W3C WebDriver spec), proceed to the click
         } catch (UnknownError $e) {
-            // Chromium driver sends back UnknowError (WebDriver\Exception with code 13)
+            // Chromium driver sends back UnknownError (WebDriver\Exception with code 13)
         }
 
         $element->click();
@@ -1226,17 +1225,10 @@ private function uploadFile($path)
           if (empty($remotePath)) {
             throw new UnknownError();
           }
-        } catch (\Exception $e) {
-          // Catch any error so we can still clean up the temporary archive.
-        }
-
-        unlink($tempFilename);
-
-        if (isset($e)) {
-          throw $e;
+        } finally {
+            unlink($tempFilename);
         }
 
         return $remotePath;
     }
-
 }

tests/Custom/DesiredCapabilitiesTest.php

@@ -4,14 +4,9 @@
 
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Tests\Driver\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class DesiredCapabilitiesTest extends TestCase
 {
-    use AssertIsType;
-    use ExpectException;
-
     public function testGetDesiredCapabilities()
     {
         $caps = array(

tests/Custom/TimeoutTest.php

@@ -3,12 +3,9 @@
 namespace Behat\Mink\Tests\Driver\Custom;
 
 use Behat\Mink\Tests\Driver\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class TimeoutTest extends TestCase
 {
-    use ExpectException;
-
     /**
      * @after
      */

tests/Custom/WindowNameTest.php

@@ -3,12 +3,9 @@
 namespace Behat\Mink\Tests\Driver\Custom;
 
 use Behat\Mink\Tests\Driver\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType;
 
 class WindowNameTest extends TestCase
 {
-    use AssertIsType;
-
     public function testWindowNames()
     {
         $session = $this->getSession();