fix(logs): Allow passing string and enum Monolog level (#959)

Co-authored-by: Michi Hoffmann <cleptric@users.noreply.github.com>

Author: HypeMC

psalm-baseline.xml

@@ -18,6 +18,20 @@
       <code><![CDATA[isMasterRequest]]></code>
     </UndefinedMethod>
   </file>
+  <file src="src/Monolog/LogsHandler.php">
+    <InvalidParamDefault>
+      <code><![CDATA[value-of<MonologLevel::VALUES>|value-of<MonologLevel::NAMES>|MonologLevel|PsrLogLevel::*]]></code>
+    </InvalidParamDefault>
+    <UndefinedClass>
+      <code><![CDATA[value-of<MonologLevel::VALUES>|value-of<MonologLevel::NAMES>|MonologLevel|PsrLogLevel::*]]></code>
+    </UndefinedClass>
+    <UndefinedDocblockClass>
+      <code><![CDATA[value-of<MonologLevel::VALUES>|value-of<MonologLevel::NAMES>|MonologLevel|PsrLogLevel::*]]></code>
+    </UndefinedDocblockClass>
+    <UnresolvableConstant>
+      <code><![CDATA[value-of<MonologLevel::VALUES>|value-of<MonologLevel::NAMES>|MonologLevel|PsrLogLevel::*]]></code>
+    </UnresolvableConstant>
+  </file>
   <file src="src/Tracing/Cache/TraceableCacheAdapterTrait.php">
     <LessSpecificImplementedReturnType>
       <code><![CDATA[iterable]]></code>

src/Monolog/LogsHandler.php

@@ -4,8 +4,11 @@
 
 namespace Sentry\SentryBundle\Monolog;
 
+use Monolog\Level as MonologLevel;
 use Monolog\Logger as MonologLogger;
 use Monolog\LogRecord;
+use Psr\Log\InvalidArgumentException;
+use Psr\Log\LogLevel as PsrLogLevel;
 use Sentry\Monolog\CompatibilityLogLevelTrait;
 use Sentry\Monolog\LogsHandler as BaseLogsHandler;
 
@@ -18,8 +21,21 @@ class LogsHandler extends BaseLogsHandler
 {
     use CompatibilityLogLevelTrait;
 
-    public function __construct(int $level = MonologLogger::DEBUG, bool $bubble = true)
+    /**
+     * @param int|string|MonologLevel|PsrLogLevel::* $level
+     *
+     * @phpstan-param value-of<MonologLevel::VALUES>|value-of<MonologLevel::NAMES>|MonologLevel|PsrLogLevel::* $level
+     */
+    public function __construct($level = MonologLogger::DEBUG, bool $bubble = true)
     {
+        try {
+            $level = MonologLogger::toMonologLevel($level);
+        } catch (InvalidArgumentException $e) {
+            $level = MonologLogger::INFO;
+        }
+        if ($level instanceof MonologLevel) { // Monolog >= 3
+            $level = $level->value;
+        }
         $logLevel = self::getSentryLogLevelFromMonologLevel($level);
         parent::__construct($logLevel, $bubble);
     }

tests/Monolog/LogsHandlerTest.php

@@ -4,8 +4,10 @@
 
 namespace Sentry\SentryBundle\Tests\Monolog;
 
+use Monolog\Level as MonologLevel;
 use Monolog\Logger as MonologLogger;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LogLevel as PsrLogLevel;
 use Sentry\SentryBundle\Monolog\LogsHandler;
 
 final class LogsHandlerTest extends TestCase
@@ -48,4 +50,52 @@ public function testHandleReturnsTrueAboveThresholdWhenBubbleFalse(): void
 
         $this->assertTrue($handler->handle($record));
     }
+
+    /**
+     * @dataProvider levelProvider
+     *
+     * @param int|string|MonologLevel $level
+     *
+     * @phpstan-param value-of<MonologLevel::VALUES>|value-of<MonologLevel::NAMES>|MonologLevel|PsrLogLevel::* $level
+     */
+    public function testHandlerAcceptsVariousTypesAsLevel($level): void
+    {
+        $handler = new LogsHandler($level, false);
+        $record = [
+            'level' => MonologLogger::WARNING,
+            'message' => 'msg',
+            'context' => [],
+            'extra' => [],
+        ];
+
+        $this->assertTrue($handler->handle($record));
+    }
+
+    /**
+     * @return iterable<array{0: int|string|MonologLevel}>
+     */
+    public static function levelProvider(): iterable
+    {
+        yield [MonologLogger::DEBUG];
+        yield ['DEBUG'];
+        yield [PsrLogLevel::DEBUG];
+
+        if (class_exists(MonologLevel::class)) {
+            yield [MonologLevel::Debug];
+        }
+    }
+
+    public function testHandlerFallbacksToInfoOnInvalidLevel(): void
+    {
+        /** @phpstan-ignore-next-line */
+        $handler = new LogsHandler(123124213, false);
+        $record = [
+            'message' => 'msg',
+            'context' => [],
+            'extra' => [],
+        ];
+
+        $this->assertFalse($handler->handle($record + ['level' => MonologLogger::DEBUG]));
+        $this->assertTrue($handler->handle($record + ['level' => MonologLogger::WARNING]));
+    }
 }