Merge pull request #2 from magento-commerce/ACP2E-3837

ACP2E-3837: DMT 2.4.8.1 Release

Author: o-iegorov

composer.json

@@ -1,11 +1,11 @@
 {
     "name": "magento/data-migration-tool",
     "description": "Migration Tool",
-    "version": "2.4.8",
+    "version": "2.4.8.1",
     "require": {
         "symfony/console": "^6.4",
         "magento/framework": "*",
-        "monolog/monolog": "^2.3"
+        "monolog/monolog": "^3.6"
     },
     "require-dev": {
         "phpunit/phpunit": "~9.5.0"

src/Migration/Logger/ConsoleHandler.php

@@ -10,6 +10,7 @@
 use Monolog\Handler\HandlerInterface;
 use Monolog\Handler\AbstractHandler;
 use Psr\Log\LogLevel;
+use Monolog\LogRecord;
 
 /**
  * Processing logger handler creation for migration application
@@ -46,7 +47,7 @@ protected function colorize($string, $color)
     /**
      * @inheritdoc
      */
-    public function handle(array $record): bool
+    public function handle(LogRecord $record): bool
     {
         if (!$this->isHandling($record)) {
             return false;

src/Migration/Logger/FileHandler.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Handler\HandlerInterface;
+use Monolog\LogRecord;
 
 /**
  * Processing logger handler creation for migration application
@@ -59,7 +60,7 @@ public function __construct(File $file, Config $config, \Magento\Framework\Files
     /**
      * @inheritdoc
      */
-    public function handle(array $record): bool
+    public function handle(LogRecord $record): bool
     {
         if (!$this->isHandling($record)) {
             return false;

src/Migration/Logger/Logger.php

@@ -6,7 +6,8 @@
 
 namespace Migration\Logger;
 
-use Monolog\DateTimeImmutable;
+use Monolog\JsonSerializableDateTimeImmutable;
+use Monolog\Level;
 
 /**
  * Processing logger handler creation for migration application
@@ -33,10 +34,12 @@ public function __construct($name = 'Migration', array $handlers = [], array $pr
     /**
      * @inheritdoc
      */
-    public function addRecord(int $level, string $message, array $context = [], DateTimeImmutable $datetime = null): bool
+
+    public function addRecord(int|Level $level, string $message, array $context = [], JsonSerializableDateTimeImmutable|null $datetime = null): bool
     {
-        $processed = parent::addRecord($level, $message, $context);
-        self::$messages[$level][] = $message;
+        $levelValue = $level instanceof Level ? $level->value : $level;
+        $processed = parent::addRecord($levelValue, $message, $context);
+        self::$messages[$levelValue][] = $message;
         return $processed;
     }
 

src/Migration/Logger/MessageFormatter.php

@@ -5,6 +5,8 @@
  */
 namespace Migration\Logger;
 
+use Monolog\LogRecord;
+
 /**
  * Format logger messages corresponding to verbosity level
  */
@@ -13,12 +15,12 @@ class MessageFormatter extends \Monolog\Formatter\LineFormatter implements \Mono
     /**
      * @inheritdoc
      */
-    protected $format;
+    protected string $format;
 
     /**
      * @inheritdoc
      */
-    public function format(array $record): string
+    public function format(LogRecord $record): string
     {
         $this->format = $this->getLevelFormat($record['level_name']);
         return parent::format($record);

src/Migration/Logger/MessageProcessor.php

@@ -5,6 +5,8 @@
  */
 namespace Migration\Logger;
 
+use Monolog\LogRecord;
+
 /**
  * Logger messages processor
  */
@@ -23,10 +25,10 @@ class MessageProcessor
     /**
      * Set extra
      *
-     * @param array $record
+     * @param LogRecord $record
      * @return array
      */
-    public function setExtra(array $record)
+    public function setExtra(LogRecord $record)
     {
         foreach ($record['context'] as $key => $value) {
             switch ($key) {