Merge pull request #49 from WyriHaximus/renovate/monolog-monolog-3.x

Update dependency monolog/monolog to v3
WyriHaximus · Aug 2, 2023 · c46766f · c46766f
2 parents 136e088 + 4cd123a
commit c46766f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 54 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Cees-Jan Kiewiet
+Copyright (c) 2023 Cees-Jan Kiewiet
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 To install via [Composer](http://getcomposer.org/), use the command below, it will automatically detect the latest version and bind it with `^`.
 
 ```
-composer require wyrihaximus/monolog-formatted-psr-handler 
+composer require wyrihaximus/monolog-formatted-psr-handler
 ```
 
 ## Difference with Monolog's PsrHandler ##
@@ -34,7 +34,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ## License ##
 
-Copyright 2017 [Cees-Jan Kiewiet](http://wyrihaximus.net/)
+Copyright 2023 [Cees-Jan Kiewiet](http://wyrihaximus.net/)
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "monolog/monolog": "^2.9.1",
+        "monolog/monolog": "^3.4.0",
         "psr/log": "^2",
         "thecodingmachine/safe": "^2.5",
         "wyrihaximus/psr-3-utilities": "^2.1"

diff --git a/composer.lock b/composer.lock
diff --git a/src/FormattedPsrHandler.php b/src/FormattedPsrHandler.php
@@ -5,7 +5,8 @@
 namespace WyriHaximus\Monolog\FormattedPsrHandler;
 
 use Monolog\Handler\AbstractProcessingHandler;
-use Monolog\Logger;
+use Monolog\Level;
+use Monolog\LogRecord;
 use Psr\Log\LoggerInterface;
 
 use function strtolower;
@@ -14,16 +15,13 @@
 final class FormattedPsrHandler extends AbstractProcessingHandler
 {
     /** @phpstan-ignore-next-line */
-    public function __construct(protected LoggerInterface $logger, int|string $level = Logger::DEBUG, bool $bubble = true)
+    public function __construct(protected LoggerInterface $logger, int|string|Level $level = Level::Debug, bool $bubble = true)
     {
         /** @psalm-suppress ArgumentTypeCoercion */
         parent::__construct($level, $bubble);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
+    protected function write(LogRecord $record): void
     {
         /** @psalm-suppress InvalidArgument */
         if (! $this->isHandling($record)) {
@@ -34,9 +32,9 @@ protected function write(array $record): void
         }
 
         $this->logger->log(
-            strtolower($record['level_name']),
-            formatValue($record['formatted'] ?? $record['message']),
-            $record['context'],
+            strtolower($record->level->name),
+            formatValue($record->formatted ?? $record->message),
+            $record->context,
         );
     }
 }
diff --git a/tests/FormattedPsrHandlerTest.php b/tests/FormattedPsrHandlerTest.php
@@ -5,7 +5,8 @@
 namespace WyriHaximus\Tests\Monolog\FormattedPsrHandler;
 
 use DateTimeInterface;
-use Monolog\Logger;
+use Monolog\Level;
+use Monolog\LogRecord;
 use Prophecy\Argument;
 use Psr\Log\LoggerInterface;
 use Safe\DateTimeImmutable;
@@ -19,15 +20,14 @@ final class FormattedPsrHandlerTest extends TestCase
     public function formatted(): void
     {
         $now     = new DateTimeImmutable('now');
-        $record  = [
-            'channel' => 'formatted-psr-handler',
-            'datetime' => $now,
-            'level' => Logger::DEBUG,
-            'level_name' => 'DEBUG',
-            'message' => 'message',
-            'context' => [],
-            'extra' => [],
-        ];
+        $record  = new LogRecord(
+            channel: 'formatted-psr-handler',
+            datetime: $now,
+            level: Level::Debug,
+            message: 'message',
+            context: [],
+            extra: [],
+        );
         $message = '[' . $now->format(DateTimeInterface::ATOM) . '] formatted-psr-handler.DEBUG: message [] []' . "\n";
         $logger  = $this->prophesize(LoggerInterface::class);
         $logger->log('debug', $message, [])->shouldBeCalled();
@@ -42,22 +42,21 @@ public function notHandled(): void
         $logger = $this->prophesize(LoggerInterface::class);
         $logger->log(Argument::type('string'), Argument::type('array'), Argument::type('array'))->shouldNotBeCalled();
 
-        $formattedLogger = new FormattedPsrHandler($logger->reveal(), Logger::EMERGENCY);
-        $formattedLogger->handle([
-            'channel' => 'formatted-psr-handler',
-            'datetime' => new DateTimeImmutable('now'),
-            'level' => Logger::DEBUG,
-            'level_name' => 'DEBUG',
-            'message' => 'message',
-            'context' => [],
-            'extra' => [],
-        ]);
+        $formattedLogger = new FormattedPsrHandler($logger->reveal(), Level::Emergency->value);
+        $formattedLogger->handle(new LogRecord(
+            channel: 'formatted-psr-handler',
+            datetime: new DateTimeImmutable('now'),
+            level: Level::Debug,
+            message: 'message',
+            context: [],
+            extra: [],
+        ));
     }
 
     /** @test */
     public function bubble(): void
     {
-        $formattedLogger = new FormattedPsrHandler($this->prophesize(LoggerInterface::class)->reveal(), Logger::EMERGENCY);
+        $formattedLogger = new FormattedPsrHandler($this->prophesize(LoggerInterface::class)->reveal(), Level::Emergency->value);
         self::assertTrue($formattedLogger->getBubble());
     }
 }