diff --git a/src/Monolog/Log.php b/src/Monolog/Log.php index d06a5b9f..f3bd7319 100644 --- a/src/Monolog/Log.php +++ b/src/Monolog/Log.php @@ -36,7 +36,7 @@ class Log $this->writers[] = $writer; } - public function log($level, $message) + public function addMessage($level, $message) { if ($level < $this->level) { return; diff --git a/src/Monolog/Logger.php b/src/Monolog/Logger.php index 38fcb90f..2c4b0959 100644 --- a/src/Monolog/Logger.php +++ b/src/Monolog/Logger.php @@ -45,7 +45,7 @@ class Logger $this->logs[$log->getName()] = $log; } - public function log($level, $message, $log = null) + public function addMessage($level, $message, $log = null) { if (null === $log) { $logs = $this->logs; @@ -57,33 +57,70 @@ class Logger } } - public function debug($message, $log = null) + public function addDebug($message, $log = null) { - $this->log(self::DEBUG, $message, $log); + $this->addMessage(self::DEBUG, $message, $log); } - public function info($message, $log = null) + public function addInfo($message, $log = null) { - $this->log(self::INFO, $message, $log); + $this->addMessage(self::INFO, $message, $log); } - public function warn($message, $log = null) + public function addWarning($message, $log = null) { - $this->log(self::WARN, $message, $log); + $this->addMessage(self::WARN, $message, $log); } - public function error($message, $log = null) + public function addError($message, $log = null) { - $this->log(self::ERROR, $message, $log); - } - - public function fatal($message, $log = null) - { - $this->log(self::FATAL, $message, $log); + $this->addMessage(self::ERROR, $message, $log); } public static function getLevelName($level) { return self::$levels[$level]; } + + // ZF Logger Compat + + public function debug($message, $log = null) + { + $this->addMessage(self::DEBUG, $message, $log); + } + + public function info($message, $log = null) + { + $this->addMessage(self::INFO, $message, $log); + } + + public function notice($message, $log = null) + { + $this->addMessage(self::INFO, $message, $log); + } + + public function warn($message, $log = null) + { + $this->addMessage(self::WARN, $message, $log); + } + + public function err($message, $log = null) + { + $this->addMessage(self::ERROR, $message, $log); + } + + public function crit($message, $log = null) + { + $this->addMessage(self::ERROR, $message, $log); + } + + public function alert($message, $log = null) + { + $this->addMessage(self::ERROR, $message, $log); + } + + public function emerg($message, $log = null) + { + $this->addMessage(self::ERROR, $message, $log); + } } \ No newline at end of file diff --git a/tests/Monolog/LogTest.php b/tests/Monolog/LogTest.php index 44be6e96..34bdfe8e 100644 --- a/tests/Monolog/LogTest.php +++ b/tests/Monolog/LogTest.php @@ -26,7 +26,7 @@ class LogTest extends \PHPUnit_Framework_TestCase ->with('bob', Logger::WARN, 'test'); $logger->addWriter($writer1); $logger->addWriter($writer2); - $logger->log(Logger::WARN, 'test'); + $logger->addMessage(Logger::WARN, 'test'); } public function testLogLowLevel() @@ -39,6 +39,6 @@ class LogTest extends \PHPUnit_Framework_TestCase $writer1->expects($this->never()) ->method('write'); $logger->addWriter($writer1); - $logger->log(Logger::WARN, 'test'); + $logger->addMessage(Logger::WARN, 'test'); } }