From 7f135e9ed0d5c3b6102f3df5d5fd258c6b746afc Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 29 Sep 2016 09:29:30 +0200 Subject: [PATCH] Add support for consumed generators in NormalizerFormatter, fixes #838 --- src/Monolog/Formatter/NormalizerFormatter.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php index ab79dbcd..bef07ab5 100644 --- a/src/Monolog/Formatter/NormalizerFormatter.php +++ b/src/Monolog/Formatter/NormalizerFormatter.php @@ -74,6 +74,10 @@ class NormalizerFormatter implements FormatterInterface $normalized = array(); $count = 1; + if ($data instanceof \Generator && !$data->valid()) { + return array('...' => 'Generator is already consumed, aborting'); + } + foreach ($data as $key => $value) { if ($count++ >= 1000) { $normalized['...'] = 'Over 1000 items, aborting normalization';