Merge pull request #10 from magento-tango/MAGETWO-54934-1

Magetwo 54934 1

Author: victorgugo

lib/internal/Magento/Framework/App/StaticResource.php

@@ -8,6 +8,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 use Magento\Framework\Filesystem;
+use Psr\Log\LoggerInterface;
 
 /**
  * Entry point for retrieving static resources like JS, CSS, images by requested public path
@@ -43,6 +44,9 @@ class StaticResource implements \Magento\Framework\AppInterface
     /** @var Filesystem */
     private $filesystem;
 
+    /** @var LoggerInterface */
+    private $logger;
+
     /**
      * @param State $state
      * @param Response\FileInterface $response
@@ -105,6 +109,7 @@ public function launch()
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
+        $this->getLogger()->critical($exception->getMessage());
         if ($bootstrap->isDeveloperMode()) {
             $this->response->setHttpResponseCode(404);
             $this->response->setHeader('Content-Type', 'text/plain');
@@ -161,4 +166,19 @@ private function getFilesystem()
         }
         return $this->filesystem;
     }
+
+    /**
+     * Retrieves LoggerInterface instance
+     *
+     * @return LoggerInterface
+     * @deprecated
+     */
+    private function getLogger()
+    {
+        if (!$this->logger) {
+            $this->logger = $this->objectManager->get(LoggerInterface::class);
+        }
+
+        return $this->logger;
+    }
 }

lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php

@@ -58,6 +58,11 @@ class StaticResourceTest extends \PHPUnit_Framework_TestCase
      */
     private $object;
 
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $logger;
+
     protected function setUp()
     {
         $this->state = $this->getMock('Magento\Framework\App\State', [], [], '', false);
@@ -67,6 +72,7 @@ protected function setUp()
         $this->assetRepo = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
         $this->moduleList = $this->getMock('Magento\Framework\Module\ModuleList', [], [], '', false);
         $this->objectManager = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface');
+        $this->logger = $this->getMockForAbstractClass('Psr\Log\LoggerInterface');
         $this->configLoader = $this->getMock(
             'Magento\Framework\App\ObjectManager\ConfigLoader', [], [], '', false
         );
@@ -193,6 +199,12 @@ public function testLaunchWrongPath()
 
     public function testCatchExceptionDeveloperMode()
     {
+        $this->objectManager->expects($this->once())
+            ->method('get')
+            ->with('Psr\Log\LoggerInterface')
+            ->willReturn($this->logger);
+        $this->logger->expects($this->once())
+            ->method('critical');
         $bootstrap = $this->getMockBuilder(Bootstrap::class)->disableOriginalConstructor()->getMock();
         $bootstrap->expects($this->once())->method('isDeveloperMode')->willReturn(true);
         $exception = new \Exception('Error: nothing works');