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

set json flags correctly for SlackRecord, fixes #1396, closes #1397

Browse Source
This commit is contained in:
Jordi Boggiano
2019-11-13 10:47:25 +01:00
parent f97cc755af
commit ec3e0e3f90
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Monolog/Handler/Slack/SlackRecord.php
View File

@@ -208,13 +208,17 @@ class SlackRecord
{ {
$normalized = $this->normalizerFormatter->format($fields); $normalized = $this->normalizerFormatter->format($fields);
$prettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128; $prettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
$flags = 0;
if (PHP_VERSION_ID >= 50400) {
$flags = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
}
$hasSecondDimension = count(array_filter($normalized, 'is_array')); $hasSecondDimension = count(array_filter($normalized, 'is_array'));
$hasNonNumericKeys = !count(array_filter(array_keys($normalized), 'is_numeric')); $hasNonNumericKeys = !count(array_filter(array_keys($normalized), 'is_numeric'));
return $hasSecondDimension || $hasNonNumericKeys return $hasSecondDimension || $hasNonNumericKeys
? Utils::jsonEncode($normalized, $prettyPrintFlag) ? Utils::jsonEncode($normalized, $prettyPrintFlag | $flags)
: Utils::jsonEncode($normalized); : Utils::jsonEncode($normalized, $flags);
} }
/** /**