1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-22 12:53:27 +02:00

Convert level/levelName to enums (#1656)

This commit is contained in:
Jordi Boggiano
2022-04-19 21:49:03 +02:00
committed by GitHub
parent 248673e858
commit 2d006a8472
138 changed files with 1297 additions and 1216 deletions

View File

@@ -37,7 +37,7 @@ class ErrorHandlerTest extends \PHPUnit\Framework\TestCase
$this->assertTrue(is_callable($prop));
$this->assertSame($prevHandler, $prop);
$resHandler = $errHandler->registerErrorHandler([E_USER_NOTICE => Logger::EMERGENCY], false);
$resHandler = $errHandler->registerErrorHandler([E_USER_NOTICE => LogLevel::EMERGENCY], false);
$this->assertSame($errHandler, $resHandler);
trigger_error('Foo', E_USER_ERROR);
$this->assertCount(1, $handler->getRecords());

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class ChromePHPFormatterTest extends TestCase
@@ -23,7 +23,7 @@ class ChromePHPFormatterTest extends TestCase
{
$formatter = new ChromePHPFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -55,7 +55,7 @@ class ChromePHPFormatterTest extends TestCase
{
$formatter = new ChromePHPFormatter();
$record = $this->getRecord(
Logger::CRITICAL,
Level::Critical,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -87,7 +87,7 @@ class ChromePHPFormatterTest extends TestCase
{
$formatter = new ChromePHPFormatter();
$record = $this->getRecord(
Logger::DEBUG,
Level::Debug,
'log',
channel: 'meh',
datetime: new \DateTimeImmutable("@0"),
@@ -114,13 +114,13 @@ class ChromePHPFormatterTest extends TestCase
$formatter = new ChromePHPFormatter();
$records = [
$this->getRecord(
Logger::INFO,
Level::Info,
'log',
channel: 'meh',
datetime: new \DateTimeImmutable("@0"),
),
$this->getRecord(
Logger::WARNING,
Level::Warning,
'log2',
channel: 'foo',
datetime: new \DateTimeImmutable("@0"),

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\LogRecord;
use Monolog\Test\TestCase;
@@ -33,7 +33,7 @@ class ElasticaFormatterTest extends TestCase
{
// test log message
$msg = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['foo' => 7, 'bar', 'class' => new \stdClass],

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class ElasticsearchFormatterTest extends TestCase
@@ -25,7 +25,7 @@ class ElasticsearchFormatterTest extends TestCase
{
// Test log message
$msg = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['foo' => 7, 'bar', 'class' => new \stdClass],

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class FlowdockFormatterTest extends TestCase
@@ -44,8 +44,8 @@ class FlowdockFormatterTest extends TestCase
{
$formatter = new FlowdockFormatter('test_source', 'source@test.com');
$records = [
$this->getRecord(Logger::WARNING),
$this->getRecord(Logger::DEBUG),
$this->getRecord(Level::Warning),
$this->getRecord(Level::Debug),
];
$formatted = $formatter->formatBatch($records);

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class FluentdFormatterTest extends TestCase
@@ -35,7 +35,7 @@ class FluentdFormatterTest extends TestCase
*/
public function testFormat()
{
$record = $this->getRecord(Logger::WARNING, datetime: new \DateTimeImmutable("@0"));
$record = $this->getRecord(Level::Warning, datetime: new \DateTimeImmutable("@0"));
$formatter = new FluentdFormatter();
$this->assertEquals(
@@ -49,7 +49,7 @@ class FluentdFormatterTest extends TestCase
*/
public function testFormatWithTag()
{
$record = $this->getRecord(Logger::ERROR, datetime: new \DateTimeImmutable("@0"));
$record = $this->getRecord(Level::Error, datetime: new \DateTimeImmutable("@0"));
$formatter = new FluentdFormatter(true);
$this->assertEquals(

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class GelfMessageFormatterTest extends TestCase
@@ -30,7 +30,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
datetime: new \DateTimeImmutable("@0"),
@@ -62,7 +62,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -84,7 +84,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -120,7 +120,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger', 'exception' => [
@@ -146,7 +146,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -179,7 +179,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['exception' => str_repeat(' ', 32767)],
@@ -205,7 +205,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter('LONG_SYSTEM_NAME', null, 'ctxt_', PHP_INT_MAX);
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['exception' => str_repeat(' ', 32767 * 2)],
@@ -231,7 +231,7 @@ class GelfMessageFormatterTest extends TestCase
{
$formatter = new GelfMessageFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
str_repeat('в', 32767),
channel: 'meh',
context: ['exception' => str_repeat('а', 32767)],

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\LogRecord;
use Monolog\Test\TestCase;
@@ -85,8 +85,8 @@ class JsonFormatterTest extends TestCase
{
$formatter = new JsonFormatter();
$records = [
$this->getRecord(Logger::WARNING),
$this->getRecord(Logger::DEBUG),
$this->getRecord(Level::Warning),
$this->getRecord(Level::Debug),
];
$this->assertEquals(json_encode($records), $formatter->formatBatch($records));
}
@@ -99,8 +99,8 @@ class JsonFormatterTest extends TestCase
{
$formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES);
$records = [
$this->getRecord(Logger::WARNING),
$this->getRecord(Logger::DEBUG),
$this->getRecord(Level::Warning),
$this->getRecord(Level::Debug),
];
$expected = array_map(fn (LogRecord $record) => json_encode($record->toArray(), JSON_FORCE_OBJECT), $records);
$this->assertEquals(implode("\n", $expected), $formatter->formatBatch($records));
@@ -213,7 +213,7 @@ class JsonFormatterTest extends TestCase
private function formatRecordWithExceptionInContext(JsonFormatter $formatter, \Throwable $exception)
{
$message = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'foobar',
channel: 'core',
context: ['exception' => $exception],
@@ -262,7 +262,7 @@ class JsonFormatterTest extends TestCase
$largeArray = range(1, 1000);
$res = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'bar',
channel: 'test',
context: array($largeArray),
@@ -278,7 +278,7 @@ class JsonFormatterTest extends TestCase
$largeArray = range(1, 2000);
$res = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'bar',
channel: 'test',
context: array($largeArray),
@@ -293,7 +293,7 @@ class JsonFormatterTest extends TestCase
$formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, true, true);
$record = $formatter->format($this->getRecord(
Logger::DEBUG,
Level::Debug,
'Testing',
channel: 'test',
datetime: new \DateTimeImmutable('2022-02-22 00:00:00'),

View File

@@ -12,7 +12,7 @@
namespace Monolog\Formatter;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @covers Monolog\Formatter\LineFormatter
@@ -23,7 +23,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format($this->getRecord(
Logger::WARNING,
Level::Warning,
'foo',
channel: 'log',
));
@@ -34,7 +34,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format($this->getRecord(
Logger::ERROR,
Level::Error,
'foo',
channel: 'meh',
context: [
@@ -51,7 +51,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format($this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
extra: ['ip' => '127.0.0.1'],
@@ -63,7 +63,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter("[%datetime%] %channel%.%level_name%: %message% %context% %extra.file% %extra%\n", 'Y-m-d');
$message = $formatter->format($this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
extra: ['ip' => '127.0.0.1', 'file' => 'test'],
@@ -75,7 +75,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d', false, true);
$message = $formatter->format($this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
));
@@ -86,7 +86,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter('%context.foo% => %extra.foo%');
$message = $formatter->format($this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['foo' => 'bar'],
@@ -100,7 +100,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format($this->getRecord(
Logger::ERROR,
Level::Error,
'foobar',
channel: 'meh',
context: [],
@@ -114,7 +114,7 @@ class LineFormatterTest extends TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'foobar',
channel: 'core',
context: ['exception' => new \RuntimeException('Foo')],
@@ -130,7 +130,7 @@ class LineFormatterTest extends TestCase
$formatter = new LineFormatter(null, 'Y-m-d');
$formatter->includeStacktraces();
$message = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'foobar',
channel: 'core',
context: ['exception' => new \RuntimeException('Foo')],
@@ -146,7 +146,7 @@ class LineFormatterTest extends TestCase
$formatter = new LineFormatter(null, 'Y-m-d');
$previous = new \LogicException('Wut?');
$message = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'foobar',
channel: 'core',
context: ['exception' => new \RuntimeException('Foo', 0, $previous)],
@@ -165,7 +165,7 @@ class LineFormatterTest extends TestCase
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'foobar',
channel: 'core',
context: ['exception' => new \SoapFault('foo', 'bar', 'hello', 'world')],
@@ -176,7 +176,7 @@ class LineFormatterTest extends TestCase
$this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (SoapFault(code: 0 faultcode: foo faultactor: hello detail: world): bar at '.substr($path, 1, -1).':'.(__LINE__ - 5).')"} []'."\n", $message);
$message = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'foobar',
channel: 'core',
context: ['exception' => new \SoapFault('foo', 'bar', 'hello', (object) ['bar' => (object) ['biz' => 'baz'], 'foo' => 'world'])],
@@ -192,12 +192,12 @@ class LineFormatterTest extends TestCase
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->formatBatch([
$this->getRecord(
Logger::CRITICAL,
Level::Critical,
'bar',
channel: 'test',
),
$this->getRecord(
Logger::WARNING,
Level::Warning,
'foo',
channel: 'log',
),

View File

@@ -11,7 +11,8 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
class LogstashFormatterTest extends TestCase
@@ -23,7 +24,7 @@ class LogstashFormatterTest extends TestCase
{
$formatter = new LogstashFormatter('test', 'hostname');
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
datetime: new \DateTimeImmutable("@0"),
@@ -35,8 +36,8 @@ class LogstashFormatterTest extends TestCase
$this->assertEquals("1", $message['@version']);
$this->assertEquals('log', $message['message']);
$this->assertEquals('meh', $message['channel']);
$this->assertEquals('ERROR', $message['level']);
$this->assertEquals(Logger::ERROR, $message['monolog_level']);
$this->assertEquals(LevelName::Error->value, $message['level']);
$this->assertEquals(Level::Error->value, $message['monolog_level']);
$this->assertEquals('test', $message['type']);
$this->assertEquals('hostname', $message['host']);
@@ -54,7 +55,7 @@ class LogstashFormatterTest extends TestCase
{
$formatter = new LogstashFormatter('test');
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -75,7 +76,7 @@ class LogstashFormatterTest extends TestCase
{
$formatter = new LogstashFormatter('test');
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -105,7 +106,7 @@ class LogstashFormatterTest extends TestCase
{
$formatter = new LogstashFormatter('test');
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -132,7 +133,7 @@ class LogstashFormatterTest extends TestCase
{
$formatter = new LogstashFormatter('app', 'test');
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -150,7 +151,7 @@ class LogstashFormatterTest extends TestCase
{
$formatter = new LogstashFormatter('test', 'hostname');
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: '¯\_(ツ)_/¯',
datetime: new \DateTimeImmutable("@0"),

View File

@@ -14,7 +14,8 @@ namespace Monolog\Formatter;
use MongoDB\BSON\ObjectId;
use MongoDB\BSON\Regex;
use MongoDB\BSON\UTCDateTime;
use Monolog\Logger;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
/**
@@ -62,7 +63,7 @@ class MongoDBFormatterTest extends TestCase
{
$record = $this->getRecord(
message: 'some log message',
level: Logger::WARNING,
level: Level::Warning,
channel: 'test',
datetime: new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
);
@@ -73,8 +74,8 @@ class MongoDBFormatterTest extends TestCase
$this->assertCount(7, $formattedRecord);
$this->assertEquals('some log message', $formattedRecord['message']);
$this->assertEquals([], $formattedRecord['context']);
$this->assertEquals(Logger::WARNING, $formattedRecord['level']);
$this->assertEquals(Logger::getLevelName(Logger::WARNING), $formattedRecord['level_name']);
$this->assertEquals(Level::Warning->value, $formattedRecord['level']);
$this->assertEquals(LevelName::Warning->value, $formattedRecord['level_name']);
$this->assertEquals('test', $formattedRecord['channel']);
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $formattedRecord['datetime']);
$this->assertEquals('1453410690123', $formattedRecord['datetime']->__toString());
@@ -96,7 +97,7 @@ class MongoDBFormatterTest extends TestCase
'context_int' => 123456,
'except' => new \Exception('exception message', 987),
],
level: Logger::WARNING,
level: Level::Warning,
channel: 'test',
datetime: new \DateTimeImmutable('2016-01-21T21:11:30.213000+00:00'),
);
@@ -140,7 +141,7 @@ class MongoDBFormatterTest extends TestCase
],
],
],
level: Logger::WARNING,
level: Level::Warning,
channel: 'test',
datetime: new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
);
@@ -174,7 +175,7 @@ class MongoDBFormatterTest extends TestCase
],
],
],
level: Logger::WARNING,
level: Level::Warning,
channel: 'test',
datetime: new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
);
@@ -211,7 +212,7 @@ class MongoDBFormatterTest extends TestCase
context: [
'nest2' => $someObject,
],
level: Logger::WARNING,
level: Level::Warning,
channel: 'test',
datetime: new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
);
@@ -238,7 +239,7 @@ class MongoDBFormatterTest extends TestCase
context: [
'nest2' => new \Exception('exception message', 987),
],
level: Logger::WARNING,
level: Level::Warning,
channel: 'test',
datetime: new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
);
@@ -262,7 +263,7 @@ class MongoDBFormatterTest extends TestCase
'regex' => new Regex('pattern'),
],
],
level: Logger::WARNING,
level: Level::Warning,
channel: 'test',
datetime: new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
);

View File

@@ -11,8 +11,9 @@
namespace Monolog\Formatter;
use Monolog\LevelName;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @covers Monolog\Formatter\NormalizerFormatter
@@ -23,7 +24,7 @@ class NormalizerFormatterTest extends TestCase
{
$formatter = new NormalizerFormatter('Y-m-d');
$formatted = $formatter->format($this->getRecord(
Logger::ERROR,
Level::Error,
'foo',
channel: 'meh',
extra: ['foo' => new TestFooNorm, 'bar' => new TestBarNorm, 'baz' => [], 'res' => fopen('php://memory', 'rb')],
@@ -37,8 +38,8 @@ class NormalizerFormatterTest extends TestCase
));
$this->assertEquals([
'level_name' => 'ERROR',
'level' => Logger::ERROR,
'level_name' => LevelName::Error->value,
'level' => Level::Error->value,
'channel' => 'meh',
'message' => 'foo',
'datetime' => date('Y-m-d'),
@@ -142,13 +143,13 @@ class NormalizerFormatterTest extends TestCase
{
$formatter = new NormalizerFormatter('Y-m-d');
$formatted = $formatter->formatBatch([
$this->getRecord(Logger::CRITICAL, 'bar', channel: 'test'),
$this->getRecord(Logger::WARNING, 'foo', channel: 'log'),
$this->getRecord(Level::Critical, 'bar', channel: 'test'),
$this->getRecord(Level::Warning, 'foo', channel: 'log'),
]);
$this->assertEquals([
[
'level_name' => 'CRITICAL',
'level' => Logger::CRITICAL,
'level_name' => LevelName::Critical->value,
'level' => Level::Critical->value,
'channel' => 'test',
'message' => 'bar',
'context' => [],
@@ -156,8 +157,8 @@ class NormalizerFormatterTest extends TestCase
'extra' => [],
],
[
'level_name' => 'WARNING',
'level' => Logger::WARNING,
'level_name' => LevelName::Warning->value,
'level' => Level::Warning->value,
'channel' => 'log',
'message' => 'foo',
'context' => [],
@@ -241,7 +242,7 @@ class NormalizerFormatterTest extends TestCase
$largeArray = range(1, 1000);
$res = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'bar',
channel: 'test',
context: [$largeArray],
@@ -257,7 +258,7 @@ class NormalizerFormatterTest extends TestCase
$largeArray = range(1, 2000);
$res = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'bar',
channel: 'test',
context: [$largeArray],
@@ -379,7 +380,7 @@ class NormalizerFormatterTest extends TestCase
private function formatRecordWithExceptionInContext(NormalizerFormatter $formatter, \Throwable $exception)
{
$message = $formatter->format($this->getRecord(
Logger::CRITICAL,
Level::Critical,
'foobar',
channel: 'core',
context: ['exception' => $exception],

View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class WildfireFormatterTest extends TestCase
@@ -23,7 +23,7 @@ class WildfireFormatterTest extends TestCase
{
$wildfire = new WildfireFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -46,7 +46,7 @@ class WildfireFormatterTest extends TestCase
{
$wildfire = new WildfireFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
context: ['from' => 'logger'],
@@ -69,7 +69,7 @@ class WildfireFormatterTest extends TestCase
{
$wildfire = new WildfireFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
);
@@ -91,7 +91,7 @@ class WildfireFormatterTest extends TestCase
$wildfire = new WildfireFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'log',
channel: 'meh',
);
@@ -106,7 +106,7 @@ class WildfireFormatterTest extends TestCase
{
$wildfire = new WildfireFormatter();
$record = $this->getRecord(
Logger::ERROR,
Level::Error,
'table-message',
channel: 'table-channel',
context: [

View File

@@ -11,8 +11,8 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\Test\TestCase;
use Monolog\Logger;
class AbstractHandlerTest extends TestCase
{
@@ -25,13 +25,13 @@ class AbstractHandlerTest extends TestCase
*/
public function testConstructAndGetSet()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', [Logger::WARNING, false]);
$this->assertEquals(Logger::WARNING, $handler->getLevel());
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', [Level::Warning, false]);
$this->assertEquals(Level::Warning, $handler->getLevel());
$this->assertEquals(false, $handler->getBubble());
$handler->setLevel(Logger::ERROR);
$handler->setLevel(Level::Error);
$handler->setBubble(true);
$this->assertEquals(Logger::ERROR, $handler->getLevel());
$this->assertEquals(Level::Error, $handler->getLevel());
$this->assertEquals(true, $handler->getBubble());
}
@@ -51,9 +51,9 @@ class AbstractHandlerTest extends TestCase
*/
public function testIsHandling()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', [Logger::WARNING, false]);
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', [Level::Warning, false]);
$this->assertTrue($handler->isHandling($this->getRecord()));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Debug)));
}
/**
@@ -62,8 +62,8 @@ class AbstractHandlerTest extends TestCase
public function testHandlesPsrStyleLevels()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', ['warning', false]);
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Debug)));
$handler->setLevel('debug');
$this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Debug)));
}
}

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Processor\WebProcessor;
use Monolog\Formatter\LineFormatter;
@@ -24,7 +24,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testConstructAndGetSet()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::WARNING, false]);
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Level::Warning, false]);
$handler->setFormatter($formatter = new LineFormatter);
$this->assertSame($formatter, $handler->getFormatter());
}
@@ -34,8 +34,8 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleLowerLevelMessage()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::WARNING, true]);
$this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Level::Warning, true]);
$this->assertFalse($handler->handle($this->getRecord(Level::Debug)));
}
/**
@@ -43,7 +43,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleBubbling()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::DEBUG, true]);
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Level::Debug, true]);
$this->assertFalse($handler->handle($this->getRecord()));
}
@@ -52,7 +52,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleNotBubbling()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::DEBUG, false]);
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Level::Debug, false]);
$this->assertTrue($handler->handle($this->getRecord()));
}
@@ -61,9 +61,9 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleIsFalseWhenNotHandled()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::WARNING, false]);
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Level::Warning, false]);
$this->assertTrue($handler->handle($this->getRecord()));
$this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
$this->assertFalse($handler->handle($this->getRecord(Level::Debug)));
}
/**

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use PhpAmqpLib\Message\AMQPMessage;
/**
@@ -46,7 +46,7 @@ class AmqpHandlerTest extends TestCase
$handler = new AmqpHandler($exchange);
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$expected = [
[
@@ -103,7 +103,7 @@ class AmqpHandlerTest extends TestCase
$handler = new AmqpHandler($exchange, 'log');
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$expected = [
[

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @covers Monolog\Handler\BrowserConsoleHandlerTest
@@ -37,7 +37,7 @@ class BrowserConsoleHandlerTest extends TestCase
$handler = new BrowserConsoleHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG, 'foo[[bar]]{color: red}'));
$handler->handle($this->getRecord(Level::Debug, 'foo[[bar]]{color: red}'));
$expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) {
@@ -53,7 +53,7 @@ EOF;
$handler = new BrowserConsoleHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG, 'foo[[bar]]{color: red}[[baz]]{color: blue}'));
$handler->handle($this->getRecord(Level::Debug, 'foo[[bar]]{color: red}[[baz]]{color: blue}'));
$expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) {
@@ -69,7 +69,7 @@ EOF;
$handler = new BrowserConsoleHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG, "[foo] [[\"bar\n[baz]\"]]{color: red}"));
$handler->handle($this->getRecord(Level::Debug, "[foo] [[\"bar\n[baz]\"]]{color: red}"));
$expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) {
@@ -85,9 +85,9 @@ EOF;
$handler = new BrowserConsoleHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}'));
$handler->handle($this->getRecord(Logger::DEBUG, '[[bar]]{macro: autolabel}'));
$handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}'));
$handler->handle($this->getRecord(Level::Debug, '[[foo]]{macro: autolabel}'));
$handler->handle($this->getRecord(Level::Debug, '[[bar]]{macro: autolabel}'));
$handler->handle($this->getRecord(Level::Debug, '[[foo]]{macro: autolabel}'));
$expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) {
@@ -105,7 +105,7 @@ EOF;
$handler = new BrowserConsoleHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG, 'test', ['foo' => 'bar', 0 => 'oop']));
$handler->handle($this->getRecord(Level::Debug, 'test', ['foo' => 'bar', 0 => 'oop']));
$expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) {
@@ -128,10 +128,10 @@ EOF;
$handler2 = new BrowserConsoleHandler();
$handler2->setFormatter($this->getIdentityFormatter());
$handler1->handle($this->getRecord(Logger::DEBUG, 'test1'));
$handler2->handle($this->getRecord(Logger::DEBUG, 'test2'));
$handler1->handle($this->getRecord(Logger::DEBUG, 'test3'));
$handler2->handle($this->getRecord(Logger::DEBUG, 'test4'));
$handler1->handle($this->getRecord(Level::Debug, 'test1'));
$handler2->handle($this->getRecord(Level::Debug, 'test2'));
$handler1->handle($this->getRecord(Level::Debug, 'test3'));
$handler2->handle($this->getRecord(Level::Debug, 'test4'));
$expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) {

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class BufferHandlerTest extends TestCase
{
@@ -27,8 +27,8 @@ class BufferHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new BufferHandler($test);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$this->assertFalse($test->hasDebugRecords());
$this->assertFalse($test->hasInfoRecords());
$handler->close();
@@ -44,8 +44,8 @@ class BufferHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new BufferHandler($test);
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Warning));
$handler->handle($this->getRecord(Level::Debug));
$this->shutdownCheckHandler = $test;
register_shutdown_function([$this, 'checkPropagation']);
}
@@ -65,10 +65,10 @@ class BufferHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new BufferHandler($test, 2);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$handler->handle($this->getRecord(Level::Warning));
$handler->close();
$this->assertTrue($test->hasWarningRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -81,22 +81,22 @@ class BufferHandlerTest extends TestCase
public function testHandleBufferLimitWithFlushOnOverflow()
{
$test = new TestHandler();
$handler = new BufferHandler($test, 3, Logger::DEBUG, true, true);
$handler = new BufferHandler($test, 3, Level::Debug, true, true);
// send two records
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Debug));
$this->assertFalse($test->hasDebugRecords());
$this->assertCount(0, $test->getRecords());
// overflow
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Info));
$this->assertTrue($test->hasDebugRecords());
$this->assertCount(3, $test->getRecords());
// should buffer again
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertCount(3, $test->getRecords());
$handler->close();
@@ -111,11 +111,11 @@ class BufferHandlerTest extends TestCase
public function testHandleLevel()
{
$test = new TestHandler();
$handler = new BufferHandler($test, 0, Logger::INFO);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler = new BufferHandler($test, 0, Level::Info);
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$handler->handle($this->getRecord(Level::Warning));
$handler->handle($this->getRecord(Level::Debug));
$handler->close();
$this->assertTrue($test->hasWarningRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -129,8 +129,8 @@ class BufferHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new BufferHandler($test, 0);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$handler->flush();
$this->assertTrue($test->hasInfoRecords());
$this->assertTrue($test->hasDebugRecords());
@@ -149,7 +149,7 @@ class BufferHandlerTest extends TestCase
return $record;
});
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$handler->flush();
$this->assertTrue($test->hasWarningRecords());
$records = $test->getRecords();

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @covers Monolog\Handler\ChromePHPHandler
@@ -34,8 +34,8 @@ class ChromePHPHandlerTest extends TestCase
$handler = new TestChromePHPHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Warning));
$expected = [
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode([
@@ -65,11 +65,11 @@ class ChromePHPHandlerTest extends TestCase
public function testHeadersOverflow()
{
$handler = new TestChromePHPHandler();
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 2 * 1024)));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Warning, str_repeat('a', 2 * 1024)));
// overflow chrome headers limit
$handler->handle($this->getRecord(Logger::WARNING, str_repeat('b', 2 * 1024)));
$handler->handle($this->getRecord(Level::Warning, str_repeat('b', 2 * 1024)));
$expected = [
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode([
@@ -106,13 +106,13 @@ class ChromePHPHandlerTest extends TestCase
{
$handler = new TestChromePHPHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Warning));
$handler2 = new TestChromePHPHandler();
$handler2->setFormatter($this->getIdentityFormatter());
$handler2->handle($this->getRecord(Logger::DEBUG));
$handler2->handle($this->getRecord(Logger::WARNING));
$handler2->handle($this->getRecord(Level::Debug));
$handler2->handle($this->getRecord(Level::Warning));
$expected = [
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode([

View File

@@ -12,13 +12,13 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class CouchDBHandlerTest extends TestCase
{
public function testHandle()
{
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new CouchDBHandler();

View File

@@ -11,8 +11,8 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\Test\TestCase;
use Monolog\Logger;
class DeduplicationHandlerTest extends TestCase
{
@@ -23,10 +23,10 @@ class DeduplicationHandlerTest extends TestCase
{
$test = new TestHandler();
@unlink(sys_get_temp_dir().'/monolog_dedup.log');
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', Level::Debug);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$handler->flush();
@@ -43,10 +43,10 @@ class DeduplicationHandlerTest extends TestCase
{
$test = new TestHandler();
@unlink(sys_get_temp_dir().'/monolog_dedup.log');
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', Level::Debug);
$handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
$handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
$handler->handle($this->getRecord(Level::Error, 'Foo:bar'));
$handler->handle($this->getRecord(Level::Critical, "Foo\nbar"));
$handler->flush();
@@ -64,10 +64,10 @@ class DeduplicationHandlerTest extends TestCase
public function testFlushSkipsIfLogExists()
{
$test = new TestHandler();
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', Level::Debug);
$handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
$handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
$handler->handle($this->getRecord(Level::Error, 'Foo:bar'));
$handler->handle($this->getRecord(Level::Critical, "Foo\nbar"));
$handler->flush();
@@ -85,11 +85,11 @@ class DeduplicationHandlerTest extends TestCase
public function testFlushPassthruIfLogTooOld()
{
$test = new TestHandler();
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', Level::Debug);
$record = $this->getRecord(Logger::ERROR, datetime: new \DateTimeImmutable('+62seconds'));
$record = $this->getRecord(Level::Error, datetime: new \DateTimeImmutable('+62seconds'));
$handler->handle($record);
$record = $this->getRecord(Logger::CRITICAL, datetime: new \DateTimeImmutable('+62seconds'));
$record = $this->getRecord(Level::Critical, datetime: new \DateTimeImmutable('+62seconds'));
$handler->handle($record);
$handler->flush();
@@ -109,14 +109,14 @@ class DeduplicationHandlerTest extends TestCase
{
$test = new TestHandler();
@unlink(sys_get_temp_dir().'/monolog_dedup.log');
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', Level::Debug);
// handle two records from yesterday, and one recent
$record = $this->getRecord(Logger::ERROR, datetime: new \DateTimeImmutable('-1day -10seconds'));
$record = $this->getRecord(Level::Error, datetime: new \DateTimeImmutable('-1day -10seconds'));
$handler->handle($record);
$record2 = $this->getRecord(Logger::CRITICAL, datetime: new \DateTimeImmutable('-1day -10seconds'));
$record2 = $this->getRecord(Level::Critical, datetime: new \DateTimeImmutable('-1day -10seconds'));
$handler->handle($record2);
$record3 = $this->getRecord(Logger::CRITICAL, datetime: new \DateTimeImmutable('-30seconds'));
$record3 = $this->getRecord(Level::Critical, datetime: new \DateTimeImmutable('-30seconds'));
$handler->handle($record3);
// log is written as none of them are duplicate
@@ -137,8 +137,8 @@ class DeduplicationHandlerTest extends TestCase
$this->assertFalse($test->hasCriticalRecords());
// log new records, duplicate log gets GC'd at the end of this flush call
$handler->handle($record = $this->getRecord(Logger::ERROR));
$handler->handle($record2 = $this->getRecord(Logger::CRITICAL));
$handler->handle($record = $this->getRecord(Level::Error));
$handler->handle($record2 = $this->getRecord(Level::Critical));
$handler->flush();
// log should now contain the new errors and the previous one that was recent enough

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class DoctrineCouchDBHandlerTest extends TestCase
{
@@ -30,12 +30,12 @@ class DoctrineCouchDBHandlerTest extends TestCase
->disableOriginalConstructor()
->getMock();
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$expected = [
'message' => 'test',
'context' => ['data' => ['stdClass' => []], 'foo' => 34],
'level' => Logger::WARNING,
'level' => Level::Warning->value,
'level_name' => 'WARNING',
'channel' => 'test',
'datetime' => (string) $record->datetime,

View File

@@ -14,7 +14,7 @@ namespace Monolog\Handler;
use Monolog\Formatter\ElasticaFormatter;
use Monolog\Formatter\NormalizerFormatter;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\LogRecord;
use Elastica\Client;
use Elastica\Request;
@@ -58,7 +58,7 @@ class ElasticaHandlerTest extends TestCase
public function testHandle()
{
// log message
$msg = $this->getRecord(Logger::ERROR, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$msg = $this->getRecord(Level::Error, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
// format expected result
$formatter = new ElasticaFormatter($this->options['index'], $this->options['type']);
@@ -158,7 +158,7 @@ class ElasticaHandlerTest extends TestCase
*/
public function testHandleIntegration()
{
$msg = $this->getRecord(Logger::ERROR, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$msg = $this->getRecord(Level::Error, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$expected = $msg->toArray();
$expected['datetime'] = $msg['datetime']->format(\DateTime::ISO8601);
@@ -204,7 +204,7 @@ class ElasticaHandlerTest extends TestCase
*/
public function testHandleIntegrationNewESVersion()
{
$msg = $this->getRecord(Logger::ERROR, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$msg = $this->getRecord(Level::Error, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$expected = (array) $msg;
$expected['datetime'] = $msg['datetime']->format(\DateTime::ISO8601);

View File

@@ -15,7 +15,7 @@ use Elasticsearch\ClientBuilder;
use Monolog\Formatter\ElasticsearchFormatter;
use Monolog\Formatter\NormalizerFormatter;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Elasticsearch\Client;
class ElasticsearchHandlerTest extends TestCase
@@ -56,7 +56,7 @@ class ElasticsearchHandlerTest extends TestCase
public function testHandle()
{
// log message
$msg = $this->getRecord(Logger::ERROR, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$msg = $this->getRecord(Level::Error, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
// format expected result
$formatter = new ElasticsearchFormatter($this->options['index'], $this->options['type']);
@@ -172,7 +172,7 @@ class ElasticsearchHandlerTest extends TestCase
*/
public function testHandleIntegration()
{
$msg = $this->getRecord(Logger::ERROR, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$msg = $this->getRecord(Level::Error, 'log', context: ['foo' => 7, 'bar', 'class' => new \stdClass], datetime: new \DateTimeImmutable("@0"));
$expected = $msg->toArray();
$expected['datetime'] = $msg['datetime']->format(\DateTime::ISO8601);

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Formatter\LineFormatter;
function error_log()
@@ -46,14 +46,14 @@ class ErrorLogHandlerTest extends TestCase
$type = ErrorLogHandler::OPERATING_SYSTEM;
$handler = new ErrorLogHandler($type);
$handler->setFormatter(new LineFormatter('%channel%.%level_name%: %message% %context% %extra%', null, true));
$handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
$handler->handle($this->getRecord(Level::Error, "Foo\nBar\r\n\r\nBaz"));
$this->assertSame("test.ERROR: Foo\nBar\r\n\r\nBaz [] []", $GLOBALS['error_log'][0][0]);
$this->assertSame($GLOBALS['error_log'][0][1], $type);
$handler = new ErrorLogHandler($type, Logger::DEBUG, true, true);
$handler = new ErrorLogHandler($type, Level::Debug, true, true);
$handler->setFormatter(new LineFormatter(null, null, true));
$handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
$handler->handle($this->getRecord(Level::Error, "Foo\nBar\r\n\r\nBaz"));
$this->assertStringMatchesFormat('[%s] test.ERROR: Foo', $GLOBALS['error_log'][1][0]);
$this->assertSame($GLOBALS['error_log'][1][1], $type);

View File

@@ -11,7 +11,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class FallbackGroupHandlerTest extends TestCase
@@ -26,8 +26,8 @@ class FallbackGroupHandlerTest extends TestCase
$testHandlerTwo = new TestHandler();
$testHandlers = [$testHandlerOne, $testHandlerTwo];
$handler = new FallbackGroupHandler($testHandlers);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$this->assertCount(2, $testHandlerOne->getRecords());
$this->assertCount(0, $testHandlerTwo->getRecords());
@@ -43,8 +43,8 @@ class FallbackGroupHandlerTest extends TestCase
$testHandlerTwo = new TestHandler();
$testHandlers = [$testHandlerOne, $testHandlerTwo];
$handler = new FallbackGroupHandler($testHandlers);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$this->assertCount(0, $testHandlerOne->getRecords());
$this->assertCount(2, $testHandlerTwo->getRecords());
@@ -59,7 +59,7 @@ class FallbackGroupHandlerTest extends TestCase
$testHandlerTwo = new TestHandler();
$testHandlers = [$testHandlerOne, $testHandlerTwo];
$handler = new FallbackGroupHandler($testHandlers);
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
$handler->handleBatch([$this->getRecord(Level::Debug), $this->getRecord(Level::Info)]);
$this->assertCount(2, $testHandlerOne->getRecords());
$this->assertCount(0, $testHandlerTwo->getRecords());
}
@@ -73,7 +73,7 @@ class FallbackGroupHandlerTest extends TestCase
$testHandlerTwo = new TestHandler();
$testHandlers = [$testHandlerOne, $testHandlerTwo];
$handler = new FallbackGroupHandler($testHandlers);
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
$handler->handleBatch([$this->getRecord(Level::Debug), $this->getRecord(Level::Info)]);
$this->assertCount(0, $testHandlerOne->getRecords());
$this->assertCount(2, $testHandlerTwo->getRecords());
}
@@ -83,11 +83,11 @@ class FallbackGroupHandlerTest extends TestCase
*/
public function testIsHandling()
{
$testHandlers = [new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING)];
$testHandlers = [new TestHandler(Level::Error), new TestHandler(Level::Warning)];
$handler = new FallbackGroupHandler($testHandlers);
$this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
$this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Error)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Warning)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Debug)));
}
/**
@@ -102,7 +102,7 @@ class FallbackGroupHandlerTest extends TestCase
return $record;
});
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasWarningRecords());
$records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']);
@@ -127,7 +127,7 @@ class FallbackGroupHandlerTest extends TestCase
return $record;
});
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
$handler->handleBatch([$this->getRecord(Level::Debug), $this->getRecord(Level::Info)]);
$this->assertEmpty($testHandlerOne->getRecords());
$this->assertTrue($testHandlerTwo->hasDebugRecords());
$this->assertTrue($testHandlerTwo->hasInfoRecords());

View File

@@ -11,7 +11,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class FilterHandlerTest extends TestCase
@@ -22,15 +22,15 @@ class FilterHandlerTest extends TestCase
public function testIsHandling()
{
$test = new TestHandler();
$handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE);
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
$this->assertTrue($handler->isHandling($this->getRecord(Logger::INFO)));
$this->assertTrue($handler->isHandling($this->getRecord(Logger::NOTICE)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::WARNING)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::ERROR)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::CRITICAL)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::ALERT)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::EMERGENCY)));
$handler = new FilterHandler($test, Level::Info, Level::Notice);
$this->assertFalse($handler->isHandling($this->getRecord(Level::Debug)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Info)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Notice)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Warning)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Error)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Critical)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Alert)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Emergency)));
}
/**
@@ -41,39 +41,39 @@ class FilterHandlerTest extends TestCase
public function testHandleProcessOnlyNeededLevels()
{
$test = new TestHandler();
$handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE);
$handler = new FilterHandler($test, Level::Info, Level::Notice);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Debug));
$this->assertFalse($test->hasDebugRecords());
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Info));
$this->assertTrue($test->hasInfoRecords());
$handler->handle($this->getRecord(Logger::NOTICE));
$handler->handle($this->getRecord(Level::Notice));
$this->assertTrue($test->hasNoticeRecords());
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertFalse($test->hasWarningRecords());
$handler->handle($this->getRecord(Logger::ERROR));
$handler->handle($this->getRecord(Level::Error));
$this->assertFalse($test->hasErrorRecords());
$handler->handle($this->getRecord(Logger::CRITICAL));
$handler->handle($this->getRecord(Level::Critical));
$this->assertFalse($test->hasCriticalRecords());
$handler->handle($this->getRecord(Logger::ALERT));
$handler->handle($this->getRecord(Level::Alert));
$this->assertFalse($test->hasAlertRecords());
$handler->handle($this->getRecord(Logger::EMERGENCY));
$handler->handle($this->getRecord(Level::Emergency));
$this->assertFalse($test->hasEmergencyRecords());
$test = new TestHandler();
$handler = new FilterHandler($test, [Logger::INFO, Logger::ERROR]);
$handler = new FilterHandler($test, [Level::Info, Level::Error]);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Debug));
$this->assertFalse($test->hasDebugRecords());
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Info));
$this->assertTrue($test->hasInfoRecords());
$handler->handle($this->getRecord(Logger::NOTICE));
$handler->handle($this->getRecord(Level::Notice));
$this->assertFalse($test->hasNoticeRecords());
$handler->handle($this->getRecord(Logger::ERROR));
$handler->handle($this->getRecord(Level::Error));
$this->assertTrue($test->hasErrorRecords());
$handler->handle($this->getRecord(Logger::CRITICAL));
$handler->handle($this->getRecord(Level::Critical));
$this->assertFalse($test->hasCriticalRecords());
}
@@ -86,15 +86,16 @@ class FilterHandlerTest extends TestCase
$test = new TestHandler();
$handler = new FilterHandler($test);
$levels = [Logger::INFO, Logger::ERROR];
$levels = [Level::Info, Level::Error];
$levelsExpect = [Level::Info, Level::Error];
$handler->setAcceptedLevels($levels);
$this->assertSame($levels, $handler->getAcceptedLevels());
$this->assertSame($levelsExpect, $handler->getAcceptedLevels());
$handler->setAcceptedLevels(['info', 'error']);
$this->assertSame($levels, $handler->getAcceptedLevels());
$this->assertSame($levelsExpect, $handler->getAcceptedLevels());
$levels = [Logger::CRITICAL, Logger::ALERT, Logger::EMERGENCY];
$handler->setAcceptedLevels(Logger::CRITICAL, Logger::EMERGENCY);
$levels = [Level::Critical, Level::Alert, Level::Emergency];
$handler->setAcceptedLevels(Level::Critical, Level::Emergency);
$this->assertSame($levels, $handler->getAcceptedLevels());
$handler->setAcceptedLevels('critical', 'emergency');
@@ -107,7 +108,7 @@ class FilterHandlerTest extends TestCase
public function testHandleUsesProcessors()
{
$test = new TestHandler();
$handler = new FilterHandler($test, Logger::DEBUG, Logger::EMERGENCY);
$handler = new FilterHandler($test, Level::Debug, Level::Emergency);
$handler->pushProcessor(
function ($record) {
$record->extra['foo'] = true;
@@ -115,7 +116,7 @@ class FilterHandlerTest extends TestCase
return $record;
}
);
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasWarningRecords());
$records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']);
@@ -128,13 +129,13 @@ class FilterHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, false);
$this->assertTrue($handler->handle($this->getRecord(Logger::INFO)));
$this->assertFalse($handler->handle($this->getRecord(Logger::WARNING)));
$handler = new FilterHandler($test, Level::Info, Level::Notice, false);
$this->assertTrue($handler->handle($this->getRecord(Level::Info)));
$this->assertFalse($handler->handle($this->getRecord(Level::Warning)));
$handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, true);
$this->assertFalse($handler->handle($this->getRecord(Logger::INFO)));
$this->assertFalse($handler->handle($this->getRecord(Logger::WARNING)));
$handler = new FilterHandler($test, Level::Info, Level::Notice, true);
$this->assertFalse($handler->handle($this->getRecord(Level::Info)));
$this->assertFalse($handler->handle($this->getRecord(Level::Warning)));
}
/**
@@ -147,12 +148,12 @@ class FilterHandlerTest extends TestCase
function ($record, $handler) use ($test) {
return $test;
},
Logger::INFO,
Logger::NOTICE,
Level::Info,
Level::Notice,
false
);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$this->assertFalse($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
}
@@ -170,7 +171,7 @@ class FilterHandlerTest extends TestCase
$this->expectException(\RuntimeException::class);
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
}
public function testHandleEmptyBatch()
@@ -188,12 +189,12 @@ class FilterHandlerTest extends TestCase
public function testResetTestHandler()
{
$test = new TestHandler();
$handler = new FilterHandler($test, [Logger::INFO, Logger::ERROR]);
$handler = new FilterHandler($test, [Level::Info, Level::Error]);
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Info));
$this->assertTrue($test->hasInfoRecords());
$handler->handle($this->getRecord(Logger::ERROR));
$handler->handle($this->getRecord(Level::Error));
$this->assertTrue($test->hasErrorRecords());
$handler->reset();

View File

@@ -11,8 +11,8 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
use Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy;
use Psr\Log\LogLevel;
@@ -28,11 +28,11 @@ class FingersCrossedHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$this->assertFalse($test->hasDebugRecords());
$this->assertFalse($test->hasInfoRecords());
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$handler->close();
$this->assertTrue($test->hasInfoRecords());
$this->assertCount(3, $test->getRecords());
@@ -46,8 +46,8 @@ class FingersCrossedHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test);
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Warning));
$handler->handle($this->getRecord(Level::Debug));
$handler->close();
$this->assertTrue($test->hasWarningRecords());
$this->assertTrue($test->hasDebugRecords());
@@ -63,10 +63,10 @@ class FingersCrossedHandlerTest extends TestCase
$test = new TestHandler();
$test->setSkipReset(true);
$handler = new FingersCrossedHandler($test);
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Warning));
$handler->handle($this->getRecord(Level::Debug));
$handler->reset();
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Info));
$handler->close();
$this->assertTrue($test->hasWarningRecords());
$this->assertTrue($test->hasDebugRecords());
@@ -80,10 +80,10 @@ class FingersCrossedHandlerTest extends TestCase
public function testHandleResetBufferingAfterBeingTriggeredWhenStopBufferingIsDisabled()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, Logger::WARNING, 0, false, false);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::INFO));
$handler = new FingersCrossedHandler($test, Level::Warning, 0, false, false);
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Warning));
$handler->handle($this->getRecord(Level::Info));
$handler->close();
$this->assertTrue($test->hasWarningRecords());
$this->assertTrue($test->hasDebugRecords());
@@ -97,11 +97,11 @@ class FingersCrossedHandlerTest extends TestCase
public function testHandleBufferLimit()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, Logger::WARNING, 2);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Logger::WARNING));
$handler = new FingersCrossedHandler($test, Level::Warning, 2);
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasWarningRecords());
$this->assertTrue($test->hasInfoRecords());
$this->assertFalse($test->hasDebugRecords());
@@ -117,11 +117,11 @@ class FingersCrossedHandlerTest extends TestCase
$handler = new FingersCrossedHandler(function ($record, $handler) use ($test) {
return $test;
});
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$this->assertFalse($test->hasDebugRecords());
$this->assertFalse($test->hasInfoRecords());
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasInfoRecords());
$this->assertCount(3, $test->getRecords());
}
@@ -138,7 +138,7 @@ class FingersCrossedHandlerTest extends TestCase
$this->expectException(\RuntimeException::class);
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
}
/**
@@ -147,8 +147,8 @@ class FingersCrossedHandlerTest extends TestCase
public function testIsHandlingAlways()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, Logger::ERROR);
$this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG)));
$handler = new FingersCrossedHandler($test, Level::Error);
$this->assertTrue($handler->isHandling($this->getRecord(Level::Debug)));
}
/**
@@ -159,10 +159,10 @@ class FingersCrossedHandlerTest extends TestCase
public function testErrorLevelActivationStrategy()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Level::Warning));
$handler->handle($this->getRecord(Level::Debug));
$this->assertFalse($test->hasDebugRecords());
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasWarningRecords());
}
@@ -176,9 +176,9 @@ class FingersCrossedHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy('warning'));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Debug));
$this->assertFalse($test->hasDebugRecords());
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasWarningRecords());
}
@@ -191,11 +191,11 @@ class FingersCrossedHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy('warning'));
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Debug));
$this->assertFalse($test->hasDebugRecords());
$handler->activate();
$this->assertTrue($test->hasDebugRecords());
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Info));
$this->assertTrue($test->hasInfoRecords());
}
@@ -206,10 +206,10 @@ class FingersCrossedHandlerTest extends TestCase
public function testChannelLevelActivationStrategy()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy(Logger::ERROR, ['othertest' => Logger::DEBUG]));
$handler->handle($this->getRecord(Logger::WARNING));
$handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy(Level::Error, ['othertest' => Level::Debug]));
$handler->handle($this->getRecord(Level::Warning));
$this->assertFalse($test->hasWarningRecords());
$record = $this->getRecord(Logger::DEBUG, channel: 'othertest');
$record = $this->getRecord(Level::Debug, channel: 'othertest');
$handler->handle($record);
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasWarningRecords());
@@ -223,9 +223,9 @@ class FingersCrossedHandlerTest extends TestCase
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy('error', ['othertest' => 'debug']));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertFalse($test->hasWarningRecords());
$record = $this->getRecord(Logger::DEBUG, channel: 'othertest');
$record = $this->getRecord(Level::Debug, channel: 'othertest');
$handler->handle($record);
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasWarningRecords());
@@ -238,13 +238,13 @@ class FingersCrossedHandlerTest extends TestCase
public function testHandleUsesProcessors()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, Logger::INFO);
$handler = new FingersCrossedHandler($test, Level::Info);
$handler->pushProcessor(function ($record) {
$record->extra['foo'] = true;
return $record;
});
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasWarningRecords());
$records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']);
@@ -256,9 +256,9 @@ class FingersCrossedHandlerTest extends TestCase
public function testPassthruOnClose()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, Logger::INFO);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Level::Warning), 0, true, true, Level::Info);
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$handler->close();
$this->assertFalse($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -270,9 +270,9 @@ class FingersCrossedHandlerTest extends TestCase
public function testPsrLevelPassthruOnClose()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, LogLevel::INFO);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Level::Warning), 0, true, true, LogLevel::INFO);
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
$handler->close();
$this->assertFalse($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @covers Monolog\Handler\FirePHPHandler
@@ -29,8 +29,8 @@ class FirePHPHandlerTest extends TestCase
{
$handler = new TestFirePHPHandler;
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Warning));
$expected = [
'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',
@@ -47,13 +47,13 @@ class FirePHPHandlerTest extends TestCase
{
$handler = new TestFirePHPHandler;
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Warning));
$handler2 = new TestFirePHPHandler;
$handler2->setFormatter($this->getIdentityFormatter());
$handler2->handle($this->getRecord(Logger::DEBUG));
$handler2->handle($this->getRecord(Logger::WARNING));
$handler2->handle($this->getRecord(Level::Debug));
$handler2->handle($this->getRecord(Level::Warning));
$expected = [
'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Formatter\LineFormatter;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
/**
@@ -47,7 +47,7 @@ class FleepHookHandlerTest extends TestCase
*/
public function testConstructorSetsExpectedDefaults()
{
$this->assertEquals(Logger::DEBUG, $this->handler->getLevel());
$this->assertEquals(Level::Debug, $this->handler->getLevel());
$this->assertEquals(true, $this->handler->getBubble());
}
@@ -56,7 +56,7 @@ class FleepHookHandlerTest extends TestCase
*/
public function testHandlerUsesLineFormatterWhichIgnoresEmptyArrays()
{
$record = $this->getRecord(Logger::DEBUG, 'msg');
$record = $this->getRecord(Level::Debug, 'msg');
$expectedFormatter = new LineFormatter(null, null, true, true);
$expected = $expectedFormatter->format($record);

View File

@@ -13,7 +13,7 @@ namespace Monolog\Handler;
use Monolog\Formatter\FlowdockFormatter;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @author Dominik Liebler <liebler.dominik@gmail.com>
@@ -41,7 +41,7 @@ class FlowdockHandlerTest extends TestCase
public function testWriteHeader()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -61,7 +61,7 @@ class FlowdockHandlerTest extends TestCase
private function createHandler($token = 'myToken')
{
$constructorArgs = [$token, Logger::DEBUG];
$constructorArgs = [$token, Level::Debug];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMockBuilder('Monolog\Handler\FlowdockHandler')
->setConstructorArgs($constructorArgs)

View File

@@ -13,7 +13,7 @@ namespace Monolog\Handler;
use Gelf\Message;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Formatter\GelfMessageFormatter;
class GelfHandlerTest extends TestCase
@@ -51,7 +51,7 @@ class GelfHandlerTest extends TestCase
public function testDebug()
{
$record = $this->getRecord(Logger::DEBUG, "A test debug message");
$record = $this->getRecord(Level::Debug, "A test debug message");
$expectedMessage = new Message();
$expectedMessage
->setLevel(7)
@@ -72,7 +72,7 @@ class GelfHandlerTest extends TestCase
public function testWarning()
{
$record = $this->getRecord(Logger::WARNING, "A test warning message");
$record = $this->getRecord(Level::Warning, "A test warning message");
$expectedMessage = new Message();
$expectedMessage
->setLevel(4)
@@ -94,7 +94,7 @@ class GelfHandlerTest extends TestCase
public function testInjectedGelfMessageFormatter()
{
$record = $this->getRecord(
Logger::WARNING,
Level::Warning,
"A test warning message",
extra: ['blarg' => 'yep'],
context: ['from' => 'logger'],

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class GroupHandlerTest extends TestCase
{
@@ -34,8 +34,8 @@ class GroupHandlerTest extends TestCase
{
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new GroupHandler($testHandlers);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -50,7 +50,7 @@ class GroupHandlerTest extends TestCase
{
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new GroupHandler($testHandlers);
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
$handler->handleBatch([$this->getRecord(Level::Debug), $this->getRecord(Level::Info)]);
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -63,11 +63,11 @@ class GroupHandlerTest extends TestCase
*/
public function testIsHandling()
{
$testHandlers = [new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING)];
$testHandlers = [new TestHandler(Level::Error), new TestHandler(Level::Warning)];
$handler = new GroupHandler($testHandlers);
$this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
$this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Error)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Warning)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Debug)));
}
/**
@@ -82,7 +82,7 @@ class GroupHandlerTest extends TestCase
return $record;
});
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasWarningRecords());
$records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']);
@@ -105,7 +105,7 @@ class GroupHandlerTest extends TestCase
return $record;
});
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
$handler->handleBatch([$this->getRecord(Level::Debug), $this->getRecord(Level::Info)]);
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @author Robert Kaufmann III <rok3@rok3.me>
@@ -33,7 +33,7 @@ class InsightOpsHandlerTest extends TestCase
public function testWriteContent()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'Critical write test'));
$this->handler->handle($this->getRecord(Level::Critical, 'Critical write test'));
fseek($this->resource, 0);
$content = fread($this->resource, 1024);
@@ -55,7 +55,7 @@ class InsightOpsHandlerTest extends TestCase
private function createHandler()
{
$useSSL = extension_loaded('openssl');
$args = array('testToken', 'us', $useSSL, Logger::DEBUG, true);
$args = array('testToken', 'us', $useSSL, Level::Debug, true);
$this->resource = fopen('php://memory', 'a');
$this->handler = $this->getMockBuilder(InsightOpsHandler::class)
->onlyMethods(array('fsockopen', 'streamSetTimeout', 'closeSocket'))

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @author Robert Kaufmann III <rok3@rok3.me>
@@ -32,7 +32,7 @@ class LogEntriesHandlerTest extends TestCase
public function testWriteContent()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'Critical write test'));
$this->handler->handle($this->getRecord(Level::Critical, 'Critical write test'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -59,7 +59,7 @@ class LogEntriesHandlerTest extends TestCase
private function createHandler()
{
$useSSL = extension_loaded('openssl');
$args = ['testToken', $useSSL, Logger::DEBUG, true];
$args = ['testToken', $useSSL, Level::Debug, true];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMockBuilder('Monolog\Handler\LogEntriesHandler')
->setConstructorArgs($args)

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @author Julien Breux <julien.breux@gmail.com>
@@ -32,7 +32,7 @@ class LogmaticHandlerTest extends TestCase
public function testWriteContent()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'Critical write test'));
$this->handler->handle($this->getRecord(Level::Critical, 'Critical write test'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -59,7 +59,7 @@ class LogmaticHandlerTest extends TestCase
private function createHandler()
{
$useSSL = extension_loaded('openssl');
$args = ['testToken', 'testHostname', 'testAppname', $useSSL, Logger::DEBUG, true];
$args = ['testToken', 'testHostname', 'testAppname', $useSSL, Level::Debug, true];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMockBuilder('Monolog\Handler\LogmaticHandler')
->setConstructorArgs($args)

View File

@@ -11,7 +11,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
class MailHandlerTest extends TestCase
@@ -42,15 +42,15 @@ class MailHandlerTest extends TestCase
public function testHandleBatchNotSendsMailIfMessagesAreBelowLevel()
{
$records = [
$this->getRecord(Logger::DEBUG, 'debug message 1'),
$this->getRecord(Logger::DEBUG, 'debug message 2'),
$this->getRecord(Logger::INFO, 'information'),
$this->getRecord(Level::Debug, 'debug message 1'),
$this->getRecord(Level::Debug, 'debug message 2'),
$this->getRecord(Level::Info, 'information'),
];
$handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
$handler->expects($this->never())
->method('send');
$handler->setLevel(Logger::ERROR);
$handler->setLevel(Level::Error);
$handler->handleBatch($records);
}

View File

@@ -11,8 +11,8 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\Test\TestCase;
use Monolog\Logger;
function mail($to, $subject, $message, $additional_headers = null, $additional_parameters = null)
{
@@ -79,7 +79,7 @@ class NativeMailerHandlerTest extends TestCase
$this->assertEmpty($GLOBALS['mail']);
// non-empty batch
$mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
$mailer->handle($this->getRecord(Level::Error, "Foo\nBar\r\n\r\nBaz"));
$this->assertNotEmpty($GLOBALS['mail']);
$this->assertIsArray($GLOBALS['mail']);
$this->assertArrayHasKey('0', $GLOBALS['mail']);
@@ -95,7 +95,7 @@ class NativeMailerHandlerTest extends TestCase
public function testMessageSubjectFormatting()
{
$mailer = new NativeMailerHandler('to@example.org', 'Alert: %level_name% %message%', 'from@example.org');
$mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
$mailer->handle($this->getRecord(Level::Error, "Foo\nBar\r\n\r\nBaz"));
$this->assertNotEmpty($GLOBALS['mail']);
$this->assertIsArray($GLOBALS['mail']);
$this->assertArrayHasKey('0', $GLOBALS['mail']);

View File

@@ -13,7 +13,7 @@ namespace Monolog\Handler;
use Monolog\Formatter\LineFormatter;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class NewRelicHandlerTest extends TestCase
{
@@ -34,27 +34,27 @@ class NewRelicHandlerTest extends TestCase
$this->expectException(MissingExtensionException::class);
$handler->handle($this->getRecord(Logger::ERROR));
$handler->handle($this->getRecord(Level::Error));
}
public function testThehandlerCanHandleTheRecord()
{
$handler = new StubNewRelicHandler();
$handler->handle($this->getRecord(Logger::ERROR));
$handler->handle($this->getRecord(Level::Error));
}
public function testThehandlerCanAddContextParamsToTheNewRelicTrace()
{
$handler = new StubNewRelicHandler();
$handler->handle($this->getRecord(Logger::ERROR, 'log message', ['a' => 'b']));
$handler->handle($this->getRecord(Level::Error, 'log message', ['a' => 'b']));
$this->assertEquals(['context_a' => 'b'], self::$customParameters);
}
public function testThehandlerCanAddExplodedContextParamsToTheNewRelicTrace()
{
$handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true);
$handler = new StubNewRelicHandler(Level::Error, true, self::$appname, true);
$handler->handle($this->getRecord(
Logger::ERROR,
Level::Error,
'log message',
['a' => ['key1' => 'value1', 'key2' => 'value2']]
));
@@ -66,7 +66,7 @@ class NewRelicHandlerTest extends TestCase
public function testThehandlerCanAddExtraParamsToTheNewRelicTrace()
{
$record = $this->getRecord(Logger::ERROR, 'log message');
$record = $this->getRecord(Level::Error, 'log message');
$record->extra = ['c' => 'd'];
$handler = new StubNewRelicHandler();
@@ -77,10 +77,10 @@ class NewRelicHandlerTest extends TestCase
public function testThehandlerCanAddExplodedExtraParamsToTheNewRelicTrace()
{
$record = $this->getRecord(Logger::ERROR, 'log message');
$record = $this->getRecord(Level::Error, 'log message');
$record->extra = ['c' => ['key1' => 'value1', 'key2' => 'value2']];
$handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true);
$handler = new StubNewRelicHandler(Level::Error, true, self::$appname, true);
$handler->handle($record);
$this->assertEquals(
@@ -91,7 +91,7 @@ class NewRelicHandlerTest extends TestCase
public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace()
{
$record = $this->getRecord(Logger::ERROR, 'log message', ['a' => 'b']);
$record = $this->getRecord(Level::Error, 'log message', ['a' => 'b']);
$record->extra = ['c' => 'd'];
$handler = new StubNewRelicHandler();
@@ -109,29 +109,29 @@ class NewRelicHandlerTest extends TestCase
{
$handler = new StubNewRelicHandler();
$handler->setFormatter(new LineFormatter());
$handler->handle($this->getRecord(Logger::ERROR));
$handler->handle($this->getRecord(Level::Error));
}
public function testTheAppNameIsNullByDefault()
{
$handler = new StubNewRelicHandler();
$handler->handle($this->getRecord(Logger::ERROR, 'log message'));
$handler->handle($this->getRecord(Level::Error, 'log message'));
$this->assertEquals(null, self::$appname);
}
public function testTheAppNameCanBeInjectedFromtheConstructor()
{
$handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName');
$handler->handle($this->getRecord(Logger::ERROR, 'log message'));
$handler = new StubNewRelicHandler(Level::Debug, false, 'myAppName');
$handler->handle($this->getRecord(Level::Error, 'log message'));
$this->assertEquals('myAppName', self::$appname);
}
public function testTheAppNameCanBeOverriddenFromEachLog()
{
$handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName');
$handler->handle($this->getRecord(Logger::ERROR, 'log message', ['appname' => 'logAppName']));
$handler = new StubNewRelicHandler(Level::Debug, false, 'myAppName');
$handler->handle($this->getRecord(Level::Error, 'log message', ['appname' => 'logAppName']));
$this->assertEquals('logAppName', self::$appname);
}
@@ -139,23 +139,23 @@ class NewRelicHandlerTest extends TestCase
public function testTheTransactionNameIsNullByDefault()
{
$handler = new StubNewRelicHandler();
$handler->handle($this->getRecord(Logger::ERROR, 'log message'));
$handler->handle($this->getRecord(Level::Error, 'log message'));
$this->assertEquals(null, self::$transactionName);
}
public function testTheTransactionNameCanBeInjectedFromTheConstructor()
{
$handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction');
$handler->handle($this->getRecord(Logger::ERROR, 'log message'));
$handler = new StubNewRelicHandler(Level::Debug, false, null, false, 'myTransaction');
$handler->handle($this->getRecord(Level::Error, 'log message'));
$this->assertEquals('myTransaction', self::$transactionName);
}
public function testTheTransactionNameCanBeOverriddenFromEachLog()
{
$handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction');
$handler->handle($this->getRecord(Logger::ERROR, 'log message', ['transaction_name' => 'logTransactName']));
$handler = new StubNewRelicHandler(Level::Debug, false, null, false, 'myTransaction');
$handler->handle($this->getRecord(Level::Error, 'log message', ['transaction_name' => 'logTransactName']));
$this->assertEquals('logTransactName', self::$transactionName);
}

View File

@@ -11,8 +11,8 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\Test\TestCase;
use Monolog\Logger;
/**
* @covers Monolog\Handler\NoopHandler::handle
@@ -22,7 +22,7 @@ class NoopHandlerTest extends TestCase
/**
* @dataProvider logLevelsProvider
*/
public function testIsHandling($level)
public function testIsHandling(Level $level)
{
$handler = new NoopHandler();
$this->assertTrue($handler->isHandling($this->getRecord($level)));
@@ -31,7 +31,7 @@ class NoopHandlerTest extends TestCase
/**
* @dataProvider logLevelsProvider
*/
public function testHandle($level)
public function testHandle(Level $level)
{
$handler = new NoopHandler();
$this->assertFalse($handler->handle($this->getRecord($level)));
@@ -40,10 +40,8 @@ class NoopHandlerTest extends TestCase
public function logLevelsProvider()
{
return array_map(
function ($level) {
return [$level];
},
array_values(Logger::getLevels())
fn ($level) => [$level],
Level::cases()
);
}
}

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* @covers Monolog\Handler\NullHandler::handle
@@ -27,7 +27,7 @@ class NullHandlerTest extends TestCase
public function testHandleLowerLevelRecord()
{
$handler = new NullHandler(Logger::WARNING);
$this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
$handler = new NullHandler(Level::Warning);
$this->assertFalse($handler->handle($this->getRecord(Level::Debug)));
}
}

View File

@@ -11,7 +11,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
/**
@@ -23,19 +23,19 @@ class OverflowHandlerTest extends TestCase
public function testNotPassingRecordsBeneathLogLevel()
{
$testHandler = new TestHandler();
$handler = new OverflowHandler($testHandler, [], Logger::INFO);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler = new OverflowHandler($testHandler, [], Level::Info);
$handler->handle($this->getRecord(Level::Debug));
$this->assertFalse($testHandler->hasDebugRecords());
}
public function testPassThroughWithoutThreshold()
{
$testHandler = new TestHandler();
$handler = new OverflowHandler($testHandler, [], Logger::INFO);
$handler = new OverflowHandler($testHandler, [], Level::Info);
$handler->handle($this->getRecord(Logger::INFO, 'Info 1'));
$handler->handle($this->getRecord(Logger::INFO, 'Info 2'));
$handler->handle($this->getRecord(Logger::WARNING, 'Warning 1'));
$handler->handle($this->getRecord(Level::Info, 'Info 1'));
$handler->handle($this->getRecord(Level::Info, 'Info 2'));
$handler->handle($this->getRecord(Level::Warning, 'Warning 1'));
$this->assertTrue($testHandler->hasInfoThatContains('Info 1'));
$this->assertTrue($testHandler->hasInfoThatContains('Info 2'));
@@ -48,20 +48,20 @@ class OverflowHandlerTest extends TestCase
public function testHoldingMessagesBeneathThreshold()
{
$testHandler = new TestHandler();
$handler = new OverflowHandler($testHandler, [Logger::INFO => 3]);
$handler = new OverflowHandler($testHandler, [Level::Info->value => 3]);
$handler->handle($this->getRecord(Logger::DEBUG, 'debug 1'));
$handler->handle($this->getRecord(Logger::DEBUG, 'debug 2'));
$handler->handle($this->getRecord(Level::Debug, 'debug 1'));
$handler->handle($this->getRecord(Level::Debug, 'debug 2'));
foreach (range(1, 3) as $i) {
$handler->handle($this->getRecord(Logger::INFO, 'info ' . $i));
$handler->handle($this->getRecord(Level::Info, 'info ' . $i));
}
$this->assertTrue($testHandler->hasDebugThatContains('debug 1'));
$this->assertTrue($testHandler->hasDebugThatContains('debug 2'));
$this->assertFalse($testHandler->hasInfoRecords());
$handler->handle($this->getRecord(Logger::INFO, 'info 4'));
$handler->handle($this->getRecord(Level::Info, 'info 4'));
foreach (range(1, 4) as $i) {
$this->assertTrue($testHandler->hasInfoThatContains('info ' . $i));
@@ -74,33 +74,33 @@ class OverflowHandlerTest extends TestCase
public function testCombinedThresholds()
{
$testHandler = new TestHandler();
$handler = new OverflowHandler($testHandler, [Logger::INFO => 5, Logger::WARNING => 10]);
$handler = new OverflowHandler($testHandler, [Level::Info->value => 5, Level::Warning->value => 10]);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Level::Debug));
foreach (range(1, 5) as $i) {
$handler->handle($this->getRecord(Logger::INFO, 'info ' . $i));
$handler->handle($this->getRecord(Level::Info, 'info ' . $i));
}
foreach (range(1, 10) as $i) {
$handler->handle($this->getRecord(Logger::WARNING, 'warning ' . $i));
$handler->handle($this->getRecord(Level::Warning, 'warning ' . $i));
}
// Only 1 DEBUG records
$this->assertCount(1, $testHandler->getRecords());
$handler->handle($this->getRecord(Logger::INFO, 'info final'));
$handler->handle($this->getRecord(Level::Info, 'info final'));
// 1 DEBUG + 5 buffered INFO + 1 new INFO
$this->assertCount(7, $testHandler->getRecords());
$handler->handle($this->getRecord(Logger::WARNING, 'warning final'));
$handler->handle($this->getRecord(Level::Warning, 'warning final'));
// 1 DEBUG + 6 INFO + 10 buffered WARNING + 1 new WARNING
$this->assertCount(18, $testHandler->getRecords());
$handler->handle($this->getRecord(Logger::INFO, 'Another info'));
$handler->handle($this->getRecord(Logger::WARNING, 'Anther warning'));
$handler->handle($this->getRecord(Level::Info, 'Another info'));
$handler->handle($this->getRecord(Level::Warning, 'Anther warning'));
// 1 DEBUG + 6 INFO + 11 WARNING + 1 new INFO + 1 new WARNING
$this->assertCount(20, $testHandler->getRecords());

View File

@@ -13,6 +13,7 @@ namespace Monolog\Handler;
use Exception;
use Monolog\ErrorHandler;
use Monolog\Level;
use Monolog\Logger;
use Monolog\Test\TestCase;
use PhpConsole\Connector;
@@ -107,7 +108,7 @@ class PHPConsoleHandlerTest extends TestCase
return $options[$name];
}
protected function initLogger($handlerOptions = [], $level = Logger::DEBUG)
protected function initLogger($handlerOptions = [], $level = Level::Debug)
{
return new Logger('test', [
new PHPConsoleHandler($handlerOptions, $this->connector, $level),

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class ProcessHandlerTest extends TestCase
{
@@ -51,8 +51,8 @@ class ProcessHandlerTest extends TestCase
->withConsecutive([$this->stringContains($fixtures[0])], [$this->stringContains($fixtures[1])]);
/** @var ProcessHandler $handler */
$handler->handle($this->getRecord(Logger::WARNING, $fixtures[0]));
$handler->handle($this->getRecord(Logger::ERROR, $fixtures[1]));
$handler->handle($this->getRecord(Level::Warning, $fixtures[0]));
$handler->handle($this->getRecord(Level::Error, $fixtures[1]));
}
/**
@@ -78,7 +78,7 @@ class ProcessHandlerTest extends TestCase
public function testConstructWithInvalidCommandThrowsInvalidArgumentException($invalidCommand, $expectedExcep)
{
$this->expectException($expectedExcep);
new ProcessHandler($invalidCommand, Logger::DEBUG);
new ProcessHandler($invalidCommand, Level::Debug);
}
/**
@@ -103,7 +103,7 @@ class ProcessHandlerTest extends TestCase
public function testConstructWithInvalidCwdThrowsInvalidArgumentException($invalidCwd, $expectedExcep)
{
$this->expectException($expectedExcep);
new ProcessHandler(self::DUMMY_COMMAND, Logger::DEBUG, true, $invalidCwd);
new ProcessHandler(self::DUMMY_COMMAND, Level::Debug, true, $invalidCwd);
}
/**
@@ -112,7 +112,7 @@ class ProcessHandlerTest extends TestCase
*/
public function testConstructWithValidCwdWorks()
{
$handler = new ProcessHandler(self::DUMMY_COMMAND, Logger::DEBUG, true, sys_get_temp_dir());
$handler = new ProcessHandler(self::DUMMY_COMMAND, Level::Debug, true, sys_get_temp_dir());
$this->assertInstanceOf(
'Monolog\Handler\ProcessHandler',
$handler,
@@ -137,7 +137,7 @@ class ProcessHandlerTest extends TestCase
$this->expectException(\UnexpectedValueException::class);
/** @var ProcessHandler $handler */
$handler->handle($this->getRecord(Logger::WARNING, 'stream failing, whoops'));
$handler->handle($this->getRecord(Level::Warning, 'stream failing, whoops'));
}
/**
@@ -150,7 +150,7 @@ class ProcessHandlerTest extends TestCase
$this->expectException(\UnexpectedValueException::class);
$handler->handle($this->getRecord(Logger::WARNING, 'some warning in the house'));
$handler->handle($this->getRecord(Level::Warning, 'some warning in the house'));
}
/**
@@ -171,7 +171,7 @@ class ProcessHandlerTest extends TestCase
$this->expectException(\UnexpectedValueException::class);
/** @var ProcessHandler $handler */
$handler->handle($this->getRecord(Logger::WARNING, 'some test stuff'));
$handler->handle($this->getRecord(Level::Warning, 'some test stuff'));
}
/**
@@ -184,7 +184,7 @@ class ProcessHandlerTest extends TestCase
$property->setAccessible(true);
$handler = new ProcessHandler(self::DUMMY_COMMAND);
$handler->handle($this->getRecord(Logger::WARNING, '21 is only the half truth'));
$handler->handle($this->getRecord(Level::Warning, '21 is only the half truth'));
$process = $property->getValue($handler);
$this->assertTrue(is_resource($process), 'Process is not running although it should.');

View File

@@ -11,8 +11,9 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Formatter\LineFormatter;
/**
@@ -22,28 +23,24 @@ class PsrHandlerTest extends TestCase
{
public function logLevelProvider()
{
$levels = [];
$monologLogger = new Logger('');
foreach ($monologLogger->getLevels() as $levelName => $level) {
$levels[] = [$levelName, $level];
}
return $levels;
return array_map(
fn(Level $level) => [$level->toLevelName(), $level],
Level::cases()
);
}
/**
* @dataProvider logLevelProvider
*/
public function testHandlesAllLevels($levelName, $level)
public function testHandlesAllLevels(LevelName $levelName, Level $level)
{
$message = 'Hello, world! ' . $level;
$context = ['foo' => 'bar', 'level' => $level];
$message = 'Hello, world! ' . $level->value;
$context = ['foo' => 'bar', 'level' => $level->value];
$psrLogger = $this->createMock('Psr\Log\NullLogger');
$psrLogger->expects($this->once())
->method('log')
->with(strtolower($levelName), $message, $context);
->with(strtolower($levelName->value), $message, $context);
$handler = new PsrHandler($psrLogger);
$handler->handle($this->getRecord($level, $message, context: $context));
@@ -53,13 +50,13 @@ class PsrHandlerTest extends TestCase
{
$message = 'Hello, world!';
$context = ['foo' => 'bar'];
$level = Logger::ERROR;
$levelName = 'error';
$level = Level::Error;
$levelName = LevelName::Error;
$psrLogger = $this->createMock('Psr\Log\NullLogger');
$psrLogger->expects($this->once())
->method('log')
->with(strtolower($levelName), 'dummy', $context);
->with(strtolower($levelName->value), 'dummy', $context);
$handler = new PsrHandler($psrLogger);
$handler->setFormatter(new LineFormatter('dummy'));

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
/**
* Almost all examples (expected header, titles, messages) taken from
@@ -28,8 +28,8 @@ class PushoverHandlerTest extends TestCase
public function testWriteHeader()
{
$this->createHandler();
$this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->setHighPriorityLevel(Level::Emergency); // skip priority notifications
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -49,7 +49,7 @@ class PushoverHandlerTest extends TestCase
public function testWriteWithComplexTitle()
{
$this->createHandler('myToken', 'myUser', 'Backup finished - SQL1');
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -59,8 +59,8 @@ class PushoverHandlerTest extends TestCase
public function testWriteWithComplexMessage()
{
$this->createHandler();
$this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'Backup of database "example" finished in 16 minutes.'));
$this->handler->setHighPriorityLevel(Level::Emergency); // skip priority notifications
$this->handler->handle($this->getRecord(Level::Critical, 'Backup of database "example" finished in 16 minutes.'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -71,8 +71,8 @@ class PushoverHandlerTest extends TestCase
{
$message = str_pad('test', 520, 'a');
$this->createHandler();
$this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
$this->handler->handle($this->getRecord(Logger::CRITICAL, $message));
$this->handler->setHighPriorityLevel(Level::Emergency); // skip priority notifications
$this->handler->handle($this->getRecord(Level::Critical, $message));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -84,7 +84,7 @@ class PushoverHandlerTest extends TestCase
public function testWriteWithHighPriority()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -94,7 +94,7 @@ class PushoverHandlerTest extends TestCase
public function testWriteWithEmergencyPriority()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1'));
$this->handler->handle($this->getRecord(Level::Emergency, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -104,7 +104,7 @@ class PushoverHandlerTest extends TestCase
public function testWriteToMultipleUsers()
{
$this->createHandler('myToken', ['userA', 'userB']);
$this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1'));
$this->handler->handle($this->getRecord(Level::Emergency, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Formatter\LineFormatter;
class RedisHandlerTest extends TestCase
@@ -46,7 +46,7 @@ class RedisHandlerTest extends TestCase
$redis->rpush('key', 'test')->shouldBeCalled();
$redis = $redis->reveal();
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key');
$handler->setFormatter(new LineFormatter("%message%"));
@@ -66,7 +66,7 @@ class RedisHandlerTest extends TestCase
->method('rPush')
->with('key', 'test');
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key');
$handler->setFormatter(new LineFormatter("%message%"));
@@ -98,9 +98,9 @@ class RedisHandlerTest extends TestCase
->method('exec')
->will($this->returnSelf());
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
$handler = new RedisHandler($redis, 'key', Level::Debug, true, 10);
$handler->setFormatter(new LineFormatter("%message%"));
$handler->handle($record);
}
@@ -129,9 +129,9 @@ class RedisHandlerTest extends TestCase
$cb($redisTransaction);
}));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
$handler = new RedisHandler($redis, 'key', Level::Debug, true, 10);
$handler->setFormatter(new LineFormatter("%message%"));
$handler->handle($record);
}

View File

@@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Formatter\LineFormatter;
class RedisPubSubHandlerTest extends TestCase
@@ -48,7 +48,7 @@ class RedisPubSubHandlerTest extends TestCase
$redis->publish('key', 'test')->shouldBeCalled();
$redis = $redis->reveal();
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass(), 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass(), 'foo' => 34]);
$handler = new RedisPubSubHandler($redis, 'key');
$handler->setFormatter(new LineFormatter("%message%"));
@@ -67,7 +67,7 @@ class RedisPubSubHandlerTest extends TestCase
->method('publish')
->with('key', 'test');
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass(), 'foo' => 34]);
$record = $this->getRecord(Level::Warning, 'test', ['data' => new \stdClass(), 'foo' => 34]);
$handler = new RedisPubSubHandler($redis, 'key');
$handler->setFormatter(new LineFormatter("%message%"));

View File

@@ -13,7 +13,7 @@ namespace Monolog\Handler;
use Exception;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use PHPUnit\Framework\MockObject\MockObject;
use Rollbar\RollbarLogger;
@@ -52,7 +52,7 @@ class RollbarHandlerTest extends TestCase
{
$handler = $this->createHandler();
$handler->handle($this->createExceptionRecord(Logger::DEBUG));
$handler->handle($this->createExceptionRecord(Level::Debug));
$this->assertEquals('debug', $this->reportedExceptionArguments['payload']['level']);
}
@@ -79,10 +79,10 @@ class RollbarHandlerTest extends TestCase
private function createHandler(): RollbarHandler
{
return new RollbarHandler($this->rollbarLogger, Logger::DEBUG);
return new RollbarHandler($this->rollbarLogger, Level::Debug);
}
private function createExceptionRecord($level = Logger::DEBUG, $message = 'test', $exception = null): array
private function createExceptionRecord($level = Level::Debug, $message = 'test', $exception = null): array
{
return $this->getRecord($level, $message, [
'exception' => $exception ?: new Exception(),

View File

@@ -11,7 +11,8 @@
namespace Monolog\Handler\Slack;
use Monolog\Logger;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
/**
@@ -22,24 +23,22 @@ class SlackRecordTest extends TestCase
public function dataGetAttachmentColor()
{
return array(
array(Logger::DEBUG, SlackRecord::COLOR_DEFAULT),
array(Logger::INFO, SlackRecord::COLOR_GOOD),
array(Logger::NOTICE, SlackRecord::COLOR_GOOD),
array(Logger::WARNING, SlackRecord::COLOR_WARNING),
array(Logger::ERROR, SlackRecord::COLOR_DANGER),
array(Logger::CRITICAL, SlackRecord::COLOR_DANGER),
array(Logger::ALERT, SlackRecord::COLOR_DANGER),
array(Logger::EMERGENCY, SlackRecord::COLOR_DANGER),
array(Level::Debug, SlackRecord::COLOR_DEFAULT),
array(Level::Info, SlackRecord::COLOR_GOOD),
array(Level::Notice, SlackRecord::COLOR_GOOD),
array(Level::Warning, SlackRecord::COLOR_WARNING),
array(Level::Error, SlackRecord::COLOR_DANGER),
array(Level::Critical, SlackRecord::COLOR_DANGER),
array(Level::Alert, SlackRecord::COLOR_DANGER),
array(Level::Emergency, SlackRecord::COLOR_DANGER),
);
}
/**
* @dataProvider dataGetAttachmentColor
* @param int $logLevel
* @param string $expectedColour RGB hex color or name of Slack color
* @covers ::getAttachmentColor
*/
public function testGetAttachmentColor($logLevel, $expectedColour)
public function testGetAttachmentColor(Level $logLevel, string $expectedColour)
{
$slackRecord = new SlackRecord();
$this->assertSame(
@@ -155,7 +154,7 @@ class SlackRecordTest extends TestCase
{
$message = 'Test message';
$record = new SlackRecord(null, null, false);
$data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
$data = $record->getSlackData($this->getRecord(Level::Warning, $message));
$this->assertArrayHasKey('text', $data);
$this->assertSame($message, $data['text']);
@@ -181,13 +180,13 @@ class SlackRecordTest extends TestCase
$message = 'Test message';
$record = new SlackRecord(null, null, false, null, false, false, array(), $formatter);
$data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
$data = $record->getSlackData($this->getRecord(Level::Warning, $message));
$this->assertArrayHasKey('text', $data);
$this->assertSame($message . 'test', $data['text']);
$record->setFormatter($formatter2);
$data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
$data = $record->getSlackData($this->getRecord(Level::Warning, $message));
$this->assertArrayHasKey('text', $data);
$this->assertSame($message . 'test1', $data['text']);
@@ -197,7 +196,7 @@ class SlackRecordTest extends TestCase
{
$message = 'Test message';
$record = new SlackRecord(null);
$data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
$data = $record->getSlackData($this->getRecord(Level::Warning, $message));
$this->assertSame($message, $data['attachments'][0]['text']);
$this->assertSame($message, $data['attachments'][0]['fallback']);
@@ -206,11 +205,11 @@ class SlackRecordTest extends TestCase
public function testMapsLevelToColorAttachmentColor()
{
$record = new SlackRecord(null);
$errorLoggerRecord = $this->getRecord(Logger::ERROR);
$emergencyLoggerRecord = $this->getRecord(Logger::EMERGENCY);
$warningLoggerRecord = $this->getRecord(Logger::WARNING);
$infoLoggerRecord = $this->getRecord(Logger::INFO);
$debugLoggerRecord = $this->getRecord(Logger::DEBUG);
$errorLoggerRecord = $this->getRecord(Level::Error);
$emergencyLoggerRecord = $this->getRecord(Level::Emergency);
$warningLoggerRecord = $this->getRecord(Level::Warning);
$infoLoggerRecord = $this->getRecord(Level::Info);
$debugLoggerRecord = $this->getRecord(Level::Debug);
$data = $record->getSlackData($errorLoggerRecord);
$this->assertSame(SlackRecord::COLOR_DANGER, $data['attachments'][0]['color']);
@@ -230,8 +229,8 @@ class SlackRecordTest extends TestCase
public function testAddsShortAttachmentWithoutContextAndExtra()
{
$level = Logger::ERROR;
$levelName = Logger::getLevelName($level);
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$record = new SlackRecord(null, null, true, null, true);
$data = $record->getSlackData($this->getRecord($level, 'test', array('test' => 1)));
@@ -244,8 +243,8 @@ class SlackRecordTest extends TestCase
public function testAddsShortAttachmentWithContextAndExtra()
{
$level = Logger::ERROR;
$levelName = Logger::getLevelName($level);
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$context = array('test' => 1);
$extra = array('tags' => array('web'));
$record = new SlackRecord(null, null, true, null, true, true);
@@ -277,8 +276,8 @@ class SlackRecordTest extends TestCase
public function testAddsLongAttachmentWithoutContextAndExtra()
{
$level = Logger::ERROR;
$levelName = Logger::getLevelName($level);
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$record = new SlackRecord(null, null, true, null);
$data = $record->getSlackData($this->getRecord($level, 'test', array('test' => 1)));
@@ -299,8 +298,8 @@ class SlackRecordTest extends TestCase
public function testAddsLongAttachmentWithContextAndExtra()
{
$level = Logger::ERROR;
$levelName = Logger::getLevelName($level);
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$context = array('test' => 1);
$extra = array('tags' => array('web'));
$record = new SlackRecord(null, null, true, null, false, true);
@@ -350,7 +349,7 @@ class SlackRecordTest extends TestCase
public function testContextHasException()
{
$record = $this->getRecord(Logger::CRITICAL, 'This is a critical message.', array('exception' => new \Exception()));
$record = $this->getRecord(Level::Critical, 'This is a critical message.', array('exception' => new \Exception()));
$slackRecord = new SlackRecord(null, null, true, null, false, true);
$data = $slackRecord->getSlackData($record);
$this->assertIsString($data['attachments'][0]['fields'][1]['value']);
@@ -359,7 +358,7 @@ class SlackRecordTest extends TestCase
public function testExcludeExtraAndContextFields()
{
$record = $this->getRecord(
Logger::WARNING,
Level::Warning,
'test',
context: array('info' => array('library' => 'monolog', 'author' => 'Jordi')),
extra: array('tags' => array('web', 'cli')),

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\Slack\SlackRecord;
@@ -42,7 +42,7 @@ class SlackHandlerTest extends TestCase
public function testWriteHeader()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -52,7 +52,7 @@ class SlackHandlerTest extends TestCase
public function testWriteContent()
{
$this->createHandler();
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -65,13 +65,13 @@ class SlackHandlerTest extends TestCase
public function testWriteContentUsesFormatterIfProvided()
{
$this->createHandler('myToken', 'channel1', 'Monolog', false);
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
$this->createHandler('myToken', 'channel1', 'Monolog', false);
$this->handler->setFormatter(new LineFormatter('foo--%message%'));
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test2'));
$this->handler->handle($this->getRecord(Level::Critical, 'test2'));
fseek($this->res, 0);
$content2 = fread($this->res, 1024);
@@ -82,7 +82,7 @@ class SlackHandlerTest extends TestCase
public function testWriteContentWithEmoji()
{
$this->createHandler('myToken', 'channel1', 'Monolog', true, 'alien');
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -105,7 +105,7 @@ class SlackHandlerTest extends TestCase
public function testWriteContentWithPlainTextMessage()
{
$this->createHandler('myToken', 'channel1', 'Monolog', false);
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
$this->handler->handle($this->getRecord(Level::Critical, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -115,20 +115,20 @@ class SlackHandlerTest extends TestCase
public function provideLevelColors()
{
return array(
array(Logger::DEBUG, urlencode(SlackRecord::COLOR_DEFAULT)),
array(Logger::INFO, SlackRecord::COLOR_GOOD),
array(Logger::NOTICE, SlackRecord::COLOR_GOOD),
array(Logger::WARNING, SlackRecord::COLOR_WARNING),
array(Logger::ERROR, SlackRecord::COLOR_DANGER),
array(Logger::CRITICAL, SlackRecord::COLOR_DANGER),
array(Logger::ALERT, SlackRecord::COLOR_DANGER),
array(Logger::EMERGENCY,SlackRecord::COLOR_DANGER),
array(Level::Debug, urlencode(SlackRecord::COLOR_DEFAULT)),
array(Level::Info, SlackRecord::COLOR_GOOD),
array(Level::Notice, SlackRecord::COLOR_GOOD),
array(Level::Warning, SlackRecord::COLOR_WARNING),
array(Level::Error, SlackRecord::COLOR_DANGER),
array(Level::Critical, SlackRecord::COLOR_DANGER),
array(Level::Alert, SlackRecord::COLOR_DANGER),
array(Level::Emergency,SlackRecord::COLOR_DANGER),
);
}
private function createHandler($token = 'myToken', $channel = 'channel1', $username = 'Monolog', $useAttachment = true, $iconEmoji = null, $useShortAttachment = false, $includeExtra = false)
{
$constructorArgs = [$token, $channel, $username, $useAttachment, $iconEmoji, Logger::DEBUG, true, $useShortAttachment, $includeExtra];
$constructorArgs = [$token, $channel, $username, $useAttachment, $iconEmoji, Level::Debug, true, $useShortAttachment, $includeExtra];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMockBuilder('Monolog\Handler\SlackHandler')
->setConstructorArgs($constructorArgs)

View File

@@ -11,8 +11,9 @@
namespace Monolog\Handler;
use Monolog\LevelName;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\Slack\SlackRecord;
@@ -72,7 +73,7 @@ class SlackWebhookHandlerTest extends TestCase
':ghost:',
false,
false,
Logger::DEBUG,
Level::Debug,
false
);
@@ -100,7 +101,7 @@ class SlackWebhookHandlerTest extends TestCase
'https://www.example.com/example.png',
false,
false,
Logger::DEBUG,
Level::Debug,
false
);
@@ -118,7 +119,7 @@ class SlackWebhookHandlerTest extends TestCase
'fields' => array(
array(
'title' => 'Level',
'value' => Logger::getLevelName(Logger::WARNING),
'value' => LevelName::Warning->value,
'short' => false,
),
),

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
use PHPUnit\Framework\MockObject\MockObject;
/**
@@ -285,7 +285,7 @@ class SocketHandlerTest extends TestCase
private function writeRecord($string)
{
$this->handler->handle($this->getRecord(Logger::WARNING, $string));
$this->handler->handle($this->getRecord(Level::Warning, $string));
}
private function setMockHandler(array $methods = [])

View File

@@ -13,7 +13,7 @@ namespace Monolog\Handler;
use Monolog\Handler\StreamHandler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class StreamHandlerTest extends TestCase
{
@@ -26,9 +26,9 @@ class StreamHandlerTest extends TestCase
$handle = fopen('php://memory', 'a+');
$handler = new StreamHandler($handle);
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::WARNING, 'test'));
$handler->handle($this->getRecord(Logger::WARNING, 'test2'));
$handler->handle($this->getRecord(Logger::WARNING, 'test3'));
$handler->handle($this->getRecord(Level::Warning, 'test'));
$handler->handle($this->getRecord(Level::Warning, 'test2'));
$handler->handle($this->getRecord(Level::Warning, 'test3'));
fseek($handle, 0);
$this->assertEquals('testtest2test3', fread($handle, 100));
}
@@ -51,7 +51,7 @@ class StreamHandlerTest extends TestCase
public function testClose()
{
$handler = new StreamHandler('php://memory');
$handler->handle($this->getRecord(Logger::WARNING, 'test'));
$handler->handle($this->getRecord(Level::Warning, 'test'));
$stream = $handler->getStream();
$this->assertTrue(is_resource($stream));
@@ -66,7 +66,7 @@ class StreamHandlerTest extends TestCase
public function testSerialization()
{
$handler = new StreamHandler('php://memory');
$handler->handle($this->getRecord(Logger::WARNING, 'testfoo'));
$handler->handle($this->getRecord(Level::Warning, 'testfoo'));
$stream = $handler->getStream();
$this->assertTrue(is_resource($stream));
@@ -76,7 +76,7 @@ class StreamHandlerTest extends TestCase
$this->assertFalse(is_resource($stream));
$handler = unserialize($serialized);
$handler->handle($this->getRecord(Logger::WARNING, 'testbar'));
$handler->handle($this->getRecord(Level::Warning, 'testbar'));
$stream = $handler->getStream();
$this->assertTrue(is_resource($stream));
@@ -102,7 +102,7 @@ class StreamHandlerTest extends TestCase
public function testWriteLocking()
{
$temp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'monolog_locked_log';
$handler = new StreamHandler($temp, Logger::DEBUG, true, null, true);
$handler = new StreamHandler($temp, Level::Debug, true, null, true);
$handler->handle($this->getRecord());
}

View File

@@ -11,7 +11,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Level;
class SyslogHandlerTest extends \PHPUnit\Framework\TestCase
{
@@ -29,7 +29,7 @@ class SyslogHandlerTest extends \PHPUnit\Framework\TestCase
$handler = new SyslogHandler('test', 'user');
$this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
$handler = new SyslogHandler('test', LOG_USER, Logger::DEBUG, true, LOG_PERROR);
$handler = new SyslogHandler('test', LOG_USER, Level::Debug, true, LOG_PERROR);
$this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
}

View File

@@ -11,6 +11,7 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\Test\TestCase;
/**
@@ -98,6 +99,6 @@ class SyslogUdpHandlerTest extends TestCase
protected function getRecordWithMessage($msg)
{
return $this->getRecord(message: $msg, level: \Monolog\Logger::WARNING, channel: 'lol', datetime: new \DateTimeImmutable('2014-01-07 12:34:56'));
return $this->getRecord(message: $msg, level: Level::Warning, channel: 'lol', datetime: new \DateTimeImmutable('2014-01-07 12:34:56'));
}
}

View File

@@ -11,7 +11,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
/**
@@ -42,7 +42,7 @@ class TelegramBotHandlerTest extends TestCase
bool $disableWebPagePreview = false,
bool $disableNotification = true
): void {
$constructorArgs = [$apiKey, $channel, Logger::DEBUG, true, $parseMode, $disableWebPagePreview, $disableNotification];
$constructorArgs = [$apiKey, $channel, Level::Debug, true, $parseMode, $disableWebPagePreview, $disableNotification];
$this->handler = $this->getMockBuilder(TelegramBotHandler::class)
->setConstructorArgs($constructorArgs)

View File

@@ -11,8 +11,8 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\Test\TestCase;
use Monolog\Logger;
/**
* @covers Monolog\Handler\TestHandler
@@ -22,7 +22,7 @@ class TestHandlerTest extends TestCase
/**
* @dataProvider methodProvider
*/
public function testHandler($method, $level)
public function testHandler($method, Level $level)
{
$handler = new TestHandler;
$record = $this->getRecord($level, 'test'.$method);
@@ -57,7 +57,7 @@ class TestHandlerTest extends TestCase
public function testHandlerAssertEmptyContext()
{
$handler = new TestHandler;
$record = $this->getRecord(Logger::WARNING, 'test', []);
$record = $this->getRecord(Level::Warning, 'test', []);
$this->assertFalse($handler->hasWarning([
'message' => 'test',
'context' => [],
@@ -80,7 +80,7 @@ class TestHandlerTest extends TestCase
public function testHandlerAssertNonEmptyContext()
{
$handler = new TestHandler;
$record = $this->getRecord(Logger::WARNING, 'test', ['foo' => 'bar']);
$record = $this->getRecord(Level::Warning, 'test', ['foo' => 'bar']);
$this->assertFalse($handler->hasWarning([
'message' => 'test',
'context' => [
@@ -105,14 +105,14 @@ class TestHandlerTest extends TestCase
public function methodProvider()
{
return [
['Emergency', Logger::EMERGENCY],
['Alert' , Logger::ALERT],
['Critical' , Logger::CRITICAL],
['Error' , Logger::ERROR],
['Warning' , Logger::WARNING],
['Info' , Logger::INFO],
['Notice' , Logger::NOTICE],
['Debug' , Logger::DEBUG],
['Emergency', Level::Emergency],
['Alert' , Level::Alert],
['Critical' , Level::Critical],
['Error' , Level::Error],
['Warning' , Level::Warning],
['Info' , Level::Info],
['Notice' , Level::Notice],
['Debug' , Level::Debug],
];
}
}

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class WhatFailureGroupHandlerTest extends TestCase
{
@@ -34,8 +34,8 @@ class WhatFailureGroupHandlerTest extends TestCase
{
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new WhatFailureGroupHandler($testHandlers);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
$handler->handle($this->getRecord(Level::Debug));
$handler->handle($this->getRecord(Level::Info));
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -50,7 +50,7 @@ class WhatFailureGroupHandlerTest extends TestCase
{
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new WhatFailureGroupHandler($testHandlers);
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
$handler->handleBatch([$this->getRecord(Level::Debug), $this->getRecord(Level::Info)]);
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -63,11 +63,11 @@ class WhatFailureGroupHandlerTest extends TestCase
*/
public function testIsHandling()
{
$testHandlers = [new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING)];
$testHandlers = [new TestHandler(Level::Error), new TestHandler(Level::Warning)];
$handler = new WhatFailureGroupHandler($testHandlers);
$this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
$this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Error)));
$this->assertTrue($handler->isHandling($this->getRecord(Level::Warning)));
$this->assertFalse($handler->isHandling($this->getRecord(Level::Debug)));
}
/**
@@ -82,7 +82,7 @@ class WhatFailureGroupHandlerTest extends TestCase
return $record;
});
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasWarningRecords());
$records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']);
@@ -105,7 +105,7 @@ class WhatFailureGroupHandlerTest extends TestCase
return $record;
});
$handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
$handler->handleBatch(array($this->getRecord(Level::Debug), $this->getRecord(Level::Info)));
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -131,7 +131,7 @@ class WhatFailureGroupHandlerTest extends TestCase
return $record;
});
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Level::Warning));
$this->assertTrue($test->hasWarningRecords());
$records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']);

View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
use Monolog\Level;
class ZendMonitorHandlerTest extends TestCase
{
@@ -51,15 +51,13 @@ class ZendMonitorHandlerTest extends TestCase
->method('getDefaultFormatter')
->will($this->returnValue($formatterMock));
$levelMap = $zendMonitor->getLevelMap();
$zendMonitor->expects($this->once())
->method('writeZendMonitorCustomEvent')
->with(
Logger::getLevelName($record->level),
$record->levelName->value,
$record->message,
$formatterResult,
$levelMap[$record->level]
\ZEND_MONITOR_EVENT_SEVERITY_WARNING
);
$zendMonitor->handle($record);

View File

@@ -18,7 +18,7 @@ use Monolog\Test\TestCase;
class LoggerTest extends TestCase
{
/**
* @covers Monolog\Logger::getName
* @covers Logger::getName
*/
public function testGetName()
{
@@ -27,15 +27,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::getLevelName
*/
public function testGetLevelName()
{
$this->assertEquals('ERROR', Logger::getLevelName(Logger::ERROR));
}
/**
* @covers Monolog\Logger::withName
* @covers Logger::withName
*/
public function testWithName()
{
@@ -48,32 +40,22 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::toMonologLevel
* @covers Logger::toMonologLevel
*/
public function testConvertPSR3ToMonologLevel()
{
$this->assertEquals(Logger::toMonologLevel('debug'), 100);
$this->assertEquals(Logger::toMonologLevel('info'), 200);
$this->assertEquals(Logger::toMonologLevel('notice'), 250);
$this->assertEquals(Logger::toMonologLevel('warning'), 300);
$this->assertEquals(Logger::toMonologLevel('error'), 400);
$this->assertEquals(Logger::toMonologLevel('critical'), 500);
$this->assertEquals(Logger::toMonologLevel('alert'), 550);
$this->assertEquals(Logger::toMonologLevel('emergency'), 600);
$this->assertEquals(Logger::toMonologLevel('debug'), Level::Debug);
$this->assertEquals(Logger::toMonologLevel('info'), Level::Info);
$this->assertEquals(Logger::toMonologLevel('notice'), Level::Notice);
$this->assertEquals(Logger::toMonologLevel('warning'), Level::Warning);
$this->assertEquals(Logger::toMonologLevel('error'), Level::Error);
$this->assertEquals(Logger::toMonologLevel('critical'), Level::Critical);
$this->assertEquals(Logger::toMonologLevel('alert'), Level::Alert);
$this->assertEquals(Logger::toMonologLevel('emergency'), Level::Emergency);
}
/**
* @covers Monolog\Logger::getLevelName
*/
public function testGetLevelNameThrows()
{
$this->expectException(\InvalidArgumentException::class);
Logger::getLevelName(5);
}
/**
* @covers Monolog\Logger::__construct
* @covers Logger::__construct
*/
public function testChannel()
{
@@ -86,7 +68,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testLog()
{
@@ -98,11 +80,11 @@ class LoggerTest extends TestCase
$logger->pushHandler($handler);
$this->assertTrue($logger->addRecord(Logger::WARNING, 'test'));
$this->assertTrue($logger->addRecord(Level::Warning, 'test'));
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testLogAlwaysHandledIfNoProcessorsArePresent()
{
@@ -114,11 +96,11 @@ class LoggerTest extends TestCase
$logger->pushHandler($handler);
$this->assertTrue($logger->addRecord(Logger::WARNING, 'test'));
$this->assertTrue($logger->addRecord(Level::Warning, 'test'));
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testLogNotHandledIfProcessorsArePresent()
{
@@ -131,7 +113,7 @@ class LoggerTest extends TestCase
$logger->pushProcessor(fn (LogRecord $record) => $record);
$logger->pushHandler($handler);
$this->assertFalse($logger->addRecord(Logger::WARNING, 'test'));
$this->assertFalse($logger->addRecord(Level::Warning, 'test'));
}
public function testHandlersInCtor()
@@ -155,8 +137,8 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::pushHandler
* @covers Monolog\Logger::popHandler
* @covers Logger::pushHandler
* @covers Logger::popHandler
*/
public function testPushPopHandler()
{
@@ -176,7 +158,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::setHandlers
* @covers Logger::setHandlers
*/
public function testSetHandlers()
{
@@ -200,8 +182,8 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::pushProcessor
* @covers Monolog\Logger::popProcessor
* @covers Logger::pushProcessor
* @covers Logger::popProcessor
*/
public function testPushPopProcessor()
{
@@ -221,7 +203,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testProcessorsAreExecuted()
{
@@ -239,7 +221,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testProcessorsAreCalledOnlyOnce()
{
@@ -270,7 +252,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testProcessorsNotCalledWhenNotHandled()
{
@@ -289,7 +271,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testHandlersNotCalledBeforeFirstHandlingWhenProcessorsPresent()
{
@@ -332,7 +314,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testHandlersNotCalledBeforeFirstHandlingWhenProcessorsPresentWithAssocArray()
{
@@ -372,7 +354,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testBubblingWhenTheHandlerReturnsFalse()
{
@@ -404,7 +386,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::addRecord
* @covers Logger::addRecord
*/
public function testNotBubblingWhenTheHandlerReturnsTrue()
{
@@ -435,7 +417,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::isHandling
* @covers Logger::isHandling
*/
public function testIsHandling()
{
@@ -448,7 +430,7 @@ class LoggerTest extends TestCase
;
$logger->pushHandler($handler1);
$this->assertFalse($logger->isHandling(Logger::DEBUG));
$this->assertFalse($logger->isHandling(Level::Debug));
$handler2 = $this->createMock('Monolog\Handler\HandlerInterface');
$handler2->expects($this->any())
@@ -457,21 +439,21 @@ class LoggerTest extends TestCase
;
$logger->pushHandler($handler2);
$this->assertTrue($logger->isHandling(Logger::DEBUG));
$this->assertTrue($logger->isHandling(Level::Debug));
}
/**
* @dataProvider logMethodProvider
* @covers Monolog\Logger::debug
* @covers Monolog\Logger::info
* @covers Monolog\Logger::notice
* @covers Monolog\Logger::warning
* @covers Monolog\Logger::error
* @covers Monolog\Logger::critical
* @covers Monolog\Logger::alert
* @covers Monolog\Logger::emergency
* @covers Level::Debug
* @covers Level::Info
* @covers Level::Notice
* @covers Level::Warning
* @covers Level::Error
* @covers Level::Critical
* @covers Level::Alert
* @covers Level::Emergency
*/
public function testLogMethods($method, $expectedLevel)
public function testLogMethods(string $method, Level $expectedLevel)
{
$logger = new Logger('foo');
$handler = new TestHandler;
@@ -485,20 +467,20 @@ class LoggerTest extends TestCase
{
return [
// PSR-3 methods
['debug', Logger::DEBUG],
['info', Logger::INFO],
['notice', Logger::NOTICE],
['warning', Logger::WARNING],
['error', Logger::ERROR],
['critical', Logger::CRITICAL],
['alert', Logger::ALERT],
['emergency', Logger::EMERGENCY],
['debug', Level::Debug],
['info', Level::Info],
['notice', Level::Notice],
['warning', Level::Warning],
['error', Level::Error],
['critical', Level::Critical],
['alert', Level::Alert],
['emergency', Level::Emergency],
];
}
/**
* @dataProvider setTimezoneProvider
* @covers Monolog\Logger::setTimezone
* @covers Logger::setTimezone
*/
public function testSetTimezone($tz)
{
@@ -522,8 +504,8 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::setTimezone
* @covers Monolog\DateTimeImmutable::__construct
* @covers Logger::setTimezone
* @covers DateTimeImmutable::__construct
*/
public function testTimezoneIsRespectedInUTC()
{
@@ -544,8 +526,8 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::setTimezone
* @covers Monolog\DateTimeImmutable::__construct
* @covers Logger::setTimezone
* @covers DateTimeImmutable::__construct
*/
public function testTimezoneIsRespectedInOtherTimezone()
{
@@ -573,8 +555,8 @@ class LoggerTest extends TestCase
/**
* @dataProvider useMicrosecondTimestampsProvider
* @covers Monolog\Logger::useMicrosecondTimestamps
* @covers Monolog\Logger::addRecord
* @covers Logger::useMicrosecondTimestamps
* @covers Logger::addRecord
*/
public function testUseMicrosecondTimestamps($micro, $assert, $assertFormat)
{
@@ -603,7 +585,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::setExceptionHandler
* @covers Logger::setExceptionHandler
*/
public function testSetExceptionHandler()
{
@@ -616,7 +598,7 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::handleException
* @covers Logger::handleException
*/
public function testDefaultHandleException()
{
@@ -638,8 +620,8 @@ class LoggerTest extends TestCase
}
/**
* @covers Monolog\Logger::handleException
* @covers Monolog\Logger::addRecord
* @covers Logger::handleException
* @covers Logger::addRecord
*/
public function testCustomHandleException()
{
@@ -689,13 +671,12 @@ class LoggerTest extends TestCase
return $reflectionProperty->getValue($object);
};
$that = $this;
$assertBufferOfBufferHandlerEmpty = function () use ($getProperty, $bufferHandler, $that) {
$that->assertEmpty($getProperty($bufferHandler, 'buffer'));
$assertBufferOfBufferHandlerEmpty = function () use ($getProperty, $bufferHandler) {
self::assertEmpty($getProperty($bufferHandler, 'buffer'));
};
$assertBuffersEmpty = function () use ($assertBufferOfBufferHandlerEmpty, $getProperty, $fingersCrossedHandler, $that) {
$assertBuffersEmpty = function () use ($assertBufferOfBufferHandlerEmpty, $getProperty, $fingersCrossedHandler) {
$assertBufferOfBufferHandlerEmpty();
$that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer'));
self::assertEmpty($getProperty($fingersCrossedHandler, 'buffer'));
};
$logger->debug('debug1');
@@ -710,8 +691,8 @@ class LoggerTest extends TestCase
$logger->error('error2');
$logger->reset();
$assertBuffersEmpty();
$this->assertTrue($testHandler->hasRecordThatContains('debug2', Logger::DEBUG));
$this->assertTrue($testHandler->hasRecordThatContains('error2', Logger::ERROR));
$this->assertTrue($testHandler->hasRecordThatContains('debug2', Level::Debug));
$this->assertTrue($testHandler->hasRecordThatContains('error2', Level::Error));
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
@@ -731,8 +712,8 @@ class LoggerTest extends TestCase
$logger->reset();
$assertBuffersEmpty();
$this->assertFalse($testHandler->hasInfoRecords());
$this->assertTrue($testHandler->hasRecordThatContains('notice4', Logger::NOTICE));
$this->assertTrue($testHandler->hasRecordThatContains('emergency4', Logger::EMERGENCY));
$this->assertTrue($testHandler->hasRecordThatContains('notice4', Level::Notice));
$this->assertTrue($testHandler->hasRecordThatContains('emergency4', Level::Emergency));
$this->assertNotSame($uid1, $processorUid1->getUid());
$this->assertNotSame($uid2, $processorUid2->getUid());
}

View File

@@ -26,7 +26,7 @@ function tester($handler, $record)
namespace Monolog\Processor;
use Monolog\Logger;
use Monolog\Level;
use Monolog\Test\TestCase;
use Monolog\Handler\TestHandler;
@@ -66,11 +66,11 @@ class IntrospectionProcessorTest extends TestCase
public function testLevelTooLow()
{
$input = $this->getRecord(Logger::DEBUG);
$input = $this->getRecord(Level::Debug);
$expected = $input;
$processor = new IntrospectionProcessor(Logger::CRITICAL);
$processor = new IntrospectionProcessor(Level::Critical);
$actual = $processor($input);
$this->assertEquals($expected, $actual);
@@ -78,7 +78,7 @@ class IntrospectionProcessorTest extends TestCase
public function testLevelEqual()
{
$input = $this->getRecord(Logger::CRITICAL);
$input = $this->getRecord(Level::Critical);
$expected = $input;
$expected['extra'] = [
@@ -89,7 +89,7 @@ class IntrospectionProcessorTest extends TestCase
'callType' => '->',
];
$processor = new IntrospectionProcessor(Logger::CRITICAL);
$processor = new IntrospectionProcessor(Level::Critical);
$actual = $processor($input);
$this->assertEquals($expected, $actual);
@@ -97,7 +97,7 @@ class IntrospectionProcessorTest extends TestCase
public function testLevelHigher()
{
$input = $this->getRecord(Logger::EMERGENCY);
$input = $this->getRecord(Level::Emergency);
$expected = $input;
$expected['extra'] = [
@@ -108,7 +108,7 @@ class IntrospectionProcessorTest extends TestCase
'callType' => '->',
];
$processor = new IntrospectionProcessor(Logger::CRITICAL);
$processor = new IntrospectionProcessor(Level::Critical);
$actual = $processor($input);
$this->assertEquals($expected, $actual);