MAGETWO-99401: order-related save_after_commit callbacks are not called for guest checkouts

Author: dhorytskyi

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

@@ -69,7 +69,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/Interception/Config/Config.php

@@ -202,9 +202,7 @@ private function initializeUncompiled($classDefinitions = [])
     private function generateIntercepted($classDefinitions)
     {
         $config = [];
-        $scopes = $this->_scopeList->getAllScopes();
-        array_unshift($scopes, 'primary');
-        foreach (array_unique($scopes) as $scope) {
+        foreach ($this->_scopeList->getAllScopes() as $scope) {
             $config = array_replace_recursive($config, $this->_reader->read($scope));
         }
         unset($config['preferences']);

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

@@ -20,6 +20,9 @@ class ExecuteCommitCallbacks
      */
     private $logger;
 
+    /**
+     * @param LoggerInterface $logger
+     */
     public function __construct(LoggerInterface $logger)
     {
         $this->logger = $logger;
@@ -31,12 +34,11 @@ public function __construct(LoggerInterface $logger)
      * @param AdapterInterface $subject
      * @param AdapterInterface $result
      * @return AdapterInterface
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterCommit(AdapterInterface $subject, AdapterInterface $result): AdapterInterface
     {
         if ($result->getTransactionLevel() === 0) {
-            $callbacks = CallbackPool::get(spl_object_hash($result));
+            $callbacks = CallbackPool::get(spl_object_hash($subject));
             foreach ($callbacks as $callback) {
                 try {
                     call_user_func($callback);
@@ -48,4 +50,18 @@ public function afterCommit(AdapterInterface $subject, AdapterInterface $result)
 
         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;
+    }
 }

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

@@ -87,7 +87,19 @@ public function addCommitCallback($callback)
     public function commit()
     {
         $this->getConnection()->commit();
-
+        /**
+         * Process after commit callbacks
+         */
+        if ($this->getConnection()->getTransactionLevel() === 0) {
+            $callbacks = CallbackPool::get(spl_object_hash($this->getConnection()));
+            try {
+                foreach ($callbacks as $callback) {
+                    call_user_func($callback);
+                }
+            } catch (\Exception $e) {
+                $this->getLogger()->critical($e);
+            }
+        }
         return $this;
     }