From f835cd21e472683a9d251131f8c89ba18ed506c7 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 21 Oct 2014 10:21:47 +0100 Subject: [PATCH] Make 5.3 compliant and faster call to wrapped logger, refs #437 --- src/Monolog/Handler/PsrHandler.php | 3 +-- tests/Monolog/Handler/PsrHandlerTest.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Monolog/Handler/PsrHandler.php b/src/Monolog/Handler/PsrHandler.php index 41c5cc08..1ae85845 100644 --- a/src/Monolog/Handler/PsrHandler.php +++ b/src/Monolog/Handler/PsrHandler.php @@ -49,8 +49,7 @@ class PsrHandler extends AbstractHandler return false; } - $logMethodName = strtolower($record['level_name']); - call_user_func([$this->logger, $logMethodName], $record['message'], $record['context']); + $this->logger->log(strtolower($record['level_name']), $record['message'], $record['context']); return false === $this->bubble; } diff --git a/tests/Monolog/Handler/PsrHandlerTest.php b/tests/Monolog/Handler/PsrHandlerTest.php index 57eefbc7..64eaab16 100644 --- a/tests/Monolog/Handler/PsrHandlerTest.php +++ b/tests/Monolog/Handler/PsrHandlerTest.php @@ -21,11 +21,11 @@ class PsrHandlerTest extends TestCase { public function logLevelProvider() { - $levels = []; - $monologLogger = new Logger('', [], []); + $levels = array(); + $monologLogger = new Logger(''); foreach ($monologLogger->getLevels() as $levelName => $level) { - $levels[] = [$levelName, $level]; + $levels[] = array($levelName, $level); } return $levels; @@ -36,15 +36,15 @@ class PsrHandlerTest extends TestCase */ public function testHandlesAllLevels($levelName, $level) { - $message = 'Hello, world!'; - $context = ['foo' => 'bar']; + $message = 'Hello, world! ' . $level; + $context = array('foo' => 'bar', 'level' => $level); $psrLogger = $this->getMock('Psr\Log\NullLogger'); $psrLogger->expects($this->once()) - ->method(strtolower($levelName)) - ->with($message, $context); + ->method('log') + ->with(strtolower($levelName), $message, $context); $handler = new PsrHandler($psrLogger); - $handler->handle(['level' => $level, 'level_name' => $levelName, 'message' => $message, 'context' => $context]); + $handler->handle(array('level' => $level, 'level_name' => $levelName, 'message' => $message, 'context' => $context)); } }