2
0
Эх сурвалжийг харах

Restore rollbar test suite

Jordi Boggiano 1 жил өмнө
parent
commit
7b5a792204

+ 1 - 0
composer.json

@@ -31,6 +31,7 @@
         "phpstan/phpstan-strict-rules": "^1.4",
         "phpunit/phpunit": "^10.5.17",
         "predis/predis": "^1.1 || ^2",
+        "rollbar/rollbar": "^4.0",
         "ruflin/elastica": "^7 || ^8",
         "symfony/mailer": "^5.4 || ^6",
         "symfony/mime": "^5.4 || ^6"

+ 0 - 3
phpstan.neon.dist

@@ -20,9 +20,6 @@ parameters:
           paths:
             - src/Monolog/Formatter/LineFormatter.php
 
-        # can be removed when rollbar/rollbar can be added as dev require again (needs to allow monolog 3.x)
-        - '#Rollbar\\RollbarLogger#'
-
 includes:
     - phpstan-baseline.neon
     - phpstan-ignore-by-php-version.neon.php

+ 0 - 1
src/Monolog/Handler/RollbarHandler.php

@@ -99,7 +99,6 @@ class RollbarHandler extends AbstractProcessingHandler
             $toLog = $record->message;
         }
 
-        // @phpstan-ignore-next-line
         $this->rollbarLogger->log($context['level'], $toLog, $context);
 
         $this->hasRecords = true;

+ 2 - 8
tests/Monolog/Handler/RollbarHandlerTest.php

@@ -53,9 +53,10 @@ class RollbarHandlerTest extends TestCase
     {
         $handler = $this->createHandler();
 
-        $handler->handle($this->createExceptionRecord(Level::Debug));
+        $handler->handle($this->getRecord(Level::Debug, context: ['exception' => $e = new Exception()]));
 
         $this->assertEquals('debug', $this->reportedExceptionArguments['payload']['level']);
+        $this->assertSame($e, $this->reportedExceptionArguments['context']);
     }
 
     private function setupRollbarLoggerMock()
@@ -82,11 +83,4 @@ class RollbarHandlerTest extends TestCase
     {
         return new RollbarHandler($this->rollbarLogger, Level::Debug);
     }
-
-    private function createExceptionRecord($level = Level::Debug, $message = 'test', $exception = null): array
-    {
-        return $this->getRecord($level, $message, [
-            'exception' => $exception ?: new Exception(),
-        ]);
-    }
 }