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

Remove LevelName enum in favor of a Level::getName method, fixes #1667 (#1668)

Browse Source
This commit is contained in:
Jordi Boggiano
2022-05-10 11:15:16 +02:00
committed by GitHub
parent d381140ca1
commit 1dacc790b9
65 changed files with 220 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Monolog/Formatter/LogstashFormatterTest.php
View File

@@ -12,7 +12,6 @@
namespace Monolog\Formatter;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
class LogstashFormatterTest extends TestCase
@@ -36,7 +35,7 @@ class LogstashFormatterTest extends TestCase
$this->assertEquals("1", $message['@version']);
$this->assertEquals('log', $message['message']);
$this->assertEquals('meh', $message['channel']);
$this->assertEquals(LevelName::Error->value, $message['level']);
$this->assertEquals(Level::Error->getName(), $message['level']);
$this->assertEquals(Level::Error->value, $message['monolog_level']);
$this->assertEquals('test', $message['type']);
$this->assertEquals('hostname', $message['host']);

3
tests/Monolog/Formatter/MongoDBFormatterTest.php
View File

@@ -15,7 +15,6 @@ use MongoDB\BSON\ObjectId;
use MongoDB\BSON\Regex;
use MongoDB\BSON\UTCDateTime;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
/**
@@ -75,7 +74,7 @@ class MongoDBFormatterTest extends TestCase
$this->assertEquals('some log message', $formattedRecord['message']);
$this->assertEquals([], $formattedRecord['context']);
$this->assertEquals(Level::Warning->value, $formattedRecord['level']);
$this->assertEquals(LevelName::Warning->value, $formattedRecord['level_name']);
$this->assertEquals(Level::Warning->getName(), $formattedRecord['level_name']);
$this->assertEquals('test', $formattedRecord['channel']);
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $formattedRecord['datetime']);
$this->assertEquals('1453410690123', $formattedRecord['datetime']->__toString());

7
tests/Monolog/Formatter/NormalizerFormatterTest.php
View File

@@ -11,7 +11,6 @@
namespace Monolog\Formatter;
use Monolog\LevelName;
use Monolog\Test\TestCase;
use Monolog\Level;
@@ -38,7 +37,7 @@ class NormalizerFormatterTest extends TestCase
));
$this->assertEquals([
'level_name' => LevelName::Error->value,
'level_name' => Level::Error->getName(),
'level' => Level::Error->value,
'channel' => 'meh',
'message' => 'foo',
@@ -148,7 +147,7 @@ class NormalizerFormatterTest extends TestCase
]);
$this->assertEquals([
[
'level_name' => LevelName::Critical->value,
'level_name' => Level::Critical->getName(),
'level' => Level::Critical->value,
'channel' => 'test',
'message' => 'bar',
@@ -157,7 +156,7 @@ class NormalizerFormatterTest extends TestCase
'extra' => [],
],
[
'level_name' => LevelName::Warning->value,
'level_name' => Level::Warning->getName(),
'level' => Level::Warning->value,
'channel' => 'log',
'message' => 'foo',

10
tests/Monolog/Handler/PsrHandlerTest.php
View File

@@ -12,7 +12,6 @@
namespace Monolog\Handler;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
use Monolog\Formatter\LineFormatter;
@@ -24,7 +23,7 @@ class PsrHandlerTest extends TestCase
public function logLevelProvider()
{
return array_map(
fn (Level $level) => [$level->toLevelName(), $level],
fn (Level $level) => [$level->toPsrLogLevel(), $level],
Level::cases()
);
}
@@ -32,7 +31,7 @@ class PsrHandlerTest extends TestCase
/**
* @dataProvider logLevelProvider
*/
public function testHandlesAllLevels(LevelName $levelName, Level $level)
public function testHandlesAllLevels(string $levelName, Level $level)
{
$message = 'Hello, world! ' . $level->value;
$context = ['foo' => 'bar', 'level' => $level->value];
@@ -40,7 +39,7 @@ class PsrHandlerTest extends TestCase
$psrLogger = $this->createMock('Psr\Log\NullLogger');
$psrLogger->expects($this->once())
->method('log')
->with(strtolower($levelName->value), $message, $context);
->with($levelName, $message, $context);
$handler = new PsrHandler($psrLogger);
$handler->handle($this->getRecord($level, $message, context: $context));
@@ -51,12 +50,11 @@ class PsrHandlerTest extends TestCase
$message = 'Hello, world!';
$context = ['foo' => 'bar'];
$level = Level::Error;
$levelName = LevelName::Error;
$psrLogger = $this->createMock('Psr\Log\NullLogger');
$psrLogger->expects($this->once())
->method('log')
->with(strtolower($levelName->value), 'dummy', $context);
->with($level->toPsrLogLevel(), 'dummy', $context);
$handler = new PsrHandler($psrLogger);
$handler->setFormatter(new LineFormatter('dummy'));

9
tests/Monolog/Handler/Slack/SlackRecordTest.php
View File

@@ -12,7 +12,6 @@
namespace Monolog\Handler\Slack;
use Monolog\Level;
use Monolog\LevelName;
use Monolog\Test\TestCase;
/**
@@ -227,7 +226,7 @@ class SlackRecordTest extends TestCase
public function testAddsShortAttachmentWithoutContextAndExtra()
{
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$levelName = $level->getName();
$record = new SlackRecord(null, null, true, null, true);
$data = $record->getSlackData($this->getRecord($level, 'test', ['test' => 1]));
@@ -241,7 +240,7 @@ class SlackRecordTest extends TestCase
public function testAddsShortAttachmentWithContextAndExtra()
{
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$levelName = $level->getName();
$context = ['test' => 1];
$extra = ['tags' => ['web']];
$record = new SlackRecord(null, null, true, null, true, true);
@@ -274,7 +273,7 @@ class SlackRecordTest extends TestCase
public function testAddsLongAttachmentWithoutContextAndExtra()
{
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$levelName = $level->getName();
$record = new SlackRecord(null, null, true, null);
$data = $record->getSlackData($this->getRecord($level, 'test', ['test' => 1]));
@@ -296,7 +295,7 @@ class SlackRecordTest extends TestCase
public function testAddsLongAttachmentWithContextAndExtra()
{
$level = Level::Error;
$levelName = LevelName::fromLevel($level)->value;
$levelName = $level->getName();
$context = ['test' => 1];
$extra = ['tags' => ['web']];
$record = new SlackRecord(null, null, true, null, false, true);

3
tests/Monolog/Handler/SlackWebhookHandlerTest.php
View File

@@ -11,7 +11,6 @@
namespace Monolog\Handler;
use Monolog\LevelName;
use Monolog\Test\TestCase;
use Monolog\Level;
use Monolog\Formatter\LineFormatter;
@@ -119,7 +118,7 @@ class SlackWebhookHandlerTest extends TestCase
'fields' => [
[
'title' => 'Level',
'value' => LevelName::Warning->value,
'value' => Level::Warning->getName(),
'short' => false,
],
],

2
tests/Monolog/Handler/ZendMonitorHandlerTest.php
View File

@@ -58,7 +58,7 @@ class ZendMonitorHandlerTest extends TestCase
$zendMonitor->expects($this->once())
->method('writeZendMonitorCustomEvent')
->with(
$record->levelName->value,
$record->level->getName(),
$record->message,
$formatterResult,
\ZEND_MONITOR_EVENT_SEVERITY_WARNING