diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Monolog/Formatter/ScalarFormatterTest.php | 6 | ||||
| -rw-r--r-- | tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php | 2 | ||||
| -rw-r--r-- | tests/Monolog/Handler/LogEntriesHandlerTest.php | 4 | ||||
| -rw-r--r-- | tests/Monolog/Handler/MailHandlerTest.php | 2 | ||||
| -rw-r--r-- | tests/bootstrap.php | 5 |
5 files changed, 13 insertions, 6 deletions
diff --git a/tests/Monolog/Formatter/ScalarFormatterTest.php b/tests/Monolog/Formatter/ScalarFormatterTest.php index eb237ae..96d92b5 100644 --- a/tests/Monolog/Formatter/ScalarFormatterTest.php +++ b/tests/Monolog/Formatter/ScalarFormatterTest.php @@ -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(), diff --git a/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php b/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php index 5d69a7c..3383381 100644 --- a/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php +++ b/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php @@ -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(), ); diff --git a/tests/Monolog/Handler/LogEntriesHandlerTest.php b/tests/Monolog/Handler/LogEntriesHandlerTest.php index f9c8fd4..9db4957 100644 --- a/tests/Monolog/Handler/LogEntriesHandlerTest.php +++ b/tests/Monolog/Handler/LogEntriesHandlerTest.php @@ -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() diff --git a/tests/Monolog/Handler/MailHandlerTest.php b/tests/Monolog/Handler/MailHandlerTest.php index 8e73a78..03ee177 100644 --- a/tests/Monolog/Handler/MailHandlerTest.php +++ b/tests/Monolog/Handler/MailHandlerTest.php @@ -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') diff --git a/tests/bootstrap.php b/tests/bootstrap.php new file mode 100644 index 0000000..0ee6932 --- /dev/null +++ b/tests/bootstrap.php @@ -0,0 +1,5 @@ +<?php + +date_default_timezone_set('UTC'); + +require __DIR__.'/../vendor/autoload.php'; |