Fix handling of messages with new lines

Author: Seldaek

src/Monolog/Handler/DeduplicationHandler.php

@@ -114,12 +114,12 @@ private function isDuplicate(array $record)
 
         $yesterday = time() - 86400;
         $timestampValidity = $record['datetime']->getTimestamp() - $this->time;
-        $line = $record['level_name'] . ':' . $record['message'];
+        $expectedMessage = preg_replace('{[\r\n].*}', '', $record['message']);
 
         for ($i = count($store) - 1; $i >= 0; $i--) {
             list($timestamp, $level, $message) = explode(':', $store[$i], 3);
 
-            if ($level === $record['level_name'] && $message === $record['message'] && $timestamp > $timestampValidity) {
+            if ($level === $record['level_name'] && $message === $expectedMessage && $timestamp > $timestampValidity) {
                 return true;
             }
 
@@ -164,6 +164,6 @@ private function collectLogs()
 
     private function appendRecord(array $record)
     {
-        file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . $record['message'] . "\n", FILE_APPEND);
+        file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . preg_replace('{[\r\n].*}', '', $record['message']) . "\n", FILE_APPEND);
     }
 }

tests/Monolog/Handler/DeduplicationHandlerTest.php

@@ -46,7 +46,7 @@ public function testFlushPassthruIfEmptyLog()
         $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
 
         $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
-        $handler->handle($this->getRecord(Logger::CRITICAL));
+        $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
 
         $handler->flush();
 
@@ -67,7 +67,7 @@ public function testFlushSkipsIfLogExists()
         $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
 
         $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
-        $handler->handle($this->getRecord(Logger::CRITICAL));
+        $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
 
         $handler->flush();