Merge branch 'ACP2E-1973' of https://github.com/magento-l3/magento2ce into PR-07032023

Author: chittima

app/etc/di.xml

@@ -1820,11 +1820,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Cache\LockGuardedCacheLoader">
-        <arguments>
-            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Database</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Cache\CompositeStaleCacheNotifier">
         <arguments>
             <argument name="notifiers" xsi:type="array">

dev/tests/integration/testsuite/Magento/Framework/Cache/LockGuardedCacheLoaderTest.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Cache;
+
+use Magento\Framework\Lock\Backend\Database;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class LockGuardedCacheLoaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private ObjectManagerInterface $om;
+
+    /**
+     * @var LockGuardedCacheLoader|null
+     */
+    private ?LockGuardedCacheLoader $lockGuardedCacheLoader;
+
+    /**
+     * @param string|null $name
+     * @param array $data
+     * @param $dataName
+     */
+    public function __construct(?string $name = null, array $data = [], $dataName = '')
+    {
+        $this->om = Bootstrap::getObjectManager();
+
+        parent::__construct($name, $data, $dataName);
+    }
+
+    protected function setUp(): void
+    {
+        $this->lockGuardedCacheLoader = $this->om
+            ->create(
+                LockGuardedCacheLoader::class,
+                [
+                    'locker' => $this->om->get(Database::class)
+                ]
+            );
+    }
+
+    /**
+     * @dataProvider dataProviderLockGuardedCacheLoader
+     *
+     * @param $lockName
+     * @param $dataLoader
+     * @param $dataCollector
+     * @param $dataSaver
+     * @param $expected
+     * @return void
+     */
+    public function testLockedLoadData(
+        $lockName,
+        $dataLoader,
+        $dataCollector,
+        $dataSaver,
+        $expected
+    ) {
+        $result = $this->lockGuardedCacheLoader->lockedLoadData(
+            $lockName,
+            $dataLoader,
+            $dataCollector,
+            $dataSaver
+        );
+
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function dataProviderLockGuardedCacheLoader(): array
+    {
+        return [
+            'Data loader read' => [
+                'lockName',
+                function () {
+                    return ['data1', 'data2'];
+                },
+                function () {
+                    return ['data3', 'data4'];
+                },
+                function () {
+                    return new \stdClass();
+                },
+                ['data1', 'data2'],
+            ],
+            'Data collector read' => [
+                'lockName',
+                function () {
+                    return false;
+                },
+                function () {
+                    return ['data3', 'data4'];
+                },
+                function () {
+                    return new \stdClass();
+                },
+                ['data3', 'data4'],
+            ],
+        ];
+    }
+}