From b2ad71de59709f5904cca7670ba19c4c62ffde90 Mon Sep 17 00:00:00 2001 From: Thomas Hansen Date: Thu, 1 Jul 2021 16:26:46 +0200 Subject: [PATCH 1/2] JsonFormatter::normalize() : respect date format from Formatter --- src/Monolog/Formatter/JsonFormatter.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Monolog/Formatter/JsonFormatter.php b/src/Monolog/Formatter/JsonFormatter.php index 16421e22..611cf949 100644 --- a/src/Monolog/Formatter/JsonFormatter.php +++ b/src/Monolog/Formatter/JsonFormatter.php @@ -173,6 +173,10 @@ class JsonFormatter extends NormalizerFormatter return $normalized; } + if ($data instanceof \DateTimeInterface) { + return $this->formatDate($data); + } + if ($data instanceof Throwable) { return $this->normalizeException($data, $depth); } From 4b9fdf77caf9100e4adaf10ef45531cbb8d187b1 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 5 Jul 2021 13:08:21 +0200 Subject: [PATCH 2/2] Fix json formatter to call parent constructor --- src/Monolog/Formatter/JsonFormatter.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Monolog/Formatter/JsonFormatter.php b/src/Monolog/Formatter/JsonFormatter.php index 611cf949..08c4fcbd 100644 --- a/src/Monolog/Formatter/JsonFormatter.php +++ b/src/Monolog/Formatter/JsonFormatter.php @@ -44,6 +44,8 @@ class JsonFormatter extends NormalizerFormatter $this->batchMode = $batchMode; $this->appendNewline = $appendNewline; $this->ignoreEmptyContextAndExtra = $ignoreEmptyContextAndExtra; + + parent::__construct(); } /**