Merge pull request #5 from micheh/sentry-3

Add support for Sentry 3.x

composer.json

@@ -16,7 +16,7 @@
     },
     "require": {
         "php": ">=7.1",
-        "sentry/sentry": "^2.1",
+        "sentry/sentry": "^2.1|^3.0",
         "monolog/monolog": "^1.2|^2.0"
     },
     "require-dev": {

src/SentryBreadcrumbsMonologHandler/BreadcrumbsHandler.php

@@ -9,18 +9,18 @@
 use Sentry\Breadcrumb;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
+use function defined;
 
 final class BreadcrumbsHandler extends AbstractProcessingHandler
 {
-    private const LEVELS = [
+    /** @var array<string, string> */
+    private static $levels = [
         Logger::DEBUG => Breadcrumb::LEVEL_DEBUG,
         Logger::INFO => Breadcrumb::LEVEL_INFO,
         Logger::NOTICE => Breadcrumb::LEVEL_INFO,
         Logger::WARNING => Breadcrumb::LEVEL_WARNING,
         Logger::ERROR => Breadcrumb::LEVEL_ERROR,
-        Logger::CRITICAL => Breadcrumb::LEVEL_CRITICAL,
-        Logger::ALERT => Breadcrumb::LEVEL_CRITICAL,
-        Logger::EMERGENCY => Breadcrumb::LEVEL_CRITICAL,
+        // Logger::CRITICAL, Logger::ALERT and Logger::EMERGENCY are set in the constructor
     ];
 
     /** @var HubInterface */
@@ -30,6 +30,11 @@ public function __construct(HubInterface $hub)
     {
         parent::__construct();
         $this->hub = $hub;
+
+        $criticalLevel                   = defined(Breadcrumb::class . '::LEVEL_FATAL') ? Breadcrumb::LEVEL_FATAL : Breadcrumb::LEVEL_CRITICAL;
+        self::$levels[Logger::CRITICAL]  = $criticalLevel;
+        self::$levels[Logger::ALERT]     = $criticalLevel;
+        self::$levels[Logger::EMERGENCY] = $criticalLevel;
     }
 
     /**
@@ -57,6 +62,6 @@ protected function write(array $record) : void
      */
     private function convertMonologLevelToSentryLevel(int $level) : string
     {
-        return self::LEVELS[$level] ?? Breadcrumb::LEVEL_INFO;
+        return self::$levels[$level] ?? Breadcrumb::LEVEL_INFO;
     }
 }

tests/BreadcrumbsHandlerTest.php

@@ -7,9 +7,12 @@
 use Mockery;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
+use Sentry\Breadcrumb;
 use Sentry\Event;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
+use function defined;
+use function method_exists;
 
 final class BreadcrumbsHandlerTest extends TestCase
 {
@@ -43,13 +46,7 @@ public function testWriteRecord() : void
             'extra' => [],
         ];
 
-        $this->handler->handle($record);
-
-        $event = new Event();
-
-        $this->scope->applyToEvent($event, []);
-
-        $breadcrumbs = $event->getBreadcrumbs();
+        $breadcrumbs = $this->handleRecord($record);
 
         $this->assertCount(1, $breadcrumbs);
         $this->assertSame($record['message'], $breadcrumbs[0]->getMessage());
@@ -58,6 +55,46 @@ public function testWriteRecord() : void
         $this->assertSame('app', $breadcrumbs[0]->getCategory());
     }
 
+    public function testWriteRecordSetsCorrectLevel() : void
+    {
+        $record = [
+            'message' => 'Test message',
+            'channel' => 'app',
+            'level' => Logger::ALERT,
+            'context' => [],
+            'extra' => [],
+        ];
+
+        $expectedLevel = defined(Breadcrumb::class . '::LEVEL_FATAL') ? 'fatal' : 'critical';
+
+        $breadcrumbs = $this->handleRecord($record);
+
+        $this->assertCount(1, $breadcrumbs);
+        $this->assertSame($expectedLevel, $breadcrumbs[0]->getLevel());
+    }
+
+    /**
+     * @param array<string, mixed> $record
+     *
+     * @return Breadcrumb[]
+     */
+    private function handleRecord(array $record) : array
+    {
+        $this->handler->handle($record);
+
+        if (method_exists(Event::class, 'createEvent')) {
+            // Sentry 3
+            $event = Event::createEvent();
+            $this->scope->applyToEvent($event);
+        } else {
+            // Sentry 2
+            $event = new Event();
+            $this->scope->applyToEvent($event, []);
+        }
+
+        return $event->getBreadcrumbs();
+    }
+
     protected function tearDown() : void
     {
         Mockery::close();