mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 05:07:36 +02:00
Code Issues Releases Wiki Activity

Fixed callback factory for the FingersCrossedHandler

Browse Source
This commit is contained in:
Christophe Coevoet
2011-04-05 10:29:08 +02:00
parent b90eddd513
commit e32886e26f
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Monolog/Handler/FingersCrossedHandler.php
View File

@@ -62,8 +62,11 @@ class FingersCrossedHandler extends AbstractHandler
}
if ($record['level'] >= $this->actionLevel) {
$this->buffering = false;
if (!$this->handler instanceof AbstractHandler) {
$this->handler = $this->handler($record, $this);
if (!$this->handler instanceof HandlerInterface) {
$this->handler = call_user_func_array($this->handler, array($record, $this));
}
if (!$this->handler instanceof HandlerInterface) {
throw new \RuntimeException("The factory callback should return an HandlerInterface");
}
foreach ($this->buffer as $record) {
$this->handler->handle($record);

26
tests/Monolog/Handler/FingersCrossedHandlerTest.php
View File

@@ -51,6 +51,32 @@ class FingersCrossedHandlerTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($test->hasDebugRecords());
}
public function testHandleWithCallback()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler(function($record, $handler) use ($test) {
return $test;
});
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$this->assertFalse($test->hasDebugRecords());
$this->assertFalse($test->hasInfoRecords());
$handler->handle($this->getRecord(Logger::WARNING));
$this->assertTrue($test->hasInfoRecords());
$this->assertTrue(count($test->getRecords()) === 3);
}
/**
* @expectedException RuntimeException
*/
public function testHandleWithBadCallbackThrowsException()
{
$handler = new FingersCrossedHandler(function($record, $handler) {
return 'foo';
});
$handler->handle($this->getRecord(Logger::WARNING));
}
protected function getRecord($level = Logger::WARNING)
{
return array(