From a929570bb7688b39fefe4106f0ecf0ac35f37647 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 5 Sep 2012 21:32:46 +0200 Subject: [PATCH] Fix json encoding, fixes #110 --- src/Monolog/Formatter/LineFormatter.php | 2 +- tests/Monolog/Formatter/LineFormatterTest.php | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Monolog/Formatter/LineFormatter.php b/src/Monolog/Formatter/LineFormatter.php index 1054dbba..dd116967 100644 --- a/src/Monolog/Formatter/LineFormatter.php +++ b/src/Monolog/Formatter/LineFormatter.php @@ -85,6 +85,6 @@ class LineFormatter extends NormalizerFormatter return json_encode($this->normalize($data), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); } - return stripslashes(json_encode($this->normalize($data))); + return str_replace('\\/', '/', json_encode($this->normalize($data))); } } diff --git a/tests/Monolog/Formatter/LineFormatterTest.php b/tests/Monolog/Formatter/LineFormatterTest.php index 9e80917b..e3516f73 100644 --- a/tests/Monolog/Formatter/LineFormatterTest.php +++ b/tests/Monolog/Formatter/LineFormatterTest.php @@ -86,11 +86,8 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase 'extra' => array('foo' => new TestFoo, 'bar' => new TestBar, 'baz' => array(), 'res' => fopen('php://memory', 'rb')), 'message' => 'foobar', )); - if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\\\Formatter\\\\TestFoo: {\\"foo\\":\\"foo\\"})","bar":"[object] (Monolog\\\\Formatter\\\\TestBar: {})","baz":[],"res":"[resource]"}'."\n", $message); - } else { - $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\Formatter\\TestFoo: {"foo":"foo"})","bar":"[object] (Monolog\\Formatter\\TestBar: {})","baz":[],"res":"[resource]"}'."\n", $message); - } + + $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\\\Formatter\\\\TestFoo: {\\"foo\\":\\"foo\\"})","bar":"[object] (Monolog\\\\Formatter\\\\TestBar: {})","baz":[],"res":"[resource]"}'."\n", $message); } public function testBatchFormat()