From 2efcbcd181a119d948a729bedfb83a462bdfa95d Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 30 Aug 2019 10:24:17 +0200 Subject: [PATCH] Remove closure stack frames entirely from log --- src/Monolog/Formatter/JsonFormatter.php | 2 -- src/Monolog/Formatter/NormalizerFormatter.php | 2 -- tests/Monolog/Formatter/NormalizerFormatterTest.php | 9 +++------ tests/Monolog/Formatter/ScalarFormatterTest.php | 2 -- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Monolog/Formatter/JsonFormatter.php b/src/Monolog/Formatter/JsonFormatter.php index d6ab98fe..2ff119ea 100644 --- a/src/Monolog/Formatter/JsonFormatter.php +++ b/src/Monolog/Formatter/JsonFormatter.php @@ -195,8 +195,6 @@ class JsonFormatter extends NormalizerFormatter foreach ($trace as $frame) { if (isset($frame['file'])) { $data['trace'][] = $frame['file'].':'.$frame['line']; - } else { - $data['trace'][] = (!empty($frame['class']) ? $frame['class'].$frame['type'] : '').$frame['function']; } } } diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php index 43f1bf6a..9865394e 100644 --- a/src/Monolog/Formatter/NormalizerFormatter.php +++ b/src/Monolog/Formatter/NormalizerFormatter.php @@ -151,8 +151,6 @@ class NormalizerFormatter implements FormatterInterface foreach ($trace as $frame) { if (isset($frame['file'])) { $data['trace'][] = $frame['file'].':'.$frame['line']; - } else { - $data['trace'][] = (!empty($frame['class']) ? $frame['class'].$frame['type'] : '').$frame['function']; } } diff --git a/tests/Monolog/Formatter/NormalizerFormatterTest.php b/tests/Monolog/Formatter/NormalizerFormatterTest.php index 9f0c445a..d4e0d98d 100644 --- a/tests/Monolog/Formatter/NormalizerFormatterTest.php +++ b/tests/Monolog/Formatter/NormalizerFormatterTest.php @@ -391,11 +391,8 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase $result = $formatter->format($record); $this->assertSame( - array( - PHP_VERSION_ID < 50400 ? 'Monolog\Formatter\{closure}' : 'Monolog\Formatter\NormalizerFormatterTest->Monolog\Formatter\{closure}', - __FILE__.':'.(__LINE__-12), - ), - array_slice($result['context']['exception']['trace'], 0, 2) + __FILE__.':'.(__LINE__-10), + $result['context']['exception']['trace'][0] ); } @@ -412,7 +409,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase $result = $formatter->format($record); $this->assertSame( - 'Monolog\\Formatter\\NormalizerFormatterTest->throwHelper', + __FILE__ .':'.(__LINE__-9), $result['context']['exception']['trace'][0] ); } diff --git a/tests/Monolog/Formatter/ScalarFormatterTest.php b/tests/Monolog/Formatter/ScalarFormatterTest.php index 88509422..2d7e6340 100644 --- a/tests/Monolog/Formatter/ScalarFormatterTest.php +++ b/tests/Monolog/Formatter/ScalarFormatterTest.php @@ -27,8 +27,6 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase foreach ($trace as $frame) { if (isset($frame['file'])) { $data[] = $frame['file'].':'.$frame['line']; - } else { - $data[] = (!empty($frame['class']) ? $frame['class'].$frame['type'] : '').$frame['function']; } }