AC-12022::Upgrade monolog/monolog system dependency to the latest major version

Author: glo71317

app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php

@@ -5,14 +5,17 @@
  */
 namespace Magento\Developer\Test\Unit\Model\Logger\Handler;
 
+use Magento\Config\Setup\ConfigOptionsList;
 use Magento\Developer\Model\Logger\Handler\Debug;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Monolog\Formatter\FormatterInterface;
+use Monolog\Level;
 use Monolog\Logger;
+use Monolog\LogRecord;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -51,6 +54,11 @@ class DebugTest extends TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @var LogRecord
+     */
+    private $logRecord;
+
     /**
      * @inheritdoc
      */
@@ -81,6 +89,16 @@ protected function setUp(): void
             'deploymentConfig' => $this->deploymentConfigMock
         ]);
         $this->model->setFormatter($this->formatterMock);
+
+        $this->logRecord = new LogRecord(
+            new \DateTimeImmutable(),
+            'testChannel',
+            Level::Debug,
+            'testMessage',
+            $context = [],
+            $extra = [],
+            $formatted = false
+        );
     }
 
     /**
@@ -99,7 +117,7 @@ public function testHandleEnabledInDeveloperMode()
             ->expects($this->never())
             ->method('getValue');
 
-        $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
+        $this->assertTrue($this->model->isHandling($this->logRecord));
     }
 
     /**
@@ -118,7 +136,7 @@ public function testHandleEnabledInDefaultMode()
             ->expects($this->never())
             ->method('getValue');
 
-        $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
+        $this->assertTrue($this->model->isHandling($this->logRecord));
     }
 
     /**
@@ -137,7 +155,7 @@ public function testHandleDisabledByProduction()
             ->expects($this->never())
             ->method('getValue');
 
-        $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
+        $this->assertFalse($this->model->isHandling($this->logRecord));
     }
 
     /**
@@ -148,15 +166,22 @@ public function testHandleDisabledByLevel()
         $this->deploymentConfigMock->expects($this->once())
             ->method('isAvailable')
             ->willReturn(true);
-        $this->stateMock
-            ->expects($this->never())
-            ->method('getMode')
-            ->willReturn(State::MODE_DEVELOPER);
-        $this->scopeConfigMock
-            ->expects($this->never())
-            ->method('getValue');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING)
+            ->willReturn(false);
 
-        $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::API]));
+        $this->assertFalse($this->model->isHandling(
+            new LogRecord(
+                new \DateTimeImmutable(),
+                'testChannel',
+                Level::Error,
+                'testMessage',
+                $context = [],
+                $extra = [],
+                $formatted = false
+            )
+        ));
     }
 
     /**
@@ -174,6 +199,6 @@ public function testDeploymentConfigIsNotAvailable()
             ->expects($this->never())
             ->method('getValue');
 
-        $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
+        $this->assertTrue($this->model->isHandling($this->logRecord));
     }
 }

app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php

@@ -12,6 +12,8 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Logger\Monolog;
+use Monolog\Handler\AbstractHandler;
+use Monolog\Level;
 use Monolog\LogRecord;
 use PHPUnit\Framework\MockObject\MockObject as Mock;
 use PHPUnit\Framework\TestCase;
@@ -37,18 +39,27 @@ class SyslogTest extends TestCase
     private $deploymentConfigMock;
 
     /**
-     * @var LogRecord|Mock
+     * @var LogRecord
      */
-    private $logRecordMock;
+    private $logRecord;
 
+    /**
+     * @var AbstractHandler|Mock
+     */
+    private $abstractHandlerMock;
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
-        $this->logRecordMock = $this->createMock(LogRecord::class);
+        $this->logRecord = new LogRecord(
+            new \DateTimeImmutable(),
+            'testChannel',
+            Level::Debug,
+            'testMessage'
+        );
 
         $this->model = new Syslog(
             $this->deploymentConfigMock,
@@ -61,10 +72,6 @@ protected function setUp(): void
      */
     public function testIsHandling(): void
     {
-//        $record = [
-//            'level' => Monolog::DEBUG,
-//        ];
-
         $this->scopeConfigMock
             ->expects($this->never())
             ->method('getValue');
@@ -79,7 +86,7 @@ public function testIsHandling(): void
             ->willReturn(1);
 
         $this->assertTrue(
-            $this->model->isHandling($this->logRecordMock)
+            $this->model->isHandling($this->logRecord)
         );
     }
 
@@ -88,10 +95,6 @@ public function testIsHandling(): void
      */
     public function testIsHandlingNotInstalled(): void
     {
-//        $record = [
-//            'level' => Monolog::DEBUG,
-//        ];
-
         $this->scopeConfigMock
             ->expects($this->never())
             ->method('getValue');
@@ -101,7 +104,7 @@ public function testIsHandlingNotInstalled(): void
             ->willReturn(false);
 
         $this->assertFalse(
-            $this->model->isHandling($this->logRecordMock)
+            $this->model->isHandling($this->logRecord)
         );
     }
 
@@ -110,10 +113,6 @@ public function testIsHandlingNotInstalled(): void
      */
     public function testIsHandlingDisabled(): void
     {
-//        $record = [
-//            'level' => Monolog::DEBUG,
-//        ];
-
         $this->scopeConfigMock
             ->expects($this->never())
             ->method('getValue');
@@ -128,7 +127,7 @@ public function testIsHandlingDisabled(): void
             ->willReturn(0);
 
         $this->assertFalse(
-            $this->model->isHandling($this->logRecordMock)
+            $this->model->isHandling($this->logRecord)
         );
     }
 }

lib/internal/Magento/Framework/Logger/Test/Unit/Handler/SystemTest.php

@@ -12,7 +12,9 @@
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Logger\Handler\Exception as ExceptionHandler;
 use Magento\Framework\Logger\Handler\System;
+use Monolog\Level;
 use Monolog\Logger;
+use Monolog\LogRecord;
 use PHPUnit\Framework\MockObject\MockObject as Mock;
 use PHPUnit\Framework\TestCase;
 
@@ -54,51 +56,47 @@ protected function setUp(): void
 
     public function testWrite()
     {
+        $record = $this->getRecord(Level::Warning, 'Test message', []);
         $this->filesystemMock->expects($this->once())
             ->method('getParentDirectory');
         $this->filesystemMock->expects($this->once())
             ->method('isDirectory')
             ->willReturn('true');
-
-        $this->model->write($this->getRecord());
+        $this->exceptionHandlerMock->expects($this->never())->method('handle');
+        $this->model->write($record);
     }
 
     public function testWriteException()
     {
-        $record = $this->getRecord();
-        $record['context']['exception'] = new Exception('Some exception');
-
-        $this->exceptionHandlerMock->expects($this->once())
-            ->method('handle')
-            ->with($record);
+        $exception = new \Exception('Test exception');
+        $record = $this->getRecord(Level::Error, 'Error message', ['exception' => $exception]);
+        // Expect the exception handler to be called once with the record
+        $this->exceptionHandlerMock->expects($this->once())->method('handle')->with($this->equalTo($record));
         $this->filesystemMock->expects($this->never())
             ->method('getParentDirectory');
-
         $this->model->write($record);
     }
 
     /**
-     * @param int $level
+     * @param Level $level
      * @param string $message
-     * @param array $context
-     * @return array
+     * @param array $exception
+     * @return LogRecord
      */
     private function getRecord(
-        int $level = Logger::WARNING,
-        string $message = 'test',
-        array $context = []
-    ): array {
-        return [
-            'message' => $message,
-            'context' => $context,
-            'level' => $level,
-            'level_name' => Logger::getLevelName($level),
-            'channel' => 'test',
-            'datetime' => DateTime::createFromFormat(
-                'U.u',
-                sprintf('%.6F', microtime(true))
-            ),
-            'extra' => [],
-        ];
+        Level $level,
+        string $message,
+        $exception
+    ): LogRecord {
+        return new LogRecord(
+            new \DateTimeImmutable(),
+            'test',
+            $level,
+            $message,
+            $exception,
+            [],
+            [],
+            $message
+        );
     }
 }