From c82afaa30356d20e08cc74fec7ab9b6ecd38288a Mon Sep 17 00:00:00 2001 From: Lesnykh Ilia Date: Wed, 11 Jan 2017 20:17:39 +0400 Subject: [PATCH 1/4] Add missed return phpdoc tag. (#908) * Add missed return phpdoc tag. * Change $this to self. --- src/Monolog/Handler/RavenHandler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Monolog/Handler/RavenHandler.php b/src/Monolog/Handler/RavenHandler.php index d3f9ed8f..5c196aba 100644 --- a/src/Monolog/Handler/RavenHandler.php +++ b/src/Monolog/Handler/RavenHandler.php @@ -221,6 +221,7 @@ class RavenHandler extends AbstractProcessingHandler /** * @param string $value + * @return self */ public function setRelease($value) { From cc5f1eb34df753600801f4619948daffc5c0df2c Mon Sep 17 00:00:00 2001 From: fabriceparallel Date: Sun, 12 Mar 2017 18:42:12 +0200 Subject: [PATCH 2/4] Php5.3 autoload errors (#929) * make ErrorHandler extends LogLevel to avoid autoloading issue when error is triggered on compile * Revert "make ErrorHandler extends LogLevel to avoid autoloading issue when error is triggered on compile" This reverts commit 8140f6026f59a2be9f80e562cf6ad6d441241593. * call class_exists with force autoload set to true, to force the autoload of LogLevel on registration of the handlers --- src/Monolog/ErrorHandler.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php index 0152298d..7bfcd833 100644 --- a/src/Monolog/ErrorHandler.php +++ b/src/Monolog/ErrorHandler.php @@ -58,6 +58,9 @@ class ErrorHandler */ public static function register(LoggerInterface $logger, $errorLevelMap = array(), $exceptionLevel = null, $fatalLevel = null) { + //Forces the autoloader to run for LogLevel. Fixes an autoload issue at compile-time on PHP5.3. See https://github.com/Seldaek/monolog/pull/929 + class_exists('\\Psr\\Log\\LogLevel', true); + $handler = new static($logger); if ($errorLevelMap !== false) { $handler->registerErrorHandler($errorLevelMap); From e6b05c91735f81908f70e58aa4715a4abd142c1f Mon Sep 17 00:00:00 2001 From: Tim Strijdhorst Date: Sun, 12 Mar 2017 17:46:54 +0100 Subject: [PATCH 3/4] Allow to set custom event_id [LEGACY] (#930) * +allow to set a custom event_id as an extra parameter instead of letting Raven generate a UUIDv4 * +CS * +CS * +verbose array syntax because of PHP 5.3 support --- src/Monolog/Handler/RavenHandler.php | 2 +- tests/Monolog/Handler/RavenHandlerTest.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Monolog/Handler/RavenHandler.php b/src/Monolog/Handler/RavenHandler.php index 5c196aba..53a8b391 100644 --- a/src/Monolog/Handler/RavenHandler.php +++ b/src/Monolog/Handler/RavenHandler.php @@ -216,7 +216,7 @@ class RavenHandler extends AbstractProcessingHandler */ protected function getExtraParameters() { - return array('checksum', 'release'); + return array('checksum', 'release', 'event_id'); } /** diff --git a/tests/Monolog/Handler/RavenHandlerTest.php b/tests/Monolog/Handler/RavenHandlerTest.php index 574077df..26d212b9 100644 --- a/tests/Monolog/Handler/RavenHandlerTest.php +++ b/tests/Monolog/Handler/RavenHandlerTest.php @@ -92,11 +92,13 @@ class RavenHandlerTest extends TestCase $checksum = '098f6bcd4621d373cade4e832627b4f6'; $release = '05a671c66aefea124cc08b76ea6d30bb'; - $record = $this->getRecord(Logger::INFO, 'test', array('checksum' => $checksum, 'release' => $release)); + $eventId = '31423'; + $record = $this->getRecord(Logger::INFO, 'test', array('checksum' => $checksum, 'release' => $release, 'event_id' => $eventId)); $handler->handle($record); $this->assertEquals($checksum, $ravenClient->lastData['checksum']); $this->assertEquals($release, $ravenClient->lastData['release']); + $this->assertEquals($eventId, $ravenClient->lastData['event_id']); } public function testFingerprint() From 821cc3e4a5fcb940a9c6faa58c07138d195e25c2 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 12 Mar 2017 17:42:52 +0100 Subject: [PATCH 4/4] Backport fix for #752, fixes #925 --- src/Monolog/Formatter/LineFormatter.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Monolog/Formatter/LineFormatter.php b/src/Monolog/Formatter/LineFormatter.php index 8ffe6012..f7570367 100644 --- a/src/Monolog/Formatter/LineFormatter.php +++ b/src/Monolog/Formatter/LineFormatter.php @@ -141,7 +141,7 @@ class LineFormatter extends NormalizerFormatter $str = '[object] ('.get_class($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')'; if ($this->includeStacktraces) { - $str .= "\n[stacktrace]\n".$e->getTraceAsString(); + $str .= "\n[stacktrace]\n".$e->getTraceAsString()."\n"; } return $str; @@ -167,6 +167,10 @@ class LineFormatter extends NormalizerFormatter protected function replaceNewlines($str) { if ($this->allowInlineLineBreaks) { + if (0 === strpos($str, '{')) { + return str_replace(['\r', '\n'], ["\r", "\n"], $str); + } + return $str; }