Replace Zend_Log with Psr\Log\LoggerInterface

Author: tdgroot

lib/internal/Magento/Framework/Shell.php

@@ -15,7 +15,7 @@ class Shell implements ShellInterface
     /**
      * Logger instance
      *
-     * @var \Zend_Log
+     * @var \Psr\Log\LoggerInterface
      */
     protected $logger;
 
@@ -26,11 +26,11 @@ class Shell implements ShellInterface
 
     /**
      * @param CommandRendererInterface $commandRenderer
-     * @param \Zend_Log $logger Logger instance to be used to log commands and their output
+     * @param \Psr\Log\LoggerInterface $logger Logger instance to be used to log commands and their output
      */
     public function __construct(
         CommandRendererInterface $commandRenderer,
-        \Zend_Log $logger = null
+        \Psr\Log\LoggerInterface $logger = null
     ) {
         $this->logger = $logger;
         $this->commandRenderer = $commandRenderer;
@@ -76,7 +76,7 @@ public function execute($command, array $arguments = [])
     protected function log($message)
     {
         if ($this->logger) {
-            $this->logger->log($message, \Zend_Log::INFO);
+            $this->logger->info($message);
         }
     }
 }

lib/internal/Magento/Framework/Test/Unit/ShellTest.php

@@ -16,14 +16,13 @@ class ShellTest extends \PHPUnit_Framework_TestCase
     protected $commandRenderer;
 
     /**
-     * @var \Zend_Log|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $logger;
 
     protected function setUp()
     {
-        $this->logger = $this->getMockBuilder(\Zend_Log::class)
-            ->setMethods(['log'])
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->commandRenderer = new \Magento\Framework\Shell\CommandRenderer();
@@ -72,8 +71,8 @@ public function testExecuteLog($command, $commandArgs, $expectedResult, $expecte
         foreach ($expectedLogRecords as $logRecordIndex => $expectedLogMessage) {
             $expectedLogMessage = str_replace('`', $quoteChar, $expectedLogMessage);
             $this->logger->expects($this->at($logRecordIndex))
-                ->method('log')
-                ->with($expectedLogMessage, \Zend_Log::INFO);
+                ->method('info')
+                ->with($expectedLogMessage);
         }
         $this->_testExecuteCommand(
             new \Magento\Framework\Shell($this->commandRenderer, $this->logger),