From 22d7c8ffe40eb37e10cbcb44e367cd5f5c8272a9 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 20 Jan 2015 18:51:53 +0100
Subject: [PATCH] updated deps as Silex 1.2 is not compatible with Symfony 2.7

---
 .travis.yml   |  3 ---
 composer.json | 40 ++++++++++++++++++++--------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42605e6d6..9eb3200b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: php
 
 before_script:
     # symfony/*
-    - 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"
@@ -28,5 +27,3 @@ matrix:
           env: SYMFONY_DEPS_VERSION=2.4
         - php: 5.6
           env: SYMFONY_DEPS_VERSION=2.5
-        - php: 5.6
-          env: SYMFONY_DEPS_VERSION=2.7
diff --git a/composer.json b/composer.json
index ed835148f..d73236a86 100644
--- a/composer.json
+++ b/composer.json
@@ -18,28 +18,28 @@
     "require": {
         "php": ">=5.3.3",
         "pimple/pimple": "~1.0",
-        "symfony/event-dispatcher": "~2.3,<3.0",
-        "symfony/http-foundation": "~2.3,<3.0",
-        "symfony/http-kernel": "~2.3,<3.0",
-        "symfony/routing": "~2.3,<3.0"
+        "symfony/event-dispatcher": "~2.3,<2.7",
+        "symfony/http-foundation": "~2.3,<2.7",
+        "symfony/http-kernel": "~2.3,<2.7",
+        "symfony/routing": "~2.3,<2.7"
     },
     "require-dev": {
-        "symfony/security": "~2.3,<3.0",
-        "symfony/config": "~2.3,<3.0",
-        "symfony/locale": "~2.3,<3.0",
-        "symfony/form": "~2.3,<3.0",
-        "symfony/browser-kit": "~2.3,<3.0",
-        "symfony/css-selector": "~2.3,<3.0",
-        "symfony/debug": "~2.3,<3.0",
-        "symfony/dom-crawler": "~2.3,<3.0",
-        "symfony/finder": "~2.3,<3.0",
-        "symfony/monolog-bridge": "~2.3,<3.0",
-        "symfony/options-resolver": "~2.3,<3.0",
-        "symfony/process": "~2.3,<3.0",
-        "symfony/serializer": "~2.3,<3.0",
-        "symfony/translation": "~2.3,<3.0",
-        "symfony/twig-bridge": "~2.3,<3.0",
-        "symfony/validator": "~2.3,<3.0",
+        "symfony/security": "~2.3,<2.7",
+        "symfony/config": "~2.3,<2.7",
+        "symfony/locale": "~2.3,<2.7",
+        "symfony/form": "~2.3,<2.7",
+        "symfony/browser-kit": "~2.3,<2.7",
+        "symfony/css-selector": "~2.3,<2.7",
+        "symfony/debug": "~2.3,<2.7",
+        "symfony/dom-crawler": "~2.3,<2.7",
+        "symfony/finder": "~2.3,<2.7",
+        "symfony/monolog-bridge": "~2.3,<2.7",
+        "symfony/options-resolver": "~2.3,<2.7",
+        "symfony/process": "~2.3,<2.7",
+        "symfony/serializer": "~2.3,<2.7",
+        "symfony/translation": "~2.3,<2.7",
+        "symfony/twig-bridge": "~2.3,<2.7",
+        "symfony/validator": "~2.3,<2.7",
         "twig/twig": ">=1.8.0,<2.0-dev",
         "doctrine/dbal": "~2.2",
         "swiftmailer/swiftmailer": "5.*",