mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-25 02:26:16 +02:00
Code Issues Releases Wiki Activity

Handle __toString to serialize objects which are not json-serializable in JsonFormatter, fixes #1733

Browse Source
This commit is contained in:
Jordi Boggiano
2022-07-22 15:27:46 +02:00
parent 284482a726
commit cf0f4b3814
2 changed files with 74 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Monolog/Formatter/JsonFormatter.php
View File

@@ -178,12 +178,25 @@ class JsonFormatter extends NormalizerFormatter
return $normalized;
}
if ($data instanceof \DateTimeInterface) {
return $this->formatDate($data);
}
if (is_object($data)) {
if ($data instanceof \DateTimeInterface) {
return $this->formatDate($data);
}
if ($data instanceof Throwable) {
return $this->normalizeException($data, $depth);
if ($data instanceof Throwable) {
return $this->normalizeException($data, $depth);
}
// if the object has specific json serializability we want to make sure we skip the __toString treatment below
if ($data instanceof \JsonSerializable) {
return $data;
}
if (method_exists($data, '__toString')) {
return $data->__toString();
}
return $data;
}
if (is_resource($data)) {