Merge remote-tracking branch 'tango/MAGETWO-99401' into pr_vk_2019_08_16

Author: vkolesny

app/etc/di.xml

@@ -1777,4 +1777,7 @@
                 type="Magento\Framework\Mail\MimeMessage" />
     <preference for="Magento\Framework\Mail\MimePartInterface"
                 type="Magento\Framework\Mail\MimePart" />
+    <type name="Magento\Framework\DB\Adapter\AdapterInterface">
+        <plugin name="execute_commit_callbacks" type="Magento\Framework\Model\ExecuteCommitCallbacks" />
+    </type>
 </config>

lib/internal/Magento/Framework/Config/Scope.php

@@ -5,15 +5,13 @@
  */
 namespace Magento\Framework\Config;
 
-class Scope implements \Magento\Framework\Config\ScopeInterface, \Magento\Framework\Config\ScopeListInterface
-{
-    /**
-     * Default application scope
-     *
-     * @var string
-     */
-    protected $_defaultScope;
+use Magento\Framework\App\AreaList;
 
+/**
+ * Scope config
+ */
+class Scope implements ScopeInterface, ScopeListInterface
+{
     /**
      * Current config scope
      *
@@ -24,19 +22,19 @@ class Scope implements \Magento\Framework\Config\ScopeInterface, \Magento\Framew
     /**
      * List of all available areas
      *
-     * @var \Magento\Framework\App\AreaList
+     * @var AreaList
      */
     protected $_areaList;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\App\AreaList $areaList
+     * @param AreaList $areaList
      * @param string $defaultScope
      */
-    public function __construct(\Magento\Framework\App\AreaList $areaList, $defaultScope = 'primary')
+    public function __construct(AreaList $areaList, $defaultScope = 'primary')
     {
-        $this->_defaultScope = $this->_currentScope = $defaultScope;
+        $this->_currentScope = $defaultScope;
         $this->_areaList = $areaList;
     }
 
@@ -69,7 +67,9 @@ public function setCurrentScope($scope)
     public function getAllScopes()
     {
         $codes = $this->_areaList->getCodes();
-        array_unshift($codes, $this->_defaultScope);
+        array_unshift($codes, 'global');
+        array_unshift($codes, 'primary');
+
         return $codes;
     }
 }

lib/internal/Magento/Framework/Config/Test/Unit/ScopeTest.php

@@ -6,23 +6,25 @@
 
 namespace Magento\Framework\Config\Test\Unit;
 
-use \Magento\Framework\Config\Scope;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\Config\Scope;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class ScopeTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Config\Scope
+     * @var Scope
      */
-    protected $model;
+    private $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\AreaList
+     * @var MockObject|AreaList
      */
-    protected $areaListMock;
+    private $areaListMock;
 
     protected function setUp()
     {
-        $this->areaListMock = $this->createPartialMock(\Magento\Framework\App\AreaList::class, ['getCodes']);
+        $this->areaListMock = $this->createPartialMock(AreaList::class, ['getCodes']);
         $this->model = new Scope($this->areaListMock);
     }
 
@@ -35,10 +37,10 @@ public function testScopeSetGet()
 
     public function testGetAllScopes()
     {
-        $expectedBalances = ['primary', 'test_scope'];
+        $expectedBalances = ['primary', 'global', 'test_scope'];
         $this->areaListMock->expects($this->once())
             ->method('getCodes')
-            ->will($this->returnValue(['test_scope']));
+            ->willReturn(['test_scope']);
         $this->assertEquals($expectedBalances, $this->model->getAllScopes());
     }
 }

lib/internal/Magento/Framework/Model/ExecuteCommitCallbacks.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Model;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Execute added callbacks for transaction commit.
+ */
+class ExecuteCommitCallbacks
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * Execute callbacks after commit.
+     *
+     * @param AdapterInterface $subject
+     * @param AdapterInterface $result
+     * @return AdapterInterface
+     */
+    public function afterCommit(AdapterInterface $subject, AdapterInterface $result): AdapterInterface
+    {
+        if ($result->getTransactionLevel() === 0) {
+            $callbacks = CallbackPool::get(spl_object_hash($subject));
+            foreach ($callbacks as $callback) {
+                try {
+                    call_user_func($callback);
+                } catch (\Throwable $e) {
+                    $this->logger->critical($e);
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Drop callbacks after rollBack.
+     *
+     * @param AdapterInterface $subject
+     * @param AdapterInterface $result
+     * @return AdapterInterface
+     */
+    public function afterRollBack(AdapterInterface $subject, AdapterInterface $result): AdapterInterface
+    {
+        CallbackPool::clear(spl_object_hash($subject));
+
+        return $result;
+    }
+}