Merge pull request #819 from stof/drop_old_versions

stof · web-flow · commit 4ce8a28f8a2e · 2022-01-19T23:52:19.000+01:00
Drop support for PHP &lt;7.2 and old Symfony versions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,16 +12,16 @@ jobs:
 
   tests:
     name: Tests
-    runs-on: Ubuntu-20.04
+    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']
         composer_flags: [ '' ]
         minimum_stability: [ '' ]
         symfony_deprecations_helper: [ '' ]
         include:
-          - php: '7.1'
+          - php: '7.2'
             composer_flags: '--prefer-lowest --prefer-stable'
             symfony_deprecations_helper: weak
           - php: '8.0'
@@ -48,11 +48,6 @@ jobs:
         run: |
           composer config minimum-stability dev
 
-      - 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 ${{ matrix.composer_flags }}
diff --git a/composer.json b/composer.json
@@ -15,20 +15,18 @@
     ],
 
     "require": {
-        "php":                   ">=5.4",
-        "symfony/css-selector":  "^2.7|^3.0|^4.0|^5.0|^6.0"
+        "php":                   ">=7.2",
+        "symfony/css-selector":  "^4.4 || ^5.0 || ^6.0"
     },
 
     "require-dev": {
-        "symfony/debug": "^2.7|^3.0|^4.0|^5.0|^6.0",
-        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5 || ^9.5",
-        "symfony/phpunit-bridge": "^3.4.38 || ^4.4 || ^5.0.5 || ^6.0",
-        "yoast/phpunit-polyfills": "^1.0"
+        "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
+        "phpunit/phpunit": "^8.5.22 || ^9.5.11",
+        "symfony/phpunit-bridge": "^5.4 || ^6.0"
     },
 
     "suggest": {
-        "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-        "behat/mink-goutte-driver":     "fast headless driver for any app without JS emulation",
+        "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation",
         "behat/mink-selenium2-driver":  "slow, but JS-enabled driver for any app (requires Selenium2)",
         "dmore/chrome-mink-driver":     "fast and JS-enabled driver for any app (requires chromium or google chrome)",
         "behat/mink-zombie-driver":     "fast and JS-enabled headless driver for any app (requires node.js)"
diff --git a/src/Selector/CssSelector.php b/src/Selector/CssSelector.php
@@ -10,7 +10,6 @@
 
 namespace Behat\Mink\Selector;
 
-use Symfony\Component\CssSelector\CssSelector as CSS;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 
 /**
@@ -33,14 +32,8 @@ public function translateToXPath($locator)
             throw new \InvalidArgumentException('The CssSelector expects to get a string as locator');
         }
 
-        // Symfony 2.8+ API
-        if (class_exists('Symfony\Component\CssSelector\CssSelectorConverter')) {
-            $converter = new CssSelectorConverter();
+        $converter = new CssSelectorConverter();
 
-            return $converter->toXPath($locator);
-        }
-
-        // old static API for Symfony 2.7 and older
-        return CSS::toXPath($locator);
+        return $converter->toXPath($locator);
     }
 }
diff --git a/tests/Driver/CoreDriverTest.php b/tests/Driver/CoreDriverTest.php
@@ -4,14 +4,9 @@
 
 use Behat\Mink\Element\NodeElement;
 use PHPUnit\Framework\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class CoreDriverTest extends TestCase
 {
-    use ExpectException;
-    use AssertIsType;
-
     public function testNoExtraMethods()
     {
         $interfaceRef = new \ReflectionClass('Behat\Mink\Driver\DriverInterface');
diff --git a/tests/Element/DocumentElementTest.php b/tests/Element/DocumentElementTest.php
@@ -3,12 +3,9 @@
 namespace Behat\Mink\Tests\Element;
 
 use Behat\Mink\Element\DocumentElement;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class DocumentElementTest extends ElementTest
 {
-    use ExpectException;
-
     /**
      * Page.
      *
diff --git a/tests/Element/ElementTest.php b/tests/Element/ElementTest.php
@@ -5,6 +5,7 @@
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Session;
 use Behat\Mink\Selector\SelectorsHandler;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 abstract class ElementTest extends TestCase
@@ -17,14 +18,14 @@ abstract class ElementTest extends TestCase
     protected $session;
 
     /**
-     * @var DriverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DriverInterface&MockObject
      */
     protected $driver;
 
     /**
      * Selectors.
      *
-     * @var SelectorsHandler|\PHPUnit_Framework_MockObject_MockObject
+     * @var SelectorsHandler&MockObject
      */
     protected $selectors;
 
diff --git a/tests/Element/NodeElementTest.php b/tests/Element/NodeElementTest.php
@@ -3,12 +3,9 @@
 namespace Behat\Mink\Tests\Element;
 
 use Behat\Mink\Element\NodeElement;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class NodeElementTest extends ElementTest
 {
-    use ExpectException;
-
     public function testGetXpath()
     {
         $node = new NodeElement('some custom xpath', $this->session);
diff --git a/tests/MinkTest.php b/tests/MinkTest.php
@@ -4,12 +4,9 @@
 
 use Behat\Mink\Mink;
 use PHPUnit\Framework\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class MinkTest extends TestCase
 {
-    use ExpectException;
-
     /**
      * @var Mink
      */
diff --git a/tests/Selector/CssSelectorTest.php b/tests/Selector/CssSelectorTest.php
@@ -4,25 +4,17 @@
 
 use Behat\Mink\Selector\CssSelector;
 use PHPUnit\Framework\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class CssSelectorTest extends TestCase
 {
-    use ExpectException;
-
     public function testSelector()
     {
         $selector = new CssSelector();
 
         $this->assertEquals('descendant-or-self::h3', $selector->translateToXPath('h3'));
         $this->assertEquals('descendant-or-self::h3/span', $selector->translateToXPath('h3 > span'));
 
-        if (interface_exists('Symfony\Component\CssSelector\XPath\TranslatorInterface')) {
-            // The rewritten component of Symfony 2.3 checks for attribute existence first for the class.
-            $expectation = "descendant-or-self::h3/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' my_div ')]";
-        } else {
-            $expectation = "descendant-or-self::h3/*[contains(concat(' ', normalize-space(@class), ' '), ' my_div ')]";
-        }
+        $expectation = "descendant-or-self::h3/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' my_div ')]";
         $this->assertEquals($expectation, $selector->translateToXPath('h3 > .my_div'));
     }
 
diff --git a/tests/Selector/NamedSelectorTest.php b/tests/Selector/NamedSelectorTest.php
@@ -5,12 +5,9 @@
 use Behat\Mink\Selector\NamedSelector;
 use Behat\Mink\Selector\Xpath\Escaper;
 use PHPUnit\Framework\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 abstract class NamedSelectorTest extends TestCase
 {
-    use ExpectException;
-
     public function testRegisterXpath()
     {
         $selector = $this->getSelector();
diff --git a/tests/Selector/SelectorsHandlerTest.php b/tests/Selector/SelectorsHandlerTest.php
@@ -4,12 +4,9 @@
 
 use Behat\Mink\Selector\SelectorsHandler;
 use PHPUnit\Framework\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class SelectorsHandlerTest extends TestCase
 {
-    use ExpectException;
-
     public function testRegisterSelector()
     {
         $selector = $this->getMockBuilder('Behat\Mink\Selector\SelectorInterface')->getMock();
diff --git a/tests/SessionTest.php b/tests/SessionTest.php
@@ -2,13 +2,15 @@
 
 namespace Behat\Mink\Tests;
 
+use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Session;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class SessionTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var DriverInterface&MockObject
      */
     private $driver;
     private $selectorsHandler;
@@ -79,9 +81,9 @@ public function testStop()
 
     public function testRestart()
     {
-        $this->driver->expects($this->at(0))
+        $this->driver->expects($this->once())
             ->method('stop');
-        $this->driver->expects($this->at(1))
+        $this->driver->expects($this->once())
             ->method('start');
 
         $this->session->restart();
diff --git a/tests/WebAssertTest.php b/tests/WebAssertTest.php
@@ -3,14 +3,16 @@
 namespace Behat\Mink\Tests;
 
 use Behat\Mink\Exception\ExpectationException;
+use Behat\Mink\Session;
 use Behat\Mink\Tests\Helper\Stringer;
 use Behat\Mink\WebAssert;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class WebAssertTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Session&MockObject
      */
     private $session;
     /**
@@ -1065,17 +1067,9 @@ public function testElementAttributeExists()
         ;
 
         $element
-            ->expects($this->at(0))
             ->method('hasAttribute')
             ->with('name')
-            ->will($this->returnValue(true))
-        ;
-
-        $element
-            ->expects($this->at(1))
-            ->method('hasAttribute')
-            ->with('name')
-            ->will($this->returnValue(false))
+            ->will($this->onConsecutiveCalls(true, false))
         ;
 
         $this->assertCorrectAssertion('elementAttributeExists', array('css', 'h2 > span', 'name'));
@@ -1113,17 +1107,9 @@ public function testElementAttributeNotExists()
         ;
 
         $element
-            ->expects($this->at(0))
             ->method('hasAttribute')
             ->with('name')
-            ->will($this->returnValue(false))
-        ;
-
-        $element
-            ->expects($this->at(1))
-            ->method('hasAttribute')
-            ->with('name')
-            ->will($this->returnValue(true))
+            ->will($this->onConsecutiveCalls(false, true))
         ;
 
         $this->assertCorrectAssertion('elementAttributeNotExists', array('css', 'h2 > span', 'name'));

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`	`namespace Behat\Mink\Selector;`
`12`	`12`
`13`		`-use Symfony\Component\CssSelector\CssSelector as CSS;`
`14`	`13`	`use Symfony\Component\CssSelector\CssSelectorConverter;`
`15`	`14`
`16`	`15`	`/**`
`@@ -33,14 +32,8 @@ public function translateToXPath($locator)`
`33`	`32`	`throw new \InvalidArgumentException('The CssSelector expects to get a string as locator');`
`34`	`33`	`}`
`35`	`34`
`36`		`- // Symfony 2.8+ API`
`37`		`- if (class_exists('Symfony\Component\CssSelector\CssSelectorConverter')) {`
`38`		`- $converter = new CssSelectorConverter();`
	`35`	`+ $converter = new CssSelectorConverter();`
`39`	`36`
`40`		`- return $converter->toXPath($locator);`
`41`		`- }`
`42`		`-`
`43`		`- // old static API for Symfony 2.7 and older`
`44`		`- return CSS::toXPath($locator);`
	`37`	`+ return $converter->toXPath($locator);`
`45`	`38`	`}`
`46`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,9 @@`
`4`	`4`
`5`	`5`	`use Behat\Mink\Element\NodeElement;`
`6`	`6`	`use PHPUnit\Framework\TestCase;`
`7`		`-use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType;`
`8`		`-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;`
`9`	`7`
`10`	`8`	`class CoreDriverTest extends TestCase`
`11`	`9`	`{`
`12`		`- use ExpectException;`
`13`		`- use AssertIsType;`
`14`		`-`
`15`	`10`	`public function testNoExtraMethods()`
`16`	`11`	`{`
`17`	`12`	`$interfaceRef = new \ReflectionClass('Behat\Mink\Driver\DriverInterface');`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,9 @@`
`3`	`3`	`namespace Behat\Mink\Tests\Element;`
`4`	`4`
`5`	`5`	`use Behat\Mink\Element\DocumentElement;`
`6`		`-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;`
`7`	`6`
`8`	`7`	`class DocumentElementTest extends ElementTest`
`9`	`8`	`{`
`10`		`- use ExpectException;`
`11`		`-`
`12`	`9`	`/**`
`13`	`10`	`* Page.`
`14`	`11`	`*`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,9 @@`
`5`	`5`	`use Behat\Mink\Selector\NamedSelector;`
`6`	`6`	`use Behat\Mink\Selector\Xpath\Escaper;`
`7`	`7`	`use PHPUnit\Framework\TestCase;`
`8`		`-use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;`
`9`	`8`
`10`	`9`	`abstract class NamedSelectorTest extends TestCase`
`11`	`10`	`{`
`12`		`- use ExpectException;`
`13`		`-`
`14`	`11`	`public function testRegisterXpath()`
`15`	`12`	`{`
`16`	`13`	`$selector = $this->getSelector();`