From a8bbda7310b097bfe4d1082dd2156d20604c7c9d Mon Sep 17 00:00:00 2001 From: wiistriker Date: Wed, 23 Oct 2013 19:50:05 +1100 Subject: [PATCH 1/2] Ignore json_encode errors --- src/Monolog/Formatter/LineFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Formatter/LineFormatter.php b/src/Monolog/Formatter/LineFormatter.php index a96fb27d..5302672d 100644 --- a/src/Monolog/Formatter/LineFormatter.php +++ b/src/Monolog/Formatter/LineFormatter.php @@ -94,7 +94,7 @@ class LineFormatter extends NormalizerFormatter $data = $this->normalize($data); if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - return $this->toJson($data); + return $this->toJson($data, false); } return str_replace('\\/', '/', json_encode($data)); From bbb0a5948f1928d8ef16adaafa1f3f95bd6d5063 Mon Sep 17 00:00:00 2001 From: wiistriker Date: Wed, 23 Oct 2013 20:14:57 +1100 Subject: [PATCH 2/2] Update LineFormatter.php --- src/Monolog/Formatter/LineFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Formatter/LineFormatter.php b/src/Monolog/Formatter/LineFormatter.php index 5302672d..53269c78 100644 --- a/src/Monolog/Formatter/LineFormatter.php +++ b/src/Monolog/Formatter/LineFormatter.php @@ -94,7 +94,7 @@ class LineFormatter extends NormalizerFormatter $data = $this->normalize($data); if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - return $this->toJson($data, false); + return $this->toJson($data, true); } return str_replace('\\/', '/', json_encode($data));