bug #34697 [MonologBridge] Fix compatibility of ServerLogHandler with Monolog 2 (jderusse)

nicolas-grekas · nicolas-grekas · commit 5a307932d984 · 2019-11-29T17:39:52.000+01:00
This PR was merged into the 5.0 branch. Discussion ---------- [MonologBridge] Fix compatibility of ServerLogHandler with Monolog 2 | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #34520 | License | MIT | Doc PR | NA This is an alternative to #34521 that keep compatibility with "processors" and "formaters". Commits ------- bdb10f7 Fix compatibility with Monolog 2
diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -12,14 +12,43 @@
 namespace Symfony\Bridge\Monolog\Handler;
 
 use Monolog\Formatter\FormatterInterface;
-use Monolog\Handler\AbstractHandler;
+use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Handler\FormattableHandlerTrait;
 use Monolog\Logger;
 use Symfony\Bridge\Monolog\Formatter\VarDumperFormatter;
 
+if (trait_exists(FormattableHandlerTrait::class)) {
+    class ServerLogHandler extends AbstractProcessingHandler
+    {
+        use ServerLogHandlerTrait;
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getDefaultFormatter(): FormatterInterface
+        {
+            return new VarDumperFormatter();
+        }
+    }
+} else {
+    class ServerLogHandler extends AbstractProcessingHandler
+    {
+        use ServerLogHandlerTrait;
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getDefaultFormatter()
+        {
+            return new VarDumperFormatter();
+        }
+    }
+}
+
 /**
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
-class ServerLogHandler extends AbstractHandler
+trait ServerLogHandlerTrait
 {
     private $host;
     private $context;
@@ -56,6 +85,11 @@ public function handle(array $record): bool
             restore_error_handler();
         }
 
+        return parent::handle($record);
+    }
+
+    protected function write(array $record): void
+    {
         $recordFormatted = $this->formatRecord($record);
 
         set_error_handler(self::class.'::nullErrorHandler');
@@ -72,16 +106,12 @@ public function handle(array $record): bool
         } finally {
             restore_error_handler();
         }
-
-        return false === $this->bubble;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return FormatterInterface
      */
-    protected function getDefaultFormatter()
+    protected function getDefaultFormatter(): FormatterInterface
     {
         return new VarDumperFormatter();
     }
@@ -103,13 +133,7 @@ private function createSocket()
 
     private function formatRecord(array $record): string
     {
-        if ($this->processors) {
-            foreach ($this->processors as $processor) {
-                $record = $processor($record);
-            }
-        }
-
-        $recordFormatted = $this->getFormatter()->format($record);
+        $recordFormatted = $record['formatted'];
 
         foreach (['log_uuid', 'uuid', 'uid'] as $key) {
             if (isset($record['extra'][$key])) {
