From 57b286f3d1bfbc7a17eef0c70813b91d706b95ca Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 30 Aug 2019 10:40:17 +0200 Subject: [PATCH] Reuse normalizeException from NormalizerFormatter in JsonFormatter, fixes #1366 --- src/Monolog/Formatter/JsonFormatter.php | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/Monolog/Formatter/JsonFormatter.php b/src/Monolog/Formatter/JsonFormatter.php index 45fbe13f..de1f6964 100644 --- a/src/Monolog/Formatter/JsonFormatter.php +++ b/src/Monolog/Formatter/JsonFormatter.php @@ -166,24 +166,9 @@ class JsonFormatter extends NormalizerFormatter */ protected function normalizeException(Throwable $e, int $depth = 0): array { - $data = [ - 'class' => Utils::getClass($e), - 'message' => $e->getMessage(), - 'code' => $e->getCode(), - 'file' => $e->getFile().':'.$e->getLine(), - ]; - - if ($this->includeStacktraces) { - $trace = $e->getTrace(); - foreach ($trace as $frame) { - if (isset($frame['file'])) { - $data['trace'][] = $frame['file'].':'.$frame['line']; - } - } - } - - if ($previous = $e->getPrevious()) { - $data['previous'] = $this->normalizeException($previous, $depth + 1); + $data = parent::normalizeException($e, $depth); + if (!$this->includeStacktraces) { + unset($data['trace']); } return $data;