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 branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-10-03 20:31:55 +02:00
parent 3884c922ee 214b8ef34b
commit 0d01b2c8c7
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ class NormalizerFormatter implements FormatterInterface
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
if ($count++ >= 1000) { if ($count++ >= 1000) {
$normalized['...'] = 'Over 1000 items, aborting normalization'; $normalized['...'] = 'Over 1000 items ('.($data instanceof \Generator ? 'generator function' : count($data).' total').'), aborting normalization';
break; break;
} }
$normalized[$key] = $this->normalize($value, $depth + 1); $normalized[$key] = $this->normalize($value, $depth + 1);

18
tests/Monolog/Formatter/NormalizerFormatterTest.php
View File

@@ -226,6 +226,24 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(@json_encode([$resource]), $res); $this->assertEquals(@json_encode([$resource]), $res);
} }
public function testNormalizeHandleLargeArrays()
{
$formatter = new NormalizerFormatter();
$largeArray = range(1, 2000);
$res = $formatter->format(array(
'level_name' => 'CRITICAL',
'channel' => 'test',
'message' => 'bar',
'context' => array($largeArray),
'datetime' => new \DateTime,
'extra' => array(),
));
$this->assertCount(1000, $res['context'][0]);
$this->assertEquals('Over 1000 items (2000 total), aborting normalization', $res['context'][0]['...']);
}
/** /**
* @expectedException RuntimeException * @expectedException RuntimeException
*/ */