change to inheritance

Author: Litarnus

src/Monolog/LogsHandler.php

@@ -4,39 +4,24 @@
 
 namespace Sentry\SentryBundle\Monolog;
 
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Handler\HandlerInterface;
 use Monolog\Logger as MonologLogger;
 use Monolog\LogRecord;
 use Sentry\Monolog\CompatibilityLogLevelTrait;
 use Sentry\Monolog\LogsHandler as BaseLogsHandler;
 
 /**
- * Wrapper for the Sentry LogsHandler that uses Monolog constants for initialization.
- * Sentry's LogLevel classes cannot be properly used in Symfony configuration so this acts as
- * a service facade that can be instantiated using yml/xml config files.
+ * Extends the base LogsHandler so that it can be used with Monolog constants.
+ * Sentry LogLevel objects are not easily usable with symfony config files, so this provides
+ * a convenient way to instantiate the service in yaml/xml.
  */
-class LogsHandler implements HandlerInterface
+class LogsHandler extends BaseLogsHandler
 {
     use CompatibilityLogLevelTrait;
 
-    /**
-     * @var BaseLogsHandler
-     */
-    private $logsHandler;
-
     public function __construct(int $level = MonologLogger::DEBUG, bool $bubble = true)
     {
         $logLevel = self::getSentryLogLevelFromMonologLevel($level);
-        $this->logsHandler = new BaseLogsHandler($logLevel, $bubble);
-    }
-
-    /**
-     * @param array<string, mixed>|LogRecord $record
-     */
-    public function isHandling($record): bool
-    {
-        return $this->logsHandler->isHandling($record);
+        parent::__construct($logLevel, $bubble);
     }
 
     /**
@@ -46,49 +31,10 @@ public function handle($record): bool
     {
         // Extra check required here because `isHandling` is not guaranteed to
         // be called, and we might accidentally capture log messages that should be filtered.
-        if ($this->logsHandler->isHandling($record)) {
-            return $this->logsHandler->handle($record);
+        if ($this->isHandling($record)) {
+            return parent::handle($record);
         }
 
         return false;
     }
-
-    /**
-     * @param array<array<string, mixed>|LogRecord> $records
-     */
-    public function handleBatch(array $records): void
-    {
-        $this->logsHandler->handleBatch($records);
-    }
-
-    public function close(): void
-    {
-        $this->logsHandler->close();
-    }
-
-    /**
-     * @param callable $callback
-     */
-    public function pushProcessor($callback): void
-    {
-        $this->logsHandler->pushProcessor($callback);
-    }
-
-    /**
-     * @return callable
-     */
-    public function popProcessor()
-    {
-        return $this->logsHandler->popProcessor();
-    }
-
-    public function setFormatter(FormatterInterface $formatter): void
-    {
-        $this->logsHandler->setFormatter($formatter);
-    }
-
-    public function getFormatter(): FormatterInterface
-    {
-        return $this->logsHandler->getFormatter();
-    }
 }

tests/Monolog/LogsHandlerTest.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sentry\SentryBundle\Tests\Monolog;
+
+use Monolog\Logger as MonologLogger;
+use PHPUnit\Framework\TestCase;
+use Sentry\SentryBundle\Monolog\LogsHandler;
+
+final class LogsHandlerTest extends TestCase
+{
+    public function testHandleReturnsFalseBelowThresholdEvenWhenBubbleFalse(): void
+    {
+        $handler = new LogsHandler(MonologLogger::WARNING, false);
+        $record = [
+            'level' => MonologLogger::DEBUG,
+            'message' => 'msg',
+            'context' => [],
+            'extra' => [],
+        ];
+
+        $this->assertFalse($handler->handle($record));
+    }
+
+    public function testHandleReturnsFalseAboveThresholdWhenBubbleTrue(): void
+    {
+        $handler = new LogsHandler(MonologLogger::DEBUG, true);
+        $record = [
+            'level' => MonologLogger::WARNING,
+            'message' => 'msg',
+            'context' => [],
+            'extra' => [],
+        ];
+
+        $this->assertFalse($handler->handle($record));
+    }
+
+    public function testHandleReturnsTrueAboveThresholdWhenBubbleFalse(): void
+    {
+        $handler = new LogsHandler(MonologLogger::DEBUG, false);
+        $record = [
+            'level' => MonologLogger::WARNING,
+            'message' => 'msg',
+            'context' => [],
+            'extra' => [],
+        ];
+
+        $this->assertTrue($handler->handle($record));
+    }
+}
+
+