LogLineFormatter : better newline management

composer.json

@@ -16,6 +16,7 @@
     "minimum-stability": "stable",
     "require":           {
         "php":                        "^7.4 || ^8.0",
+        "ext-mbstring": "*",
         "jrosset/exceptionhelper":    "^1.0",
         "jrosset/lasterrorexception": "^1.0",
         "monolog/monolog":            "^2.9"

src/ExtendedMonolog/ExceptionLogger.php

@@ -1,4 +1,5 @@
 <?php
+/** @noinspection PhpDocFinalChecksInspection */
 
 namespace jrosset\ExtendedMonolog;
 
@@ -16,7 +17,7 @@ class ExceptionLogger extends Logger implements ExceptionLoggerInterface {
     public function exception (int $level, Throwable $exception, array $context = []): void {
         $this->addRecord(
             $level,
-            ExceptionHelper::toString($exception, false),
+            ExceptionHelper::toString($exception, false) . PHP_EOL,
             array_merge(
                 [
                     'exception' => $exception,

src/ExtendedMonolog/LogFileFormatter.php

@@ -25,6 +25,30 @@ class LogFileFormatter extends LineFormatter {
      * @inheritDoc
      */
     public function format (array $record): string {
-        return preg_replace('/((?<!\\\\)\\\\[rn])+$/', PHP_EOL, parent::format($record));
+        //region Get then remove newlines at record message end (*before* the formatting)
+        $messageEndNewlines = '';
+        $record['message'] = preg_replace_callback(
+            '/(?:(?<!\\\\)(?:\\\\[rn]|\\r|\\n))+$/',
+            function (array $match) use (&$messageEndNewlines): string {
+                $messageEndNewlines = $match[0];
+                return '';
+            },
+            $this->normalize($record['message'])
+        );
+        //endregion
+        //region Format the record
+        $output = parent::format($record);
+        //endregion
+        //region Remove newlines at end (introduced by context, extra or record message itself)
+        $output = preg_replace('/(?:(?<!\\\\)(?:\\\\[rn]|\\r|\\n))+$/', '', $output);
+        //endregion
+        //region Re-add the newlines of record message end
+        $output .= $messageEndNewlines;
+        //endregion
+        //region Then finally, replace manual "\r" or "\n" by theirs equivalent
+        return preg_replace(
+            '/(?:(?<!\\\\)\\\\[rn])+/', PHP_EOL, $output
+        );
+        //endregion
     }
 }

tests/test.php

@@ -4,6 +4,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
 
 use jrosset\ExtendedMonolog\ExceptionLogger;
 use jrosset\ExtendedMonolog\LogDirectoryHandler;
+use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
@@ -11,18 +12,25 @@ use Monolog\Logger;
 $logger = new ExceptionLogger(
     'test',
     [
-        new StreamHandler(STDOUT),
+        (new StreamHandler(STDOUT))
+            ->setFormatter(
+                new LineFormatter(
+                    '[%datetime%] %level_name% : %message%',
+                    'Y-m-d H:i:s',
+                    true
+                )
+            ),
         new LogDirectoryHandler(__DIR__ . '/logs/'),
     ]
 );
 
 try {
-    $logger->info('START');
+    $logger->info('======= test =======' . PHP_EOL . 'START' . PHP_EOL);
 
     throw new RuntimeException('An unexpected error occurs');
 
     /** @noinspection PhpUnreachableStatementInspection */
-    $logger->info('END');
+    $logger->info('END' . PHP_EOL);
 }
 catch (Throwable $exception) {
     $logger->exception(Logger::ERROR, $exception);