Test more PHP and Symfony versions on Travis

javiereguiluz · javiereguiluz · commit 49907582d211 · 2016-12-10T16:18:59.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -21,18 +21,18 @@ env:
 matrix:
   fast_finish: true
   include:
-    # jobs are ordered in a specific way to get Travis results faster (first
-    # execute the fastest jobs, then the slowest and finally the jobs that can fail)
-    - php: 7.0
-      env: SYMFONY_VERSION="3.0.*"
+    - php: nightly
+      env: SYMFONY_VERSION="dev-master"
+    - php: 7.1
+      env:
+        - SYMFONY_VERSION="3.2.*"
+        - CHECK_PHP_SYNTAX="yes"
     - php: 7.0
       env: SYMFONY_VERSION="3.1.*"
     - php: 5.6
       env: SYMFONY_VERSION="2.3.*"
     - php: 5.6
-      env:
-        - SYMFONY_VERSION="2.7.*"
-        - CHECK_PHP_SYNTAX="yes"
+      env: SYMFONY_VERSION="2.7.*"
     - php: 5.6
       env:
         - SYMFONY_VERSION="2.8.*"
@@ -49,6 +49,7 @@ matrix:
     - php: 5.6
       env: TWIG_VERSION="2.x-dev"
   allow_failures:
+    - php: nightly
     - php: hhvm-stable
     - env: TWIG_VERSION="2.x-dev"
     - env:
@@ -62,7 +63,7 @@ before_install:
   - echo session.gc_probability = 0 >> $INI_FILE
   - echo opcache.enable_cli = 1 >> $INI_FILE
   - if [[ "SYMFONY_VERSION" == "2.8.*" || "SYMFONY_VERSION" == 3.* ]]; then export SYMFONY_DEPRECATIONS_HELPER="strict"; fi;
-  - if [[ "$ENABLE_CODE_COVERAGE" != "true" && "$TRAVIS_PHP_VERSION" != hhvm* ]]; then phpenv config-rm xdebug.ini; fi;
+  - if [[ "$ENABLE_CODE_COVERAGE" != "true" ]]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;
   - composer selfupdate
   - if [[ "$SYMFONY_VERSION" != "" ]]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
   - if [[ "$TWIG_VERSION" != "" ]]; then composer require "twig/twig:${TWIG_VERSION}" --no-update; fi;
diff --git a/Tests/Controller/CustomMenuTest.php b/Tests/Controller/CustomMenuTest.php
@@ -12,6 +12,7 @@
 namespace JavierEguiluz\Bundle\EasyAdminBundle\Tests\Controller;
 
 use JavierEguiluz\Bundle\EasyAdminBundle\Tests\Fixtures\AbstractTestCase;
+use Symfony\Component\HttpKernel\Kernel;
 
 class CustomMenuTest extends AbstractTestCase
 {
@@ -194,8 +195,10 @@ public function testExternalRoutesDontIncludeIndexParameters()
     {
         $crawler = $this->getBackendHomepage();
 
+        // Starting from Symfony 3.2, routes are generated using the PHP_QUERY_RFC3986 option
+        $queryStringParameter = Kernel::VERSION_ID >= 30200 ? 'Lorem%20Ipsum' : 'Lorem+Ipsum';
         $this->assertSame(
-            '/custom-route?custom_parameter=Lorem+Ipsum',
+            '/custom-route?custom_parameter='.$queryStringParameter,
             $crawler->filter('.sidebar-menu li:contains("Custom External Route") a')->attr('href')
         );
 
