merged branch stloyd/patch-1 (PR #6572)

This PR was merged into the 2.0 branch.

Commits
-------

ba2d035 Restrict Monolog version to be in version <1.3

Discussion
----------

[2.0] Restrict Monolog version to be in version <1.3

Because of conflict between `HttpKernel\Log\LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3).

Main `composer.json` already restricts to proper version, but bridge allows also conflicting version.

---------------------------------------------------------------------------

by Seldaek at 2013-01-05T14:58:18Z

Looks fine, I will try to wrap up the 1.3.0 soon so you can migrate the code to use it (well it can already be done I guess in the master branch).

src/Symfony/Bridge/Monolog/composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.2",
         "symfony/http-kernel": "self.version",
-        "monolog/monolog": "1.*"
+        "monolog/monolog": ">=1.0,<1.3-dev"
     },
     "autoload": {
         "psr-0": { "Symfony\\Bridge\\Monolog": "" }