diff options
| author | Jordi Boggiano <j.boggiano@seld.be> | 2016-09-29 09:29:30 +0200 |
|---|---|---|
| committer | Jordi Boggiano <j.boggiano@seld.be> | 2016-09-29 09:29:30 +0200 |
| commit | 7f135e9ed0d5c3b6102f3df5d5fd258c6b746afc (patch) | |
| tree | 0fa6612e5f17c856a42616bb6ee5837cb291fd3f /src | |
| parent | 6bf91fa40a48d455cf05d22e7de9427ffb7e9360 (diff) | |
| download | monolog-7f135e9ed0d5c3b6102f3df5d5fd258c6b746afc.zip monolog-7f135e9ed0d5c3b6102f3df5d5fd258c6b746afc.tar.gz monolog-7f135e9ed0d5c3b6102f3df5d5fd258c6b746afc.tar.bz2 | |
Add support for consumed generators in NormalizerFormatter, fixes #838
Diffstat (limited to 'src')
| -rw-r--r-- | src/Monolog/Formatter/NormalizerFormatter.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php index ab79dbc..bef07ab 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'; |