mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-09 14:46:46 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2023-10-27 15:24:31 +02:00
parent f54263935d 531ed6d873
commit 70f6ca05b9
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Monolog/Formatter/LineFormatter.php
View File

@@ -162,7 +162,7 @@ class LineFormatter extends NormalizerFormatter
do {
$depth++;
if ($depth > $this->maxNormalizeDepth) {
$str .= '\n[previous exception] Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
$str .= "\n[previous exception] Over " . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
break;
}

3
src/Monolog/Formatter/NormalizerFormatter.php
View File

@@ -206,6 +206,9 @@ class NormalizerFormatter implements FormatterInterface
if ($data instanceof \JsonSerializable) {
/** @var null|scalar|array<mixed[]|scalar|null> $value */
$value = $data->jsonSerialize();
} elseif (\get_class($data) === '__PHP_Incomplete_Class') {
$accessor = new \ArrayObject($data);
$value = (string) $accessor['__PHP_Incomplete_Class_Name'];
} elseif (method_exists($data, '__toString')) {
/** @var string $value */
$value = $data->__toString();

3
src/Monolog/Handler/StreamHandler.php
View File

@@ -123,11 +123,14 @@ class StreamHandler extends AbstractProcessingHandler
$this->createDir($url);
$this->errorMessage = null;
set_error_handler([$this, 'customErrorHandler']);
try {
$stream = fopen($url, 'a');
if ($this->filePermission !== null) {
@chmod($url, $this->filePermission);
}
} finally {
restore_error_handler();
}
if (!is_resource($stream)) {
$this->stream = null;

14
tests/Monolog/Formatter/NormalizerFormatterTest.php
View File

@@ -402,6 +402,20 @@ class NormalizerFormatterTest extends TestCase
);
}
public function testCanNormalizeIncompleteObject(): void
{
$serialized = "O:17:\"Monolog\TestClass\":1:{s:23:\"\x00Monolog\TestClass\x00name\";s:4:\"test\";}";
$object = unserialize($serialized);
$formatter = new NormalizerFormatter();
$record = $this->getRecord(context: ['object' => $object]);
$result = $formatter->format($record);
$this->assertEquals([
'__PHP_Incomplete_Class' => 'Monolog\\TestClass',
], $result['context']['object']);
}
private function throwHelper($arg)
{
throw new \RuntimeException('Thrown');