From 9b69f56b4a9f27e3e39505eedef7d00130bf5e2e Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Mon, 28 Jul 2014 12:20:04 +0200
Subject: [PATCH] [MonologBridge] Ignore empty context/extra by default in the
 ConsoleFormatter

---
 composer.json                                             | 2 +-
 src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php | 8 ++++++++
 .../Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php   | 4 ++--
 src/Symfony/Bridge/Monolog/composer.json                  | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index d8fc9320c9680..3b175196058bb 100644
--- a/composer.json
+++ b/composer.json
@@ -71,7 +71,7 @@
         "doctrine/dbal": "~2.2",
         "doctrine/orm": "~2.2,>=2.2.3",
         "doctrine/doctrine-bundle": "~1.2",
-        "monolog/monolog": "~1.3",
+        "monolog/monolog": "~1.11",
         "propel/propel1": "1.6.*",
         "ircmaxell/password-compat": "1.0.*",
         "ocramius/proxy-manager": ">=0.3.1,<0.6-dev",
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
index ddf6308860073..4256df1882997 100644
--- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
+++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -23,6 +23,14 @@ class ConsoleFormatter extends LineFormatter
 {
     const SIMPLE_FORMAT = "%start_tag%[%datetime%] %channel%.%level_name%:%end_tag% %message% %context% %extra%\n";
 
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($format = null, $dateFormat = null, $allowInlineLineBreaks = false, $ignoreEmptyContextAndExtra = true)
+    {
+        parent::__construct($format, $dateFormat, $allowInlineLineBreaks, $ignoreEmptyContextAndExtra);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
index 3266543e7dc09..4aa8cd692d0e5 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
@@ -113,14 +113,14 @@ public function testWritingAndFormatting()
         $output
             ->expects($this->once())
             ->method('write')
-            ->with('<info>[2013-05-29 16:21:54] app.INFO:</info> My info message [] []'."\n")
+            ->with('<info>[2013-05-29 16:21:54] app.INFO:</info> My info message  '."\n")
         ;
 
         $errorOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
         $errorOutput
             ->expects($this->once())
             ->method('write')
-            ->with('<error>[2013-05-29 16:21:54] app.ERROR:</error> My error message [] []'."\n")
+            ->with('<error>[2013-05-29 16:21:54] app.ERROR:</error> My error message  '."\n")
         ;
 
         $output
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
index 2ce523e5fe2b2..e67c1348a8547 100644
--- a/src/Symfony/Bridge/Monolog/composer.json
+++ b/src/Symfony/Bridge/Monolog/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "monolog/monolog": "~1.3"
+        "monolog/monolog": "~1.11"
     },
     "require-dev": {
         "symfony/http-kernel": "~2.2",