merged branch stloyd/bugfix/monolog_restrict (PR #6570)
This PR was merged into the 2.1 branch.
Commits
-------
4abd5bf
Restrict Monolog version to be in version `<1.3`. Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)
Discussion
----------
[2.1] Restrict Monolog to be in version `<1.3`.
Because of conflict between `HttpKernel\Log\LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3).
---------------------------------------------------------------------------
by stof at 2013-01-05T13:09:29Z
This should even be done in the 2.0 branch
---------------------------------------------------------------------------
by stloyd at 2013-01-05T14:00:35Z
@stof See #6572.
---------------------------------------------------------------------------
by stloyd at 2013-01-05T14:05:39Z
@fabpot This is still valid PR (even when `2.0` will be merged to `2.1`) as main `composer.json` is pointing to invalid version.
This commit is contained in:
commit
d50df09406
@ -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": {
|
||||
|
Reference in New Issue
Block a user