From 88e483a8152b1430fa93d93365c75c21c57cab1e Mon Sep 17 00:00:00 2001 From: John Hunt Date: Fri, 4 Mar 2016 16:55:58 +0000 Subject: [PATCH 1/2] Fixed small syntax bug with BrowserConsoleHandler preventing console output Replaced commas in send() method when calling generateScript() - this was preventing any javascript from being output --- src/Monolog/Handler/BrowserConsoleHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Handler/BrowserConsoleHandler.php b/src/Monolog/Handler/BrowserConsoleHandler.php index a8a43aee..fcffa3a1 100644 --- a/src/Monolog/Handler/BrowserConsoleHandler.php +++ b/src/Monolog/Handler/BrowserConsoleHandler.php @@ -65,7 +65,7 @@ class BrowserConsoleHandler extends AbstractProcessingHandler if (count(self::$records)) { if ($format === 'html') { - self::writeOutput(''); + self::writeOutput(''); } elseif ($format === 'js') { self::writeOutput(self::generateScript()); } From d68b63a0d0737e1eceddb156b18d3f005faab20c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 4 Mar 2016 17:19:59 +0000 Subject: [PATCH 2/2] Default to html when no content-type is set --- src/Monolog/Handler/BrowserConsoleHandler.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Monolog/Handler/BrowserConsoleHandler.php b/src/Monolog/Handler/BrowserConsoleHandler.php index fcffa3a1..b3a21bd4 100644 --- a/src/Monolog/Handler/BrowserConsoleHandler.php +++ b/src/Monolog/Handler/BrowserConsoleHandler.php @@ -104,6 +104,10 @@ class BrowserConsoleHandler extends AbstractProcessingHandler /** * Checks the format of the response * + * If Content-Type is set to application/javascript or text/javascript -> js + * If Content-Type is set to text/html, or is unset -> html + * If Content-Type is anything else -> unknown + * * @return string One of 'js', 'html' or 'unknown' */ protected static function getResponseFormat() @@ -115,14 +119,15 @@ class BrowserConsoleHandler extends AbstractProcessingHandler // text/javascript is obsolete in favour of application/javascript, but still used if (stripos($header, 'application/javascript') !== false || stripos($header, 'text/javascript') !== false) { return 'js'; - } elseif (stripos($header, 'text/html') !== false) { - return 'html'; + } + if (stripos($header, 'text/html') === false) { + return 'unknown'; } break; } } - return 'unknown'; + return 'html'; } private static function generateScript()