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

Fix issue in handling of broken iterators when serializing stack frames, fixes #772

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-20 19:39:35 +01:00
parent 09c4cca32b
commit 5ecfbc25de
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,6 +186,9 @@ class JsonFormatter extends NormalizerFormatter
foreach ($trace as $frame) { foreach ($trace as $frame) {
if (isset($frame['file'])) { if (isset($frame['file'])) {
$data['trace'][] = $frame['file'].':'.$frame['line']; $data['trace'][] = $frame['file'].':'.$frame['line'];
} elseif (isset($frame['function']) && $frame['function'] === '{closure}') {
// We should again normalize the frames, because it might contain invalid items
$data['trace'][] = $frame['function'];
} else { } else {
// We should again normalize the frames, because it might contain invalid items // We should again normalize the frames, because it might contain invalid items
$data['trace'][] = $this->normalize($frame); $data['trace'][] = $this->normalize($frame);

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

@@ -131,6 +131,9 @@ class NormalizerFormatter implements FormatterInterface
foreach ($trace as $frame) { foreach ($trace as $frame) {
if (isset($frame['file'])) { if (isset($frame['file'])) {
$data['trace'][] = $frame['file'].':'.$frame['line']; $data['trace'][] = $frame['file'].':'.$frame['line'];
} elseif (isset($frame['function']) && $frame['function'] === '{closure}') {
// We should again normalize the frames, because it might contain invalid items
$data['trace'][] = $frame['function'];
} else { } else {
// We should again normalize the frames, because it might contain invalid items // We should again normalize the frames, because it might contain invalid items
$data['trace'][] = $this->toJson($this->normalize($frame), true); $data['trace'][] = $this->toJson($this->normalize($frame), true);