1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 09:36:11 +02:00

Merge remote-tracking branch 'monolog/master' into docblock_fixes

This commit is contained in:
George Mponos
2018-12-10 21:00:35 +02:00
7 changed files with 25 additions and 16 deletions

View File

@@ -11,7 +11,12 @@
namespace Monolog\Handler\Curl;
class Util
/**
* This class is marked as internal and it is not under the BC promise of the package.
*
* @internal
*/
final class Util
{
private static $retriableErrorCodes = [
CURLE_COULDNT_RESOLVE_HOST,

View File

@@ -43,6 +43,7 @@ class FingersCrossedHandler extends Handler implements ProcessableHandlerInterfa
protected $buffer = [];
protected $stopBuffering;
protected $passthruLevel;
protected $bubble;
/**
* @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler).

View File

@@ -24,6 +24,7 @@ class GroupHandler extends Handler implements ProcessableHandlerInterface, Reset
use ProcessableHandlerTrait;
protected $handlers;
protected $bubble;
/**
* @param HandlerInterface[] $handlers Array of Handlers.

View File

@@ -119,7 +119,7 @@ class HandlerWrapper implements HandlerInterface, ProcessableHandlerInterface, F
public function getFormatter(): FormatterInterface
{
if ($this->handler instanceof FormattableHandlerInterface) {
return $this->handler->getFormatter($formatter);
return $this->handler->getFormatter();
}
throw new \LogicException('The wrapped handler does not implement ' . FormattableHandlerInterface::class);