MAGETWO-54940: Stabilization and preparation for demo

Author: Oleksandr Iegorov

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

@@ -176,7 +176,7 @@ private function getFilesystem()
     private function getLogger()
     {
         if (!$this->logger) {
-            $this->logger = $this->objectManager->create(LoggerInterface::class);
+            $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,10 @@ public function testLaunchWrongPath()
 
     public function testCatchExceptionDeveloperMode()
     {
+        $this->objectManager->expects($this->once())
+            ->method('get')
+            ->with('Psr\Log\LoggerInterface')
+            ->willReturn($this->logger);
         $bootstrap = $this->getMockBuilder(Bootstrap::class)->disableOriginalConstructor()->getMock();
         $bootstrap->expects($this->once())->method('isDeveloperMode')->willReturn(true);
         $exception = new \Exception('Error: nothing works');