From 4abd5bf0710e9eb40111c6e59176bd761e80b632 Mon Sep 17 00:00:00 2001 From: Joseph Bielawski Date: Sat, 5 Jan 2013 12:53:24 +0100 Subject: [PATCH] Restrict Monolog version to be in version `<1.3`. Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3) --- composer.json | 2 +- src/Symfony/Bridge/Monolog/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 057917bf00..51c21e927a 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/data-fixtures": "1.0.*", "propel/propel1": "dev-master", - "monolog/monolog": "1.*" + "monolog/monolog": ">=1.0,<1.3-dev" }, "autoload": { "psr-0": { diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index fa1c718c31..0fcce509d1 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/http-kernel": "2.1.*", - "monolog/monolog": "1.*" + "monolog/monolog": ">=1.0,<1.3-dev" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Monolog": "" }