summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordi Boggiano <j.boggiano@seld.be>2016-10-03 20:31:55 +0200
committerJordi Boggiano <j.boggiano@seld.be>2016-10-03 20:31:55 +0200
commit0d01b2c8c75dba9b32dac7a2c4aec3ec638f9ba8 (patch)
treed205feddd40f7d34049f7abf78da1be7184a69bf /src
parent3884c922ee7881a796d51b87ea258f9b4bc3998f (diff)
parent214b8ef34b17ed0fcd3a5e027ef5a9ae9ebeb193 (diff)
downloadmonolog-0d01b2c8c75dba9b32dac7a2c4aec3ec638f9ba8.zip
monolog-0d01b2c8c75dba9b32dac7a2c4aec3ec638f9ba8.tar.gz
monolog-0d01b2c8c75dba9b32dac7a2c4aec3ec638f9ba8.tar.bz2
Merge branch '1.x'
Diffstat (limited to 'src')
-rw-r--r--src/Monolog/Formatter/NormalizerFormatter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php
index 17972da..592713f 100644
--- a/src/Monolog/Formatter/NormalizerFormatter.php
+++ b/src/Monolog/Formatter/NormalizerFormatter.php
@@ -89,7 +89,7 @@ class NormalizerFormatter implements FormatterInterface
foreach ($data as $key => $value) {
if ($count++ >= 1000) {
- $normalized['...'] = 'Over 1000 items, aborting normalization';
+ $normalized['...'] = 'Over 1000 items ('.($data instanceof \Generator ? 'generator function' : count($data).' total').'), aborting normalization';
break;
}
$normalized[$key] = $this->normalize($value, $depth + 1);