mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 01:26:11 +02:00
Code Issues Releases Wiki Activity

Fixed passing Closure as parameter to minMaxHandler.

Browse Source
This commit is contained in:
Hennadiy Verkh
2014-03-17 16:06:57 +01:00
parent 447b7a549a
commit 8e7f51f27f
2 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Monolog/Handler/MinMaxHandler.php
View File

@@ -12,7 +12,7 @@ use Monolog\Logger;
class MinMaxHandler extends AbstractHandler
{
/**
* Handler or factory callable($record, $fingersCrossedHandler)
* Handler or factory callable($record, $this)
*
* @var callable|\Monolog\Handler\HandlerInterface
*/
@@ -37,12 +37,10 @@ class MinMaxHandler extends AbstractHandler
protected $bubble;
/**
* @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler).
* @param int $minLevel
* @param int $maxLevel
* @param callable|HandlerInterface $handler Handler or factory callable($record, $this).
* @param int $minLevel Minimum level for logs that are passes to handler
* @param int $maxLevel Maximum level for logs that are passes to handler
* @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
*
* @internal param \TtLibrary\Log\Handler\Maximum $int log level
*/
public function __construct($handler, $minLevel = Logger::DEBUG, $maxLevel = Logger::EMERGENCY, $bubble = true)
{
@@ -70,6 +68,20 @@ class MinMaxHandler extends AbstractHandler
return false;
}
// The same logic as in FingersCrossedHandler
if (!$this->handler instanceof HandlerInterface) {
if (!is_callable($this->handler)) {
throw new \RuntimeException(
"The given handler (" . json_encode($this->handler)
. ") is not a callable nor a Monolog\\Handler\\HandlerInterface object"
);
}
$this->handler = call_user_func($this->handler, $record, $this);
if (!$this->handler instanceof HandlerInterface) {
throw new \RuntimeException("The factory callable should return a HandlerInterface");
}
}
if ($this->processors) {
foreach ($this->processors as $processor) {
$record = call_user_func($processor, $record);