From fd167b714ef3350ff63e56329cae195a9b0b7796 Mon Sep 17 00:00:00 2001
From: Kirk Madera <kirkmadera@users.noreply.github.com>
Date: Sat, 28 Oct 2017 23:36:26 -0400
Subject: [PATCH 1/3] Removes \n or space when $context/$extra are empty

Simple log messages cause extra spaces or newlines when using the default format and $context or $extra are empty, resulting in output like this:

```
23:24:41 DEBUG     [test] debug


23:24:41 INFO      [test] info


23:24:41 NOTICE    [test] notice


23:24:41 WARNING   [test] warning


23:24:41 ERROR     [test] error


```

This makes reviewing command history difficult.

In the instance where $context or $extra is empty, it should not get appended with a space or newline.
---
 .../Monolog/Formatter/ConsoleFormatter.php       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
index 62f8292b275f2..0d1503524c7c2 100644
--- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
+++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -101,12 +101,20 @@ public function format(array $record)
         $levelColor = self::$levelColorMap[$record['level']];
 
         if ($this->options['multiline']) {
-            $context = $extra = "\n";
+            $separator = "\n";
         } else {
-            $context = $extra = ' ';
+            $separator = ' ';
+        }
+
+        $context = $this->dumpData($record['context']);
+        if ($context) {
+            $context .= $separator;
+        }
+
+        $extra = $this->dumpData($record['extra']);
+        if ($extra) {
+            $extra .= $separator;
         }
-        $context .= $this->dumpData($record['context']);
-        $extra .= $this->dumpData($record['extra']);
 
         $formatted = strtr($this->options['format'], array(
             '%datetime%' => $record['datetime']->format($this->options['date_format']),

From 206d933cf99c36f60cec169614c5343c04d4bfc4 Mon Sep 17 00:00:00 2001
From: Kirk Madera <kirkmadera@users.noreply.github.com>
Date: Sun, 29 Oct 2017 00:40:20 -0400
Subject: [PATCH 2/3] Moved separator before $context and $extra

---
 src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
index 0d1503524c7c2..20fe6b2a0f34f 100644
--- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
+++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -108,12 +108,12 @@ public function format(array $record)
 
         $context = $this->dumpData($record['context']);
         if ($context) {
-            $context .= $separator;
+            $context = $separator . $context;
         }
 
         $extra = $this->dumpData($record['extra']);
         if ($extra) {
-            $extra .= $separator;
+            $extra = $separator . $extra;
         }
 
         $formatted = strtr($this->options['format'], array(

From e0ad9133212b068563501890d18247fac4c0899d Mon Sep 17 00:00:00 2001
From: Kirk Madera <kirkmadera@users.noreply.github.com>
Date: Mon, 30 Oct 2017 15:30:35 -0400
Subject: [PATCH 3/3] CS Fix

---
 src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
index 20fe6b2a0f34f..83abd5687902c 100644
--- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
+++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -108,12 +108,12 @@ public function format(array $record)
 
         $context = $this->dumpData($record['context']);
         if ($context) {
-            $context = $separator . $context;
+            $context = $separator.$context;
         }
 
         $extra = $this->dumpData($record['extra']);
         if ($extra) {
-            $extra = $separator . $extra;
+            $extra = $separator.$extra;
         }
 
         $formatted = strtr($this->options['format'], array(