Merge pull request #123 from sroze/symfony-4-support

Symfony 4 support

Author: everzet

.travis.yml

@@ -2,33 +2,36 @@ language: php
 
 sudo: false
 
-php: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, hhvm]
+php: [5.4, 5.5, 5.6, 7.0, 7.1, hhvm]
 
 matrix:
   include:
+    - php: 5.3
+      dist: precise
     # Test against LTS versions
-    - php: 5.5
-      env: SYMFONY_VERSION='2.3.*'
-    - php: 5.5
-      env: SYMFONY_VERSION='2.7.*'
-    - php: 5.6
-      env: SYMFONY_VERSION='2.8.*'
+    - php: 7.1
+      env: SYMFONY_VERSION='^2'
+    - php: 7.1
+      env: SYMFONY_VERSION='^3'
     # Test against dev versions of dependencies
-    - php: 5.6
+    - php: 7.1
       env: DEPENDENCIES='dev'
 
 cache:
   directories:
     - $HOME/.composer/cache/files
+    - $HOME/symfony-bridge/.phpunit
 
 before_install:
-  - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
-  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require -n --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
+  - if [ "$DEPENDENCIES" = "dev" ]; then composer config minimum-stability dev; fi;
+  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require -n --no-update symfony/lts=$SYMFONY_VERSION; fi;'
 
 install:
   - composer install -n
+  - vendor/bin/simple-phpunit install
 
-script: phpunit -v --coverage-clover=coverage.clover
+script: vendor/bin/simple-phpunit -v --coverage-clover=coverage.clover
 
 after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

composer.json

@@ -17,13 +17,13 @@
     "require": {
         "php":                  ">=5.3.6",
         "behat/mink":           "^1.7.1@dev",
-        "symfony/browser-kit":  "~2.3|~3.0",
-        "symfony/dom-crawler":  "~2.3|~3.0"
+        "symfony/browser-kit":  "~2.3|~3.0|~4.0",
+        "symfony/dom-crawler":  "~2.3|~3.0|~4.0"
     },
 
     "require-dev": {
         "mink/driver-testsuite": "dev-master",
-        "symfony/http-kernel": "~2.3|~3.0"
+        "symfony/http-kernel": "~2.3|~3.0|~4.0"
     },
 
     "autoload": {

tests/BrowserKitConfig.php

@@ -35,4 +35,20 @@ protected function supportsJs()
     {
         return false;
     }
+
+    public function skipMessage($testCase, $test)
+    {
+        if (
+            'Behat\Mink\Tests\Driver\Form\Html5Test' === $testCase
+            && in_array($test, array(
+                'testHtml5FormAction',
+                'testHtml5FormMethod',
+            ))
+            && !method_exists('Symfony\Component\DomCrawler\Tests\FormTest', 'testGetMethodWithOverride')
+        ) {
+            return 'Mink BrowserKit doesn\'t support HTML5 form attributes before Symfony 3.3';
+        }
+
+        return parent::skipMessage($testCase, $test);
+    }
 }

tests/Custom/BaseUrlTest.php

@@ -5,12 +5,13 @@
 use Behat\Mink\Driver\BrowserKitDriver;
 use Behat\Mink\Session;
 use Behat\Mink\Tests\Driver\Util\FixturesKernel;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Client;
 
 /**
  * @group functional
  */
-class BaseUrlTest extends \PHPUnit_Framework_TestCase
+class BaseUrlTest extends TestCase
 {
     public function testBaseUrl()
     {

tests/Custom/ErrorHandlingTest.php

@@ -3,10 +3,11 @@
 namespace Behat\Mink\Tests\Driver\Custom;
 
 use Behat\Mink\Driver\BrowserKitDriver;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\BrowserKit\Client;
 use Symfony\Component\BrowserKit\Response;
 
-class ErrorHandlingTest extends \PHPUnit_Framework_TestCase
+class ErrorHandlingTest extends TestCase
 {
     /**
      * @var TestClient