From 21a0774265fbd79d5d145580a2d757c964ce6ab3 Mon Sep 17 00:00:00 2001
From: William DURAND <william.durand1@gmail.com>
Date: Thu, 5 Dec 2013 18:37:33 +0100
Subject: [PATCH] Fix travis-ci config

---
 .travis.yml   | 9 ++++++++-
 composer.json | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92d62ca..5beabdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
     - SYMFONY_VERSION=2.1.*
     - SYMFONY_VERSION=2.2.*
     - SYMFONY_VERSION=2.3.*
+    - SYMFONY_VERSION=2.4.*
     - SYMFONY_VERSION=dev-master
 
 matrix:
@@ -17,9 +18,15 @@ matrix:
 
 before_script:
     - composer self-update
-    - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
     - composer require symfony/twig-bundle:${SYMFONY_VERSION} --no-update
+    - composer require symfony/twig-bridge:${SYMFONY_VERSION} --no-update
+    - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
     - composer require symfony/validator:${SYMFONY_VERSION} --dev --no-update
+    - composer require symfony/console:${SYMFONY_VERSION} --no-update
+    - composer require symfony/css-selector:${SYMFONY_VERSION} --dev --no-update
+    - composer require symfony/browser-kit:${SYMFONY_VERSION} --dev --no-update
+    - composer require symfony/yaml:${SYMFONY_VERSION} --dev --no-update
+    - composer require symfony/form:${SYMFONY_VERSION} --dev --no-update
     - composer update
 
 script: phpunit --coverage-text
diff --git a/composer.json b/composer.json
index 2301fd0..8fca013 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,10 @@
         }
     ],
     "require": {
-        "symfony/framework-bundle": "~2.1",
         "symfony/twig-bundle": "~2.1",
+        "symfony/framework-bundle": "~2.1",
         "symfony/console": "~2.1",
-        "dflydev/markdown": "1.0.*"
+        "dflydev/markdown": "~1.0"
     },
     "conflict": {
         "jms/serializer": "<0.12",