mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 05:07:36 +02:00
Code Issues Releases Wiki Activity

Fix json formatter handling of incomplete classes, fixes #1834

Browse Source
This commit is contained in:
Jordi Boggiano
2024-04-15 10:56:50 +02:00
parent 233e0b27a0
commit 884aa47a05
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,6 +192,10 @@ class JsonFormatter extends NormalizerFormatter
return $data; return $data;
} }
if (\get_class($data) === '__PHP_Incomplete_Class') {
return new \ArrayObject($data);
}
if (method_exists($data, '__toString')) { if (method_exists($data, '__toString')) {
return $data->__toString(); return $data->__toString();
} }

12
tests/Monolog/Formatter/JsonFormatterTest.php
View File

@@ -297,6 +297,18 @@ class JsonFormatterTest extends TestCase
$this->assertEquals('Over 1000 items (2000 total), aborting normalization', $res['context'][0]['...']); $this->assertEquals('Over 1000 items (2000 total), aborting normalization', $res['context'][0]['...']);
} }
public function testCanNormalizeIncompleteObject(): void
{
$serialized = "O:17:\"Monolog\TestClass\":1:{s:23:\"\x00Monolog\TestClass\x00name\";s:4:\"test\";}";
$object = unserialize($serialized);
$formatter = new JsonFormatter();
$record = ['context' => ['object' => $object]];
$result = $formatter->format($record);
self::assertSame('{"context":{"object":{"__PHP_Incomplete_Class_Name":"Monolog\\\\TestClass"}}}'."\n", $result);
}
public function testEmptyContextAndExtraFieldsCanBeIgnored() public function testEmptyContextAndExtraFieldsCanBeIgnored()
{ {
$formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, true, true); $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, true, true);