Merge pull request #1539 from magento-plankton/MAGETWO-75452-develop

[Plankton] Bugs

Author: Alexander Akimov

lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php

@@ -23,6 +23,11 @@ abstract class AbstractResource
      */
     protected $serializer;
 
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $_logger;
+
     /**
      * Constructor
      */
@@ -92,7 +97,7 @@ public function commit()
                     call_user_func($callback);
                 }
             } catch (\Exception $e) {
-                $this->logger->critical($e);
+                $this->getLogger()->critical($e);
             }
         }
         return $this;
@@ -252,4 +257,18 @@ protected function getSerializer()
         }
         return $this->serializer;
     }
+
+    /**
+     * Get logger
+     *
+     * @return \Psr\Log\LoggerInterface
+     * @deprecated
+     */
+    private function getLogger()
+    {
+        if (null === $this->_logger) {
+            $this->_logger = ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
+        }
+        return $this->_logger;
+    }
 }

lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php

@@ -22,16 +22,19 @@ class AbstractResourceTest extends \PHPUnit\Framework\TestCase
      */
     private $serializerMock;
 
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
         $this->serializerMock = $this->createMock(Json::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
         $this->abstractResource = $objectManager->getObject(AbstractResourceStub::class);
-        $objectManager->setBackwardCompatibleProperty(
-            $this->abstractResource,
-            'serializer',
-            $this->serializerMock
-        );
+        $objectManager->setBackwardCompatibleProperty($this->abstractResource, 'serializer', $this->serializerMock);
+        $objectManager->setBackwardCompatibleProperty($this->abstractResource, '_logger', $this->loggerMock);
     }
 
     /**
@@ -201,9 +204,6 @@ function () use ($closureExpectation) {
         $this->abstractResource->commit();
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function testCommitZeroLevelCallbackException()
     {
         /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $connection */
@@ -221,6 +221,8 @@ function () {
         $connection->expects($this->once())
             ->method('getTransactionLevel')
             ->willReturn(0);
+        $this->loggerMock->expects($this->once())
+            ->method('critical');
 
         $this->abstractResource->commit();
     }