mirror of
https://github.com/Seldaek/monolog.git
synced 2025-08-04 12:17:35 +02:00
Handle DateTime objects in formatted messages (#940)
* Handle DateTime objects in formatted meessages * Use interface to catch both DateTime and DateTimeImmutable * Maintain formatting standards. * Visibility to private.
This commit is contained in:
committed by
Jordi Boggiano
parent
f3dda67c09
commit
a0406bf8dd
@@ -20,6 +20,18 @@ namespace Monolog\Processor;
|
|||||||
*/
|
*/
|
||||||
class PsrLogMessageProcessor
|
class PsrLogMessageProcessor
|
||||||
{
|
{
|
||||||
|
const SIMPLE_DATE = "Y-m-d\TH:i:sP";
|
||||||
|
|
||||||
|
private $dateFormat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $dateFormat The format of the timestamp: one supported by DateTime::format
|
||||||
|
*/
|
||||||
|
public function __construct(string $dateFormat = null)
|
||||||
|
{
|
||||||
|
$this->dateFormat = null === $dateFormat ? static::SIMPLE_DATE : $dateFormat;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $record
|
* @param array $record
|
||||||
* @return array
|
* @return array
|
||||||
@@ -34,6 +46,8 @@ class PsrLogMessageProcessor
|
|||||||
foreach ($record['context'] as $key => $val) {
|
foreach ($record['context'] as $key => $val) {
|
||||||
if (is_null($val) || is_scalar($val) || (is_object($val) && method_exists($val, "__toString"))) {
|
if (is_null($val) || is_scalar($val) || (is_object($val) && method_exists($val, "__toString"))) {
|
||||||
$replacements['{'.$key.'}'] = $val;
|
$replacements['{'.$key.'}'] = $val;
|
||||||
|
} elseif ($val instanceof \DateTimeInterface) {
|
||||||
|
$replacements['{'.$key.'}'] = $val->format($this->dateFormat);
|
||||||
} elseif (is_object($val)) {
|
} elseif (is_object($val)) {
|
||||||
$replacements['{'.$key.'}'] = '[object '.get_class($val).']';
|
$replacements['{'.$key.'}'] = '[object '.get_class($val).']';
|
||||||
} else {
|
} else {
|
||||||
|
@@ -27,8 +27,24 @@ class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertEquals($expected, $message['message']);
|
$this->assertEquals($expected, $message['message']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testCustomDateFormat()
|
||||||
|
{
|
||||||
|
$format = "Y-m-d";
|
||||||
|
$date = new \DateTime();
|
||||||
|
|
||||||
|
$proc = new PsrLogMessageProcessor($format);
|
||||||
|
|
||||||
|
$message = $proc([
|
||||||
|
'message' => '{foo}',
|
||||||
|
'context' => ['foo' => $date],
|
||||||
|
]);
|
||||||
|
$this->assertEquals($date->format($format), $message['message']);
|
||||||
|
}
|
||||||
|
|
||||||
public function getPairs()
|
public function getPairs()
|
||||||
{
|
{
|
||||||
|
$date = new \DateTime();
|
||||||
|
|
||||||
return [
|
return [
|
||||||
['foo', 'foo'],
|
['foo', 'foo'],
|
||||||
['3', '3'],
|
['3', '3'],
|
||||||
@@ -36,6 +52,7 @@ class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase
|
|||||||
[null, ''],
|
[null, ''],
|
||||||
[true, '1'],
|
[true, '1'],
|
||||||
[false, ''],
|
[false, ''],
|
||||||
|
[$date, $date->format(PsrLogMessageProcessor::SIMPLE_DATE)],
|
||||||
[new \stdClass, '[object stdClass]'],
|
[new \stdClass, '[object stdClass]'],
|
||||||
[[], '[array]'],
|
[[], '[array]'],
|
||||||
];
|
];
|
||||||
|
Reference in New Issue
Block a user