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

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2019-11-13 10:58:42 +01:00
parent 9776fa1d54 ac44cccd84
commit 4e19f3c585
6 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,7 +188,11 @@ class NormalizerFormatterTest extends TestCase
restore_error_handler();
$this->assertEquals('null', $res);
if (PHP_VERSION_ID < 50500) {
$this->assertEquals('[{"bar":{"foo":null}},{"foo":{"bar":null}}]', $res);
} else {
$this->assertEquals('null', $res);
}
}
public function testCanNormalizeReferences()
@@ -223,7 +227,11 @@ class NormalizerFormatterTest extends TestCase
restore_error_handler();
$this->assertEquals('null', $res);
if (PHP_VERSION_ID < 50500) {
$this->assertEquals('[null]', $res);
} else {
$this->assertEquals('null', $res);
}
}
public function testNormalizeHandleLargeArraysWithExactly1000Items()

19
tests/Monolog/Handler/Slack/SlackRecordTest.php
View File

@@ -19,13 +19,6 @@ use Monolog\Test\TestCase;
*/
class SlackRecordTest extends TestCase
{
private $jsonPrettyPrintFlag;
protected function setUp(): void
{
$this->jsonPrettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
}
public function dataGetAttachmentColor()
{
return array(
@@ -78,16 +71,14 @@ class SlackRecordTest extends TestCase
*/
public function dataStringify()
{
$jsonPrettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
$multipleDimensions = array(array(1, 2));
$numericKeys = array('library' => 'monolog');
$singleDimension = array(1, 'Hello', 'Jordi');
return array(
array(array(), '[]'),
array($multipleDimensions, json_encode($multipleDimensions, $jsonPrettyPrintFlag)),
array($numericKeys, json_encode($numericKeys, $jsonPrettyPrintFlag)),
array($multipleDimensions, json_encode($multipleDimensions, JSON_PRETTY_PRINT)),
array($numericKeys, json_encode($numericKeys, JSON_PRETTY_PRINT)),
array($singleDimension, json_encode($singleDimension)),
);
}
@@ -271,12 +262,12 @@ class SlackRecordTest extends TestCase
array(
array(
'title' => 'Extra',
'value' => sprintf('```%s```', json_encode($extra, $this->jsonPrettyPrintFlag)),
'value' => sprintf('```%s```', json_encode($extra, JSON_PRETTY_PRINT)),
'short' => false,
),
array(
'title' => 'Context',
'value' => sprintf('```%s```', json_encode($context, $this->jsonPrettyPrintFlag)),
'value' => sprintf('```%s```', json_encode($context, JSON_PRETTY_PRINT)),
'short' => false,
),
),
@@ -381,7 +372,7 @@ class SlackRecordTest extends TestCase
$expected = array(
array(
'title' => 'Info',
'value' => sprintf('```%s```', json_encode(array('author' => 'Jordi'), $this->jsonPrettyPrintFlag)),
'value' => sprintf('```%s```', json_encode(array('author' => 'Jordi'), JSON_PRETTY_PRINT)),
'short' => false,
),
array(