mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 13:16:39 +02:00
Code Issues Releases Wiki Activity

Merge pull request #891 from naderman/t/do-not-iterate-non-arrays

Browse Source 
Do not iterate non-array Traversables
This commit is contained in:
Jordi Boggiano
2016-11-26 01:04:57 +01:00
committed by GitHub
parent e94929eed0 45de570954
commit 774dedb352
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,17 +70,13 @@ class NormalizerFormatter implements FormatterInterface
return $data; return $data;
} }
if (is_array($data) || $data instanceof \Traversable) { if (is_array($data)) {
$normalized = array(); $normalized = array();
$count = 1; $count = 1;
if ($data instanceof \Generator && !$data->valid()) {
return array('...' => 'Generator is already consumed, aborting');
}
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
if ($count++ >= 1000) { if ($count++ >= 1000) {
$normalized['...'] = 'Over 1000 items ('.($data instanceof \Generator ? 'generator function' : count($data).' total').'), aborting normalization'; $normalized['...'] = 'Over 1000 items ('.count($data).' total), aborting normalization';
break; break;
} }
$normalized[$key] = $this->normalize($value); $normalized[$key] = $this->normalize($value);