From 11c27edd2bc2a7e0094f7d00cc5d196c17960e1f Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc@champs-libres.coop>
Date: Mon, 28 Sep 2015 15:56:56 +0200
Subject: [PATCH] Solving travis-ci problem

---
 Tests/Fixtures/App/app/AppKernel.php | 1 +
 composer.json                        | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Tests/Fixtures/App/app/AppKernel.php b/Tests/Fixtures/App/app/AppKernel.php
index 7792f0ce6..59ec46bfa 100644
--- a/Tests/Fixtures/App/app/AppKernel.php
+++ b/Tests/Fixtures/App/app/AppKernel.php
@@ -11,6 +11,7 @@ class AppKernel extends Kernel
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
diff --git a/composer.json b/composer.json
index 6baa593b3..af1c0c6b4 100644
--- a/composer.json
+++ b/composer.json
@@ -25,13 +25,13 @@
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
-        "symfony/monolog-bundle": "~2.4",
         "sensio/distribution-bundle": "~3.0",
         "sensio/framework-extra-bundle": "~3.0",
-        "chill-project/main": "dev-master@dev",
         "champs-libres/composer-bundle-migration": "~1.0",
         "doctrine/doctrine-migrations-bundle": "dev-master@dev",
-        "doctrine/migrations": "~1.0@dev"
+        "doctrine/migrations": "~1.0@dev",
+        "symfony/monolog-bundle": "^2.7",
+        "chill-project/main": "dev-master"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2@dev"