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

Merge branch '2.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2022-08-02 15:04:49 +03:00
parent 305444bc6f 132eace138
commit 8471abd5ef
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Monolog/Handler/BrowserConsoleHandler.php
View File

@@ -15,6 +15,7 @@ use Monolog\Formatter\FormatterInterface;
use Monolog\Formatter\LineFormatter; use Monolog\Formatter\LineFormatter;
use Monolog\Utils; use Monolog\Utils;
use Monolog\LogRecord; use Monolog\LogRecord;
use Monolog\Level;
use function count; use function count;
use function headers_list; use function headers_list;
@@ -173,7 +174,7 @@ class BrowserConsoleHandler extends AbstractProcessingHandler
$extra = self::dump('Extra', $record->extra); $extra = self::dump('Extra', $record->extra);
if (\count($context) === 0 && \count($extra) === 0) { if (\count($context) === 0 && \count($extra) === 0) {
$script[] = self::call_array('log', self::handleStyles($record->formatted)); $script[] = self::call_array(self::getConsoleMethodForLevel($record->level), self::handleStyles($record->formatted));
} else { } else {
$script = array_merge( $script = array_merge(
$script, $script,
@@ -188,6 +189,16 @@ class BrowserConsoleHandler extends AbstractProcessingHandler
return "(function (c) {if (c && c.groupCollapsed) {\n" . implode("\n", $script) . "\n}})(console);"; return "(function (c) {if (c && c.groupCollapsed) {\n" . implode("\n", $script) . "\n}})(console);";
} }
private static function getConsoleMethodForLevel(Level $level): string
{
return match ($level) {
Level::Debug => 'debug',
Level::Info, Level::Notice => 'info',
Level::Warning => 'warn',
Level::Error, Level::Critical, Level::Alert, Level::Emergency => 'error',
};
}
/** /**
* @return string[] * @return string[]
*/ */

20
tests/Monolog/Handler/BrowserConsoleHandlerTest.php
View File

@@ -41,7 +41,7 @@ class BrowserConsoleHandlerTest extends TestCase
$expected = <<<EOF $expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) { (function (c) {if (c && c.groupCollapsed) {
c.log("%cfoo%cbar%c", "font-weight: normal", "color: red", "font-weight: normal"); c.debug("%cfoo%cbar%c", "font-weight: normal", "color: red", "font-weight: normal");
}})(console); }})(console);
EOF; EOF;
@@ -57,7 +57,7 @@ EOF;
$expected = <<<EOF $expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) { (function (c) {if (c && c.groupCollapsed) {
c.log("%cfoo%cbar%c%cbaz%c", "font-weight: normal", "color: red", "font-weight: normal", "color: blue", "font-weight: normal"); c.debug("%cfoo%cbar%c%cbaz%c", "font-weight: normal", "color: red", "font-weight: normal", "color: blue", "font-weight: normal");
}})(console); }})(console);
EOF; EOF;
@@ -73,7 +73,7 @@ EOF;
$expected = <<<EOF $expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) { (function (c) {if (c && c.groupCollapsed) {
c.log("%c[foo] %c\"bar\\n[baz]\"%c", "font-weight: normal", "color: red", "font-weight: normal"); c.debug("%c[foo] %c\"bar\\n[baz]\"%c", "font-weight: normal", "color: red", "font-weight: normal");
}})(console); }})(console);
EOF; EOF;
@@ -91,9 +91,9 @@ EOF;
$expected = <<<EOF $expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) { (function (c) {if (c && c.groupCollapsed) {
c.log("%c%cfoo%c", "font-weight: normal", "background-color: blue; color: white; border-radius: 3px; padding: 0 2px 0 2px", "font-weight: normal"); c.debug("%c%cfoo%c", "font-weight: normal", "background-color: blue; color: white; border-radius: 3px; padding: 0 2px 0 2px", "font-weight: normal");
c.log("%c%cbar%c", "font-weight: normal", "background-color: green; color: white; border-radius: 3px; padding: 0 2px 0 2px", "font-weight: normal"); c.debug("%c%cbar%c", "font-weight: normal", "background-color: green; color: white; border-radius: 3px; padding: 0 2px 0 2px", "font-weight: normal");
c.log("%c%cfoo%c", "font-weight: normal", "background-color: blue; color: white; border-radius: 3px; padding: 0 2px 0 2px", "font-weight: normal"); c.debug("%c%cfoo%c", "font-weight: normal", "background-color: blue; color: white; border-radius: 3px; padding: 0 2px 0 2px", "font-weight: normal");
}})(console); }})(console);
EOF; EOF;
@@ -135,10 +135,10 @@ EOF;
$expected = <<<EOF $expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) { (function (c) {if (c && c.groupCollapsed) {
c.log("%ctest1", "font-weight: normal"); c.debug("%ctest1", "font-weight: normal");
c.log("%ctest2", "font-weight: normal"); c.debug("%ctest2", "font-weight: normal");
c.log("%ctest3", "font-weight: normal"); c.debug("%ctest3", "font-weight: normal");
c.log("%ctest4", "font-weight: normal"); c.debug("%ctest4", "font-weight: normal");
}})(console); }})(console);
EOF; EOF;