mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-30 18:00:17 +02:00
Code Issues Releases Wiki Activity

Fix replaceNewlines method to avoid replacing escaped backslashes, closes #1721, fixes #1720

Browse Source
This commit is contained in:
Pavel Bychko
2022-06-26 12:34:03 +03:00
committed by Jordi Boggiano
parent cf0f4b3814
commit 320909a1d1
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,7 +186,11 @@ class LineFormatter extends NormalizerFormatter
{
if ($this->allowInlineLineBreaks) {
if (0 === strpos($str, '{')) {
return str_replace(array('\r', '\n'), array("\r", "\n"), $str);
$str = preg_replace('/(?<!\\\\)\\\\[rn]/', "\n", $str);
if (null === $str) {
$pcreErrorCode = preg_last_error();
throw new \RuntimeException('Failed to run preg_replace: ' . $pcreErrorCode . ' / ' . Utils::pcreLastErrorMessage($pcreErrorCode));
}
}
return $str;

8
tests/Monolog/Formatter/LineFormatterTest.php
View File

@@ -155,6 +155,14 @@ class LineFormatterTest extends \PHPUnit\Framework\TestCase
$this->assertRegexp('{^\['.date('Y-m-d').'] core\.CRITICAL: foobar \{"exception":"\[object] \(RuntimeException\(code: 0\): Foo at '.preg_quote(substr($path, 1, -1)).':'.(__LINE__ - 8).'\)\n\[stacktrace]\n#0}', $message);
}
public function testInlineLineBreaksRespectsEscapedBackslashes()
{
$formatter = new LineFormatter(null, 'Y-m-d');
$formatter->allowInlineLineBreaks();
self::assertSame('{"test":"foo'."\n".'bar\\\\name-with-n"}', $formatter->stringify(["test" => "foo\nbar\\name-with-n"]));
}
public function testDefFormatWithExceptionAndStacktraceParserFull()
{
$formatter = new LineFormatter(null, 'Y-m-d');