mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-04 12:17:35 +02:00
Code Issues Releases Wiki Activity

Fix more instances of bad FormattableHandlerInterface usages

Browse Source
This commit is contained in:
Jordi Boggiano
2020-12-11 13:11:35 +01:00
parent 1d5456ec07
commit 61e5ff2b36
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Monolog/Handler/BufferHandler.php
View File

@@ -27,6 +27,7 @@ class BufferHandler extends AbstractHandler implements ProcessableHandlerInterfa
{
use ProcessableHandlerTrait;
/** @var HandlerInterface */
protected $handler;
protected $bufferSize = 0;
protected $bufferLimit;
@@ -137,9 +138,13 @@ class BufferHandler extends AbstractHandler implements ProcessableHandlerInterfa
*/
public function setFormatter(FormatterInterface $formatter): HandlerInterface
{
$this->handler->setFormatter($formatter);
if ($this->handler instanceof FormattableHandlerInterface) {
$this->handler->setFormatter($formatter);
return $this;
return $this;
}
throw new \UnexpectedValueException('The nested handler of type '.get_class($this->handler).' does not support formatters.');
}
/**
@@ -147,6 +152,10 @@ class BufferHandler extends AbstractHandler implements ProcessableHandlerInterfa
*/
public function getFormatter(): FormatterInterface
{
return $this->handler->getFormatter();
if ($this->handler instanceof FormattableHandlerInterface) {
return $this->handler->getFormatter();
}
throw new \UnexpectedValueException('The nested handler of type '.get_class($this->handler).' does not support formatters.');
}
}

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

@@ -37,6 +37,7 @@ class FingersCrossedHandler extends Handler implements ProcessableHandlerInterfa
{
use ProcessableHandlerTrait;
/** @var HandlerInterface */
protected $handler;
protected $activationStrategy;
protected $buffering = true;

5
src/Monolog/Handler/GroupHandler.php
View File

@@ -23,6 +23,7 @@ class GroupHandler extends Handler implements ProcessableHandlerInterface, Reset
{
use ProcessableHandlerTrait;
/** @var HandlerInterface[] */
protected $handlers;
protected $bubble;
@@ -116,7 +117,9 @@ class GroupHandler extends Handler implements ProcessableHandlerInterface, Reset
public function setFormatter(FormatterInterface $formatter): HandlerInterface
{
foreach ($this->handlers as $handler) {
$handler->setFormatter($formatter);
if ($handler instanceof FormattableHandlerInterface) {
$handler->setFormatter($formatter);
}
}
return $this;