Merge remote-tracking branch 'falcon/MAGETWO-60165' into MAGETWO-60931

Author: oshmyheliuk

app/code/Magento/Developer/Model/Logger/Handler/Debug.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Class Debug
@@ -25,32 +26,44 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
      */
     private $scopeConfig;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param DriverInterface $filesystem
      * @param State $state
      * @param ScopeConfigInterface $scopeConfig
+     * @param DeploymentConfig $deploymentConfig
      * @param string $filePath
      */
     public function __construct(
         DriverInterface $filesystem,
         State $state,
         ScopeConfigInterface $scopeConfig,
+        DeploymentConfig $deploymentConfig,
         $filePath = null
     ) {
         parent::__construct($filesystem, $filePath);
 
         $this->state = $state;
         $this->scopeConfig = $scopeConfig;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
      * {@inheritdoc}
      */
     public function isHandling(array $record)
     {
-        return
-            parent::isHandling($record)
-            && $this->state->getMode() !== State::MODE_PRODUCTION
-            && $this->scopeConfig->getValue('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE);
+        if ($this->deploymentConfig->isAvailable()) {
+            return
+                parent::isHandling($record)
+                && $this->state->getMode() !== State::MODE_PRODUCTION
+                && $this->scopeConfig->getValue('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE);
+        }
+
+        return parent::isHandling($record);
     }
-}
+}

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

@@ -13,9 +13,11 @@
 use Magento\Store\Model\ScopeInterface;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Logger;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Class DebugTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DebugTest extends \PHPUnit_Framework_TestCase
 {
@@ -44,6 +46,11 @@ class DebugTest extends \PHPUnit_Framework_TestCase
      */
     private $formatterMock;
 
+    /**
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
     protected function setUp()
     {
         $this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
@@ -55,6 +62,10 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->formatterMock = $this->getMockBuilder(FormatterInterface::class)
             ->getMockForAbstractClass();
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->getMock();
 
         $this->formatterMock->expects($this->any())
             ->method('format')
@@ -64,12 +75,16 @@ protected function setUp()
             'filesystem' => $this->filesystemMock,
             'state' => $this->stateMock,
             'scopeConfig' => $this->scopeConfigMock,
+            'deploymentConfig' => $this->deploymentConfigMock
         ]);
         $this->model->setFormatter($this->formatterMock);
     }
 
     public function testHandle()
     {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
         $this->stateMock->expects($this->once())
             ->method('getMode')
             ->willReturn(State::MODE_DEVELOPER);
@@ -78,22 +93,28 @@ public function testHandle()
             ->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
             ->willReturn(true);
 
-        $this->model->handle(['formatted' => false, 'level' => Logger::DEBUG]);
+        $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
     }
 
     public function testHandleDisabledByProduction()
     {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
         $this->stateMock->expects($this->once())
             ->method('getMode')
             ->willReturn(State::MODE_PRODUCTION);
         $this->scopeConfigMock->expects($this->never())
             ->method('getValue');
 
-        $this->model->handle(['formatted' => false, 'level' => Logger::DEBUG]);
+        $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
     }
 
     public function testHandleDisabledByConfig()
     {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
         $this->stateMock->expects($this->once())
             ->method('getMode')
             ->willReturn(State::MODE_DEVELOPER);
@@ -102,16 +123,32 @@ public function testHandleDisabledByConfig()
             ->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
             ->willReturn(false);
 
-        $this->model->handle(['formatted' => false, 'level' => Logger::DEBUG]);
+        $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
     }
 
     public function testHandleDisabledByLevel()
     {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
+        $this->stateMock->expects($this->never())
+            ->method('getMode');
+        $this->scopeConfigMock->expects($this->never())
+            ->method('getValue');
+
+        $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::API]));
+    }
+
+    public function testDeploymentConfigIsNotAvailable()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(false);
         $this->stateMock->expects($this->never())
             ->method('getMode');
         $this->scopeConfigMock->expects($this->never())
             ->method('getValue');
 
-        $this->model->handle(['formatted' => false, 'level' => Logger::API]);
+        $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
     }
 }