Merge pull request #7730 from magento-gl/AC-3556

AC-3556::Monolog 2.7.0 causing failures in WebAPI+Integration Tests

Author: sidolov

composer.json

@@ -66,7 +66,7 @@
         "magento/composer-dependency-version-audit-plugin": "~0.1",
         "magento/magento-composer-installer": ">=0.3.0",
         "magento/zendframework1": "~1.15.0",
-        "monolog/monolog": "^2.6",
+        "monolog/monolog": "^2.7",
         "pelago/emogrifier": "^6.0.0",
         "php-amqplib/php-amqplib": "~3.2.0",
         "phpseclib/mcrypt_compat": "~2.0.2",

composer.lock

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Logger\Monolog;
 use Monolog\Handler\HandlerInterface;
+use Monolog\DateTimeImmutable;
 
 class Logger extends Monolog
 {
@@ -43,6 +44,8 @@ public function __construct(
     }
 
     /**
+     * Clear messages
+     *
      * @return void
      */
     public function clearMessages(): void
@@ -51,6 +54,8 @@ public function clearMessages(): void
     }
 
     /**
+     * Get messages
+     *
      * @return array
      */
     public function getMessages(): array
@@ -64,19 +69,21 @@ public function getMessages(): array
      * @param int $level The logging level
      * @param string $message The log message
      * @param array $context The log context
+     * @param DateTimeImmutable $datetime Optional log date to log into the past or future
      * @return bool Whether the record has been processed
      */
     public function addRecord(
         int $level,
         string $message,
-        array $context = []
+        array $context = [],
+        DateTimeImmutable $datetime = null
     ): bool {
         if ($level <= $this->minimumErrorLevel) {
             $this->messages[] = [
                 'level' => $this->getLevelName($level),
                 'message' => $message,
             ];
         }
-        return parent::addRecord($level, $message, $context);
+        return parent::addRecord($level, $message, $context, $datetime);
     }
 }

dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php

@@ -37,7 +37,7 @@
         "laminas/laminas-validator": "^2.17.0",
         "magento/composer-dependency-version-audit-plugin": "~0.1",
         "magento/zendframework1": "~1.15.0",
-        "monolog/monolog": "^2.6",
+        "monolog/monolog": "^2.7",
         "ramsey/uuid": "~4.2.0",
         "symfony/console": "~4.4.0",
         "symfony/process": "~4.4.0",