Add tests against Symfony 3.1

.travis.yml

@@ -12,8 +12,9 @@ before_install:
 before_script:
     # symfony/*
     - sh -c "if [ '$TWIG_VERSION' != '2.0' ]; then sed -i 's/~1.8|~2.0/~1.8/g' composer.json; composer update; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '3.0' ]; then sed -i 's/~2\.8|3\.0\.\*/3.0.*@dev/g' composer.json; composer update; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2\.8|3\.0\.\*/2.8.*@dev/g' composer.json; composer update; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '3.0' ]; then sed -i 's/~2\.8|^3\.0/3.0.*@dev/g' composer.json; composer update; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '3.1' ]; then sed -i 's/~2\.8|^3\.0/3.1.*@dev/g' composer.json; composer update; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2\.8|^3\.0/2.8.*@dev/g' composer.json; composer update; fi"
     - composer install
 
 script: phpunit
@@ -25,5 +26,7 @@ matrix:
           env: TWIG_VERSION=2.0
         - php: 5.6
           env: SYMFONY_DEPS_VERSION=3.0
+        - php: 5.6
+          env: SYMFONY_DEPS_VERSION=3.1
         - php: 7.0
         - php: hhvm

composer.json

@@ -17,32 +17,32 @@
     "require": {
         "php": ">=5.5.9",
         "pimple/pimple": "~3.0",
-        "symfony/event-dispatcher": "~2.8|3.0.*",
-        "symfony/http-foundation": "~2.8|3.0.*",
-        "symfony/http-kernel": "~2.8|3.0.*",
-        "symfony/routing": "~2.8|3.0.*"
+        "symfony/event-dispatcher": "~2.8|^3.0",
+        "symfony/http-foundation": "~2.8|^3.0",
+        "symfony/http-kernel": "~2.8|^3.0",
+        "symfony/routing": "~2.8|^3.0"
     },
     "require-dev": {
-        "symfony/asset": "~2.8|3.0.*",
-        "symfony/expression-language": "~2.8|3.0.*",
-        "symfony/security": "~2.8|3.0.*",
-        "symfony/config": "~2.8|3.0.*",
-        "symfony/form": "~2.8|3.0.*",
-        "symfony/browser-kit": "~2.8|3.0.*",
-        "symfony/css-selector": "~2.8|3.0.*",
-        "symfony/debug": "~2.8|3.0.*",
-        "symfony/dom-crawler": "~2.8|3.0.*",
-        "symfony/finder": "~2.8|3.0.*",
-        "symfony/intl": "~2.8|3.0.*",
-        "symfony/monolog-bridge": "~2.8|3.0.*",
-        "symfony/doctrine-bridge": "~2.8|3.0.*",
-        "symfony/options-resolver": "~2.8|3.0.*",
-        "symfony/process": "~2.8|3.0.*",
-        "symfony/serializer": "~2.8|3.0.*",
-        "symfony/translation": "~2.8|3.0.*",
-        "symfony/twig-bridge": "~2.8|3.0.*",
-        "symfony/validator": "~2.8|3.0.*",
-        "symfony/var-dumper": "~2.8|3.0.*",
+        "symfony/asset": "~2.8|^3.0",
+        "symfony/expression-language": "~2.8|^3.0",
+        "symfony/security": "~2.8|^3.0",
+        "symfony/config": "~2.8|^3.0",
+        "symfony/form": "~2.8|^3.0",
+        "symfony/browser-kit": "~2.8|^3.0",
+        "symfony/css-selector": "~2.8|^3.0",
+        "symfony/debug": "~2.8|^3.0",
+        "symfony/dom-crawler": "~2.8|^3.0",
+        "symfony/finder": "~2.8|^3.0",
+        "symfony/intl": "~2.8|^3.0",
+        "symfony/monolog-bridge": "~2.8|^3.0",
+        "symfony/doctrine-bridge": "~2.8|^3.0",
+        "symfony/options-resolver": "~2.8|^3.0",
+        "symfony/process": "~2.8|^3.0",
+        "symfony/serializer": "~2.8|^3.0",
+        "symfony/translation": "~2.8|^3.0",
+        "symfony/twig-bridge": "~2.8|^3.0",
+        "symfony/validator": "~2.8|^3.0",
+        "symfony/var-dumper": "~2.8|^3.0",
         "twig/twig": "~1.8|~2.0",
         "doctrine/dbal": "~2.2",
         "swiftmailer/swiftmailer": "~5",

tests/Silex/Tests/Provider/MonologServiceProviderTest.php

@@ -18,6 +18,7 @@ use Silex\Application;
 use Silex\Provider\MonologServiceProvider;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * MonologProvider test cases.
@@ -43,7 +44,12 @@ class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($app['monolog.handler']->hasDebug('< 200'));
 
         $records = $app['monolog.handler']->getRecords();
-        $this->assertContains('Matched route "GET_foo"', $records[0]['message']);
+        if (version_compare('3.1', Kernel::VERSION, '>=')) {
+            $this->assertContains('Matched route "GET_foo"', $records[0]['message']);
+        } else {
+            $this->assertContains('Matched route "{route}".', $records[0]['message']);
+            $this->assertSame('GET_foo', $records[0]['context']['route']);
+        }
     }
 
     public function testManualLogging()