mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-31 18:30:15 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1169 from lstrojny/dev/better-psr3-formatting

Browse Source 
Better PSR-3 message formatting
This commit is contained in:
Jordi Boggiano
2018-06-18 16:50:07 +02:00
committed by GitHub
parent 8b21ec0780 bbf9de5c8d
commit 4e96288c15
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Monolog/Processor/PsrLogMessageProcessor.php
View File

@@ -20,7 +20,7 @@ namespace Monolog\Processor;
*/
class PsrLogMessageProcessor
{
const SIMPLE_DATE = "Y-m-d\TH:i:sP";
const SIMPLE_DATE = "Y-m-d\TH:i:s.uP";
private $dateFormat;
@@ -33,7 +33,7 @@ class PsrLogMessageProcessor
*/
public function __construct(string $dateFormat = null, bool $removeUsedContextFields = false)
{
$this->dateFormat = null === $dateFormat ? static::SIMPLE_DATE : $dateFormat;
$this->dateFormat = $dateFormat;
$this->removeUsedContextFields = $removeUsedContextFields;
}
@@ -57,9 +57,17 @@ class PsrLogMessageProcessor
if (is_null($val) || is_scalar($val) || (is_object($val) && method_exists($val, "__toString"))) {
$replacements[$placeholder] = $val;
} elseif ($val instanceof \DateTimeInterface) {
$replacements[$placeholder] = $val->format($this->dateFormat);
if (!$this->dateFormat && $val instanceof \Monolog\DateTimeImmutable) {
// handle monolog dates using __toString if no specific dateFormat was asked for
// so that it follows the useMicroseconds flag
$replacements[$placeholder] = (string) $val;
} else {
$replacements[$placeholder] = $val->format($this->dateFormat ?: static::SIMPLE_DATE);
}
} elseif (is_object($val)) {
$replacements[$placeholder] = '[object '.get_class($val).']';
} elseif (is_array($val)) {
$replacements[$placeholder] = 'array'.@json_encode($val);
} else {
$replacements[$placeholder] = '['.gettype($val).']';
}

6
tests/Monolog/Processor/PsrLogMessageProcessorTest.php
View File

@@ -68,7 +68,11 @@ class PsrLogMessageProcessorTest extends \PHPUnit\Framework\TestCase
[false, ''],
[$date, $date->format(PsrLogMessageProcessor::SIMPLE_DATE)],
[new \stdClass, '[object stdClass]'],
[[], '[array]'],
[[], 'array[]'],
[[], 'array[]'],
[[1, 2, 3], 'array[1,2,3]'],
[['foo' => 'bar'], 'array{"foo":"bar"}'],
[stream_context_create(), '[resource]'],
];
}
}