Initial changes to support actual PSR3 style logging

Author: ryanrath

classes/CCR/CCRLineFormatter.php

@@ -2,10 +2,26 @@
 
 namespace CCR;
 
+
 use Monolog\Formatter\LineFormatter;
+use Monolog\Formatter\NormalizerFormatter;
 
 class CCRLineFormatter extends LineFormatter
 {
+
+    private NormalizerFormatter $normalizerFormatter;
+
+    public function __construct($format = null, $dateFormat = null, $allowInlineLineBreaks = false, $ignoreEmptyContextAndExtra = false)
+    {
+        if (!str_contains($format, '%context%')) {
+            // first strip newlines from the format, then we'll add one at the end.
+            $format = str_replace(["\n", "\r\n", "\r",], '', $format);
+            $format = "$format %context%\n";
+        }
+        $this->normalizerFormatter = new NormalizerFormatter($dateFormat);
+        parent::__construct($format, $dateFormat, $allowInlineLineBreaks, $ignoreEmptyContextAndExtra);
+    }
+
     /**
      * We've overridden this function so that we can customize the way that arrays of data are displayed from the
      * standard `{"key" => "value", ...}` to `(key: value)`
@@ -29,4 +45,55 @@ protected function toJson($data, $ignoreErrors = false): string
 
         return implode(' ', $parts);
     }
+
+    public function format(array $record)
+    {
+        $vars = $this->normalizerFormatter->format($record);
+
+        $output = $this->format;
+
+        foreach ($vars['extra'] as $var => $val) {
+            if (false !== strpos($output, '%extra.'.$var.'%')) {
+                $output = str_replace('%extra.'.$var.'%', $this->stringify($val), $output);
+                unset($vars['extra'][$var]);
+            }
+        }
+
+
+        foreach ($vars['context'] as $var => $val) {
+            if (false !== strpos($output, '%context.'.$var.'%')) {
+                $output = str_replace('%context.'.$var.'%', $this->stringify($val), $output);
+                unset($vars['context'][$var]);
+            }
+        }
+
+        if ($this->ignoreEmptyContextAndExtra) {
+            if (empty($vars['context'])) {
+                unset($vars['context']);
+                $output = str_replace('%context%', '', $output);
+            }
+
+            if (empty($vars['extra'])) {
+                unset($vars['extra']);
+                $output = str_replace('%extra%', '', $output);
+            }
+        }
+
+        foreach ($vars as $var => $val) {
+            if (false !== strpos($output, '%'.$var.'%')) {
+                $output = str_replace('%'.$var.'%', $this->stringify($val), $output);
+            }
+        }
+
+        if (false !== strpos($output, '%context%')) {
+            $output = str_replace($output, '%context%', $this->toJson($vars['context']));
+        }
+
+        // remove leftover %extra.xxx% and %context.xxx% if any
+        if (false !== strpos($output, '%')) {
+            $output = preg_replace('/%(?:extra|context)\..+?%/', '', $output);
+        }
+
+        return $output;
+    }
 }