minor #1057 allowed any Symfony 2.x versions for Silex 1.2 (fabpot)

This PR was merged into the 1.2 branch.

Discussion
----------

allowed any Symfony 2.x versions for Silex 1.2

As we know that Symfony 3.0 will be next year, let's allow any Symfony 2.x versions. I've added the 2.6 and 2.7 versions in Travis to check that everything work fine for all supported Symfony 2.x versions.

Commits
-------

a5dd2b55 simplified the build matrix
ec53f07e fixed tests for Symfony 2.6+
288d8911 allowed any Symfony 2.x versions

.travis.yml

 language: php
 
-env:
-    - SYMFONY_DEPS_VERSION=2.3
-    - SYMFONY_DEPS_VERSION=2.4
-    - SYMFONY_DEPS_VERSION=2.5
-
 before_script:
     # symfony/*
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.5' ]; then sed -i 's/>=2.3,<2.6-dev/2.5.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.4' ]; then sed -i 's/>=2.3,<2.6-dev/2.4.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/>=2.3,<2.6-dev/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.7' ]; then sed -i 's/~2.3/2.7.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2.3/2.6.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.5' ]; then sed -i 's/~2.3/2.5.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.4' ]; then sed -i 's/~2.3/2.4.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/~2.3/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
     - composer install --dev --prefer-source
 
 script: phpunit
@@ -24,3 +21,12 @@ php:
 matrix:
     allow_failures:
         - php: hhvm
+    include:
+        - php: 5.6
+          env: SYMFONY_DEPS_VERSION=2.3
+        - php: 5.6
+          env: SYMFONY_DEPS_VERSION=2.4
+        - php: 5.6
+          env: SYMFONY_DEPS_VERSION=2.5
+        - php: 5.6
+          env: SYMFONY_DEPS_VERSION=2.7

composer.json

@@ -18,38 +18,38 @@
     "require": {
         "php": ">=5.3.3",
         "pimple/pimple": "~1.0",
-        "symfony/event-dispatcher": ">=2.3,<2.6-dev",
-        "symfony/http-foundation": ">=2.3,<2.6-dev",
-        "symfony/http-kernel": ">=2.3,<2.6-dev",
-        "symfony/routing": ">=2.3,<2.6-dev"
+        "symfony/event-dispatcher": "~2.3",
+        "symfony/http-foundation": "~2.3",
+        "symfony/http-kernel": "~2.3",
+        "symfony/routing": "~2.3"
     },
     "require-dev": {
-        "symfony/security": ">=2.3,<2.6-dev",
-        "symfony/config": ">=2.3,<2.6-dev",
-        "symfony/locale": ">=2.3,<2.6-dev",
-        "symfony/form": ">=2.3,<2.6-dev",
-        "symfony/browser-kit": ">=2.3,<2.6-dev",
-        "symfony/css-selector": ">=2.3,<2.6-dev",
-        "symfony/debug": ">=2.3,<2.6-dev",
-        "symfony/dom-crawler": ">=2.3,<2.6-dev",
-        "symfony/finder": ">=2.3,<2.6-dev",
-        "symfony/monolog-bridge": ">=2.3,<2.6-dev",
-        "symfony/options-resolver": ">=2.3,<2.6-dev",
-        "symfony/process": ">=2.3,<2.6-dev",
-        "symfony/serializer": ">=2.3,<2.6-dev",
-        "symfony/translation": ">=2.3,<2.6-dev",
-        "symfony/twig-bridge": ">=2.3,<2.6-dev",
-        "symfony/validator": ">=2.3,<2.6-dev",
+        "symfony/security": "~2.3",
+        "symfony/config": "~2.3",
+        "symfony/locale": "~2.3",
+        "symfony/form": "~2.3",
+        "symfony/browser-kit": "~2.3",
+        "symfony/css-selector": "~2.3",
+        "symfony/debug": "~2.3",
+        "symfony/dom-crawler": "~2.3",
+        "symfony/finder": "~2.3",
+        "symfony/monolog-bridge": "~2.3",
+        "symfony/options-resolver": "~2.3",
+        "symfony/process": "~2.3",
+        "symfony/serializer": "~2.3",
+        "symfony/translation": "~2.3",
+        "symfony/twig-bridge": "~2.3",
+        "symfony/validator": "~2.3",
         "twig/twig": ">=1.8.0,<2.0-dev",
         "doctrine/dbal": "~2.2",
         "swiftmailer/swiftmailer": "5.*",
         "monolog/monolog": "~1.4,>=1.4.1"
     },
     "suggest": {
-        "symfony/browser-kit": ">=2.3,<2.6-dev",
-        "symfony/css-selector": ">=2.3,<2.6-dev",
-        "symfony/dom-crawler": ">=2.3,<2.6-dev",
-        "symfony/form": ">=2.3,<2.6-dev"
+        "symfony/browser-kit": "~2.3",
+        "symfony/css-selector": "~2.3",
+        "symfony/dom-crawler": "~2.3",
+        "symfony/form": "~2.3"
     },
     "autoload": {
         "psr-0": { "Silex": "src/" }

tests/Silex/Tests/ExceptionHandlerTest.php

@@ -72,7 +72,7 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
 
         $request = Request::create('/foo');
         $response = $app->handle($request);
-        $this->assertContains('No route found for "GET /foo"', $response->getContent());
+        $this->assertContains('No route found for "GET /foo"', html_entity_decode($response->getContent()));
         $this->assertEquals(404, $response->getStatusCode());
     }
 
@@ -99,7 +99,7 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
 
         $request = Request::create('/foo', 'POST');
         $response = $app->handle($request);
-        $this->assertContains('No route found for "POST /foo": Method Not Allowed (Allow: GET)', $response->getContent());
+        $this->assertContains('No route found for "POST /foo": Method Not Allowed (Allow: GET)', html_entity_decode($response->getContent()));
         $this->assertEquals(405, $response->getStatusCode());
         $this->assertEquals('GET', $response->headers->get('Allow'));
     }

tests/Silex/Tests/Provider/SecurityServiceProviderTest.php

@@ -54,7 +54,7 @@ class SecurityServiceProviderTest extends WebTestCase
         $this->assertEquals('ANONYMOUS', $client->getResponse()->getContent());
 
         $client->request('post', '/login_check', array('_username' => 'fabien', '_password' => 'bar'));
-        $this->assertEquals('Bad credentials', $app['security.last_error']($client->getRequest()));
+        $this->assertContains('Bad credentials', $app['security.last_error']($client->getRequest()));
         // hack to re-close the session as the previous assertions re-opens it
         $client->getRequest()->getSession()->save();