From 665453d06ac96eb0a2f50e817eb24df3d79518b7 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 18 Nov 2015 17:11:02 +0000
Subject: [PATCH] Use json_encode for the whole message formatting, refs #686

---
 src/Monolog/Formatter/FluentdFormatter.php       |  8 +-------
 tests/Monolog/Formatter/FluentdFormatterTest.php | 10 ++++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Monolog/Formatter/FluentdFormatter.php b/src/Monolog/Formatter/FluentdFormatter.php
index 6b48ec94..e7b02930 100644
--- a/src/Monolog/Formatter/FluentdFormatter.php
+++ b/src/Monolog/Formatter/FluentdFormatter.php
@@ -70,13 +70,7 @@ class FluentdFormatter implements FormatterInterface
             $message['level_name'] = $record['level_name'];
         }
 
-        return '['
-        . '"' . $tag . '"'
-        . ', '
-        . $record['datetime']->getTimestamp()
-        . ', '
-        . json_encode($message)
-        . ']';
+        return json_encode(array($tag, $record['datetime']->getTimestamp(), $message));
     }
 
     public function formatBatch(array $records)
diff --git a/tests/Monolog/Formatter/FluentdFormatterTest.php b/tests/Monolog/Formatter/FluentdFormatterTest.php
index 8476f4c7..622b2bae 100644
--- a/tests/Monolog/Formatter/FluentdFormatterTest.php
+++ b/tests/Monolog/Formatter/FluentdFormatterTest.php
@@ -40,8 +40,9 @@ class FluentdFormatterTest extends TestCase
 
         $formatter = new FluentdFormatter();
         $this->assertEquals(
-            '["test", 0, {"message":"test","extra":[],"level":300,"level_name":"WARNING"}]',
-            $formatter->format($record));
+            '["test",0,{"message":"test","extra":[],"level":300,"level_name":"WARNING"}]',
+            $formatter->format($record)
+        );
     }
 
     /**
@@ -54,7 +55,8 @@ class FluentdFormatterTest extends TestCase
 
         $formatter = new FluentdFormatter(true);
         $this->assertEquals(
-            '["test.error", 0, {"message":"test","extra":[]}]',
-            $formatter->format($record));
+            '["test.error",0,{"message":"test","extra":[]}]',
+            $formatter->format($record)
+        );
     }
 }