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

Set default date format to have a timezone, fixes #196

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-26 17:39:41 +01:00
parent 912d813c73
commit 76a91c6722
8 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Monolog/Formatter/ScalarFormatterTest.php
View File

@@ -11,6 +11,8 @@
namespace Monolog\Formatter;
use Monolog\DateTimeImmutable;
class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
{
private $formatter;
@@ -49,7 +51,7 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
'baz' => false,
'bam' => array(1, 2, 3),
'bat' => array('foo' => 'bar'),
'bap' => \DateTimeImmutable::createFromFormat(\DateTime::ISO8601, '1970-01-01T00:00:00+0000'),
'bap' => $dt = new DateTimeImmutable(true),
'ban' => $exception,
));
@@ -59,7 +61,7 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
'baz' => false,
'bam' => $this->encodeJson(array(1, 2, 3)),
'bat' => $this->encodeJson(array('foo' => 'bar')),
'bap' => '1970-01-01 00:00:00',
'bap' => (string) $dt,
'ban' => $this->encodeJson(array(
'class' => get_class($exception),
'message' => $exception->getMessage(),

2
tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
View File

@@ -38,7 +38,7 @@ class DoctrineCouchDBHandlerTest extends TestCase
'level' => Logger::WARNING,
'level_name' => 'WARNING',
'channel' => 'test',
'datetime' => $record['datetime']->format('Y-m-d H:i:s'),
'datetime' => (string) $record['datetime'],
'extra' => array(),
);

4
tests/Monolog/Handler/LogEntriesHandlerTest.php
View File

@@ -37,7 +37,7 @@ class LogEntriesHandlerTest extends TestCase
fseek($this->res, 0);
$content = fread($this->res, 1024);
$this->assertRegexp('/testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] test.CRITICAL: Critical write test/', $content);
$this->assertRegexp('/testToken \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}\+00:00\] test.CRITICAL: Critical write test/', $content);
}
public function testWriteBatchContent()
@@ -53,7 +53,7 @@ class LogEntriesHandlerTest extends TestCase
fseek($this->res, 0);
$content = fread($this->res, 1024);
$this->assertRegexp('/(testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] .* \[\] \[\]\n){3}/', $content);
$this->assertRegexp('/(testToken \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}\+00:00\] .* \[\] \[\]\n){3}/', $content);
}
private function createHandler()

2
tests/Monolog/Handler/MailHandlerTest.php
View File

@@ -64,7 +64,7 @@ class MailHandlerTest extends TestCase
$record = $this->getRecord();
$records = array($record);
$records[0]['formatted'] = '['.$record['datetime']->format('Y-m-d H:i:s').'] test.WARNING: test [] []'."\n";
$records[0]['formatted'] = '['.$record['datetime'].'] test.WARNING: test [] []'."\n";
$handler->expects($this->once())
->method('send')

5
tests/bootstrap.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
date_default_timezone_set('UTC');
require __DIR__.'/../vendor/autoload.php';