From 8c4b1be4a2116751c16e75a8efb97f11ce2f4a47 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 1 Jun 2015 21:15:07 +0100 Subject: [PATCH] Change Logger::setTimezone to accept a DateTimeZone object, refs #566 --- src/Monolog/Logger.php | 10 ++++++---- tests/Monolog/LoggerTest.php | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Monolog/Logger.php b/src/Monolog/Logger.php index af6b72b3..32e3dd92 100644 --- a/src/Monolog/Logger.php +++ b/src/Monolog/Logger.php @@ -443,7 +443,7 @@ class Logger implements LoggerInterface public function log($level, $message, array $context = array()) { $level = static::toMonologLevel($level); - + return $this->addRecord($level, $message, $context); } @@ -618,10 +618,12 @@ class Logger implements LoggerInterface /** * Set the timezone to be used for the timestamp of log records. * - * @param string $tz Timezone name + * This is stored globally for all Logger instances + * + * @param \DateTimeZone $tz Timezone object */ - public static function setTimezone($tz) + public static function setTimezone(\DateTimeZone $tz) { - self::$timezone = new \DateTimeZone($tz); + self::$timezone = $tz; } } diff --git a/tests/Monolog/LoggerTest.php b/tests/Monolog/LoggerTest.php index 83f17894..146b6f1b 100644 --- a/tests/Monolog/LoggerTest.php +++ b/tests/Monolog/LoggerTest.php @@ -434,13 +434,13 @@ class LoggerTest extends \PHPUnit_Framework_TestCase $logger->pushHandler($handler); $logger->info('test'); list($record) = $handler->getRecords(); - $this->assertEquals($tz, $record['datetime']->getTimezone()->getName()); + $this->assertEquals($tz, $record['datetime']->getTimezone()); } public function setTimezoneProvider() { return array_map( - function ($tz) { return array($tz); }, + function ($tz) { return array(new \DateTimeZone($tz)); }, \DateTimeZone::listIdentifiers() ); }