CE-32868: Fixed tests

Author: andrewbess

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

@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\TestFramework\ErrorLog;
 
+use Magento\Framework\Logger\Monolog;
 use Monolog\Handler\HandlerInterface;
 
-class Logger extends \Magento\Framework\Logger\Monolog
+class Logger extends Monolog
 {
     /**
      * @var array
@@ -16,49 +19,58 @@ class Logger extends \Magento\Framework\Logger\Monolog
 
     /**
      * Minimum error level to log message
-     * Possible values: -1 ignore all errors, and level constants form http://tools.ietf.org/html/rfc5424 standard
+     * Possible values: -1 ignore all errors,
+     * and level constants form http://tools.ietf.org/html/rfc5424 standard
      *
      * @var int
      */
     protected $minimumErrorLevel;
 
     /**
-     * @param string             $name       The logging channel
-     * @param HandlerInterface[] $handlers   Optional stack of handlers, the first one in the array is called first, etc
-     * @param callable[]         $processors Optional array of processors
+     * @param string $name The logging channel
+     * @param HandlerInterface[] $handlers Optional stack of handlers, the first one in the array is called first, etc
+     * @param callable[] $processors Optional array of processors
      */
-    public function __construct($name, array $handlers = [], array $processors = [])
-    {
-        $this->minimumErrorLevel = defined('TESTS_ERROR_LOG_LISTENER_LEVEL') ? TESTS_ERROR_LOG_LISTENER_LEVEL : -1;
+    public function __construct(
+        string $name,
+        array $handlers = [],
+        array $processors = []
+    ) {
+        $this->minimumErrorLevel = defined('TESTS_ERROR_LOG_LISTENER_LEVEL')
+            ? TESTS_ERROR_LOG_LISTENER_LEVEL
+            : -1;
         parent::__construct($name, $handlers, $processors);
     }
 
     /**
      * @return void
      */
-    public function clearMessages()
+    public function clearMessages(): void
     {
         $this->messages = [];
     }
 
     /**
      * @return array
      */
-    public function getMessages()
+    public function getMessages(): array
     {
         return $this->messages;
     }
 
     /**
-     * @{inheritDoc}
+     * @inheritdoc
      *
-     * @param  integer $level   The logging level
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
+     * @param int $level The logging level
+     * @param string $message The log message
+     * @param array $context The log context
+     * @return bool Whether the record has been processed
      */
-    public function addRecord($level, $message, array $context = [])
-    {
+    public function addRecord(
+        int $level,
+        string $message,
+        array $context = []
+    ): bool {
         if ($level <= $this->minimumErrorLevel) {
             $this->messages[] = [
                 'level' => $this->getLevelName($level),

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

@@ -61,11 +61,4 @@ public function testSanitizeParentLevelFolder()
             $this->sanitizeMethod->invokeArgs($this->model, ['../../../var/hack/custom.log'])
         );
     }
-
-    public function testSanitizeFileException()
-    {
-        $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessage('Filename expected to be a string');
-        $this->sanitizeMethod->invokeArgs($this->model, [['filename' => 'notValid']]);
-    }
 }

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

@@ -7,8 +7,10 @@
 
 namespace Magento\Framework\Logger\Test\Unit\Handler;
 
+use DateTime;
+use Exception;
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\Framework\Logger\Handler\Exception;
+use Magento\Framework\Logger\Handler\Exception as ExceptionHandler;
 use Magento\Framework\Logger\Handler\System;
 use Monolog\Logger;
 use PHPUnit\Framework\MockObject\MockObject as Mock;
@@ -27,20 +29,22 @@ class SystemTest extends TestCase
     private $filesystemMock;
 
     /**
-     * @var Exception|Mock
+     * @var ExceptionHandler|Mock
      */
     private $exceptionHandlerMock;
 
     /**
      * @inheritdoc
+     *
+     * @throws Exception
      */
     protected function setUp(): void
     {
         $this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
             ->getMockForAbstractClass();
-        $this->exceptionHandlerMock = $this->getMockBuilder(Exception::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->exceptionHandlerMock = $this->getMockBuilder(
+            ExceptionHandler::class
+        )->disableOriginalConstructor()->getMock();
 
         $this->model = new System(
             $this->filesystemMock,
@@ -62,7 +66,7 @@ public function testWrite()
     public function testWriteException()
     {
         $record = $this->getRecord();
-        $record['context']['exception'] = new \Exception('Some exception');
+        $record['context']['exception'] = new Exception('Some exception');
 
         $this->exceptionHandlerMock->expects($this->once())
             ->method('handle')
@@ -79,15 +83,21 @@ public function testWriteException()
      * @param array $context
      * @return array
      */
-    private function getRecord($level = Logger::WARNING, $message = 'test', $context = [])
-    {
+    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))),
+            'datetime' => DateTime::createFromFormat(
+                'U.u',
+                sprintf('%.6F', microtime(true))
+            ),
             'extra' => [],
         ];
     }

lib/internal/Magento/Framework/Logger/Test/Unit/MonologTest.php

@@ -7,8 +7,10 @@
 
 namespace Magento\Framework\Logger\Test\Unit;
 
+use Exception;
 use Magento\Framework\Logger\Monolog;
 use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 
 class MonologTest extends TestCase
@@ -20,23 +22,9 @@ public function testAddRecord()
 
         $logger->pushHandler($handler);
 
-        $logger->addError('test');
+        $logger->addRecord(Logger::ERROR, 'test');
         list($record) = $handler->getRecords();
 
         $this->assertSame('test', $record['message']);
     }
-
-    public function testAddRecordAsException()
-    {
-        $logger = new Monolog(__METHOD__);
-        $handler = new TestHandler();
-
-        $logger->pushHandler($handler);
-
-        $logger->addError(new \Exception('Some exception'));
-        list($record) = $handler->getRecords();
-
-        $this->assertInstanceOf(\Exception::class, $record['context']['exception']);
-        $this->assertSame('Some exception', $record['message']);
-    }
 }