chore(upgrade): Monolog

CHANGELOG.md

@@ -4,7 +4,17 @@ CHANGELOG
 master
 ------
 
+* todo...
+
+v3.0.0
+------
+
 * Bump PHP version from ^8.0 to ^8.1 and configure CI with 8.1 and 8.2
+* Bump Monolog version from ^1.24 || ~2.0 to ^3.6.0
+* Bump symfony/(config|console|dependency-injection|form|http-kernel|options-resolver|translation|validator) from ^4.4 || ^5.3 || ^6.0 to ^5.5 || ^6.4 || ^7.0
+* Adapt `Monolog/Processor/GdprProcessor` to the new `Monolog\Processor\ProcessorInterface`
+* Improve `Monolog/Processor/GdprProcessor` type hinting
+* Update `Tests/Monolog/Processor/GdprProcessorTest.php`
 
 v2.0.0
 ------

Command/EncryptCommand.php

@@ -29,7 +29,7 @@
 final class EncryptCommand extends Command
 {
     /**
-     * {@inheritdoc}
+     * @var string
      */
     protected static $defaultName = 'ekino-data-protection:encrypt';
 

Monolog/Processor/GdprProcessor.php

@@ -14,39 +14,25 @@
 namespace Ekino\DataProtectionBundle\Monolog\Processor;
 
 use Ekino\DataProtectionBundle\Encryptor\EncryptorInterface;
+use Monolog\LogRecord;
 use Monolog\Processor\ProcessorInterface;
 
 /**
  * Pseudonymize sensitive data inside log contexts.
  *
  * @author Rémi Marseille <[email protected]>
  * @author Benoit Mazière <[email protected]>
+ * @author Rolland Csatari <[email protected]>
  */
 class GdprProcessor implements ProcessorInterface
 {
-    /**
-     * @var EncryptorInterface
-     */
-    private $encryptor;
-
-    /**
-     * GdprProcessor constructor.
-     *
-     * @param EncryptorInterface $encryptor
-     */
-    public function __construct(EncryptorInterface $encryptor)
+    public function __construct(private EncryptorInterface $encryptor)
     {
-        $this->encryptor = $encryptor;
     }
 
-    /**
-     * @param array<array-key,array> $record
-     *
-     * @return array<array-key,array>
-     */
-    public function __invoke(array $record)
+    public function __invoke(LogRecord $record): LogRecord
     {
-        foreach ($record['context'] as $key => &$val) {
+        foreach ($record->context as $key => &$val) {
             if (preg_match('#^private_#', (string) $key)) {
                 $encoded = json_encode($val);
                 if (false === $encoded) {

Tests/Monolog/Processor/GdprProcessorTest.php

@@ -15,13 +15,16 @@
 
 use Ekino\DataProtectionBundle\Encryptor\EncryptorInterface;
 use Ekino\DataProtectionBundle\Monolog\Processor\GdprProcessor;
+use Monolog\Level;
+use Monolog\LogRecord;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class GdprProcessorTest.
  *
  * @author Rémi Marseille <[email protected]>
  * @author Benoit Mazière <[email protected]>
+ * @author Rolland Csatari <[email protected]>
  */
 class GdprProcessorTest extends TestCase
 {
@@ -33,20 +36,24 @@ public function testProcessor(): void
         $encryptor = $this->createMock(EncryptorInterface::class);
         $encryptor->expects($this->once())->method('encrypt')->willReturn('encrypted_data');
 
-        $processor = new GdprProcessor($encryptor);
-
-        $this->assertSame(['context' => [
-            0              => 'numeric index',
-            'foo'          => 'bar',
-            'private_data' => 'encrypted_data',
-        ]], $processor->__invoke([
-            'context' => [
+        $record = new LogRecord(
+            new \DateTimeImmutable(),
+            'main',
+            Level::Debug,
+            'The log context includes private data.',
+            [
                 0              => 'numeric index',
                 'foo'          => 'bar',
                 'private_data' => [
                     'foo' => 'baz',
                 ],
             ],
-        ]));
+        );
+
+        $this->assertSame([
+            0              => 'numeric index',
+            'foo'          => 'bar',
+            'private_data' => 'encrypted_data',
+        ], ((new GdprProcessor($encryptor))($record))->context);
     }
 }

composer.json

@@ -16,15 +16,15 @@
         "php":                          "^8.1",
         "ext-json":                     "*",
         "ext-openssl":                  "*",
-        "monolog/monolog":              "^1.24 || ~2.0",
-        "symfony/config":               "^4.4 || ^5.3 || ^6.0",
-        "symfony/console":              "^4.4 || ^5.3 || ^6.0",
-        "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
-        "symfony/form":                 "^4.4 || ^5.3 || ^6.0",
-        "symfony/http-kernel":          "^4.4 || ^5.3 || ^6.0",
-        "symfony/options-resolver":     "^4.4 || ^5.3 || ^6.0",
-        "symfony/translation":          "^4.4 || ^5.3 || ^6.0",
-        "symfony/validator":            "^4.4 || ^5.3 || ^6.0"
+        "monolog/monolog":              "^3.6.0",
+        "symfony/config":               "^5.5 || ^6.4 || ^7.0",
+        "symfony/console":              "^5.5 || ^6.4 || ^7.0",
+        "symfony/dependency-injection": "^5.5 || ^6.4 || ^7.0",
+        "symfony/form":                 "^5.5 || ^6.4 || ^7.0",
+        "symfony/http-kernel":          "^5.5 || ^6.4 || ^7.0",
+        "symfony/options-resolver":     "^5.5 || ^6.4 || ^7.0",
+        "symfony/translation":          "^5.5 || ^6.4 || ^7.0",
+        "symfony/validator":            "^5.5 || ^6.4 || ^7.0"
     },
     "require-dev": {
         "dg/bypass-finals":               "^1.4",