summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordi Boggiano <j.boggiano@seld.be>2016-07-29 05:07:02 +0200
committerJordi Boggiano <j.boggiano@seld.be>2016-07-29 05:07:02 +0200
commit5967b80dfb08c545b94f161ec874e80757165e7d (patch)
tree8d14461c4f1ce494c21d14fff6bec6fc32465782 /src
parent6b0d0c4a195f5f9cf65a38aad6e39a860f62f52e (diff)
downloadmonolog-5967b80dfb08c545b94f161ec874e80757165e7d.zip
monolog-5967b80dfb08c545b94f161ec874e80757165e7d.tar.gz
monolog-5967b80dfb08c545b94f161ec874e80757165e7d.tar.bz2
Only use DateTimeImmutable formatting for default date format, fixes #827
Diffstat (limited to 'src')
-rw-r--r--src/Monolog/Formatter/NormalizerFormatter.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php
index d4eb1af..4278666 100644
--- a/src/Monolog/Formatter/NormalizerFormatter.php
+++ b/src/Monolog/Formatter/NormalizerFormatter.php
@@ -300,7 +300,9 @@ class NormalizerFormatter implements FormatterInterface
protected function formatDate(\DateTimeInterface $date)
{
- if ($date instanceof DateTimeImmutable) {
+ // in case the date format isn't custom then we defer to the custom DateTimeImmutable
+ // formatting logic, which will pick the right format based on whether useMicroseconds is on
+ if ($this->dateFormat === self::SIMPLE_DATE && $date instanceof DateTimeImmutable) {
return (string) $date;
}