minor #891 Made Silex compatible with Symfony 2.5 (stof)

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Made Silex compatible with Symfony 2.5

Commits
-------

2c12d84c Enabled testing on Symfony 2.5 on Travis
2a7f3db2 Made Silex comaptible with Symfony 2.5

.travis.yml

@@ -3,11 +3,13 @@ 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.4' ]; then sed -i 's/>=2.3,<2.5-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.5-dev/2.3.*@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.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"
     - composer install --dev --prefer-source
 
 script: vendor/bin/phpunit

composer.json

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