Merge branch 'ACP2E-3673' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-02-28-2025

Author: chittima

lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento\Framework\Cache;
 
 use Magento\Framework\App\ObjectManager;
@@ -66,17 +65,16 @@ class LockGuardedCacheLoader
      *
      * @var string
      */
-    private const CONFIG_NAME_ALLOW_PARALLEL_CACHE_GENERATION = 'allow_parallel_generation';
+    private const CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION = 'cache/allow_parallel_generation';
 
     /**
      * Config value of parallel generation.
      *
-     * @var bool
+     * @var bool|null
      */
-    private $allowParallelGenerationConfigValue;
+    private ?bool $allowParallelGenerationConfigValue;
 
     /**
-     * LockGuardedCacheLoader constructor.
      * @param LockManagerInterface $locker
      * @param int $lockTimeout
      * @param int $delayTimeout
@@ -119,11 +117,8 @@ public function lockedLoadData(
         $deadline = microtime(true) + $this->loadTimeout / 1000;
 
         if (empty($this->allowParallelGenerationConfigValue)) {
-            $cacheConfig = $this
-                ->deploymentConfig
-                ->getConfigData('cache');
-            $this->allowParallelGenerationConfigValue = $cacheConfig[self::CONFIG_NAME_ALLOW_PARALLEL_CACHE_GENERATION]
-                ?? false;
+            $this->allowParallelGenerationConfigValue = (bool) $this->deploymentConfig
+                ->get(self::CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION);
         }
 
         while ($cachedData === false) {
@@ -139,7 +134,7 @@ public function lockedLoadData(
                 } finally {
                     $this->locker->unlock($lockName);
                 }
-            } elseif ($this->allowParallelGenerationConfigValue === true) {
+            } elseif ($this->allowParallelGenerationConfigValue) {
                 return $dataCollector();
             }
 

lib/internal/Magento/Framework/Cache/Test/Unit/LockGuardedCacheLoaderTest.php

@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Framework\Cache\Test\Unit;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\Lock\LockManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -20,25 +20,27 @@ class LockGuardedCacheLoaderTest extends TestCase
      */
     private $lockManagerInterfaceMock;
 
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
     /**
      * @var LockGuardedCacheLoader
      */
-    private $LockGuardedCacheLoader;
+    private $lockGuardedCacheLoader;
 
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
-        $this->lockManagerInterfaceMock = $this->getMockForAbstractClass(LockManagerInterface::class);
+        $this->lockManagerInterfaceMock = $this->createMock(LockManagerInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
 
-        $objectManager = new ObjectManagerHelper($this);
-
-        $this->LockGuardedCacheLoader = $objectManager->getObject(
-            LockGuardedCacheLoader::class,
-            [
-                'locker' => $this->lockManagerInterfaceMock
-            ]
+        $this->lockGuardedCacheLoader = new LockGuardedCacheLoader(
+            $this->lockManagerInterfaceMock,
+            deploymentConfig: $this->deploymentConfigMock
         );
     }
 
@@ -63,12 +65,16 @@ public function testOptimisticDataRead(): void
             return true;
         };
 
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cache/allow_parallel_generation')
+            ->willReturn(false);
         $this->lockManagerInterfaceMock->expects($this->never())->method('lock');
         $this->lockManagerInterfaceMock->expects($this->never())->method('unlock');
 
         $this->assertEquals(
             'loaded_data',
-            $this->LockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
+            $this->lockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
         );
     }
 
@@ -93,16 +99,19 @@ public function testDataCollectedAfterDeadlineReached(): void
             return true;
         };
 
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cache/allow_parallel_generation')
+            ->willReturn(false);
         $this->lockManagerInterfaceMock
             ->expects($this->atLeastOnce())->method('lock')
             ->with($lockName, 0)
             ->willReturn(false);
-
         $this->lockManagerInterfaceMock->expects($this->never())->method('unlock');
 
         $this->assertEquals(
             'collected_data',
-            $this->LockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
+            $this->lockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
         );
     }
 
@@ -127,16 +136,19 @@ public function testDataWrite(): void
             return true;
         };
 
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cache/allow_parallel_generation')
+            ->willReturn(false);
         $this->lockManagerInterfaceMock
             ->expects($this->once())->method('lock')
             ->with($lockName, 0)
             ->willReturn(true);
-
         $this->lockManagerInterfaceMock->expects($this->once())->method('unlock');
 
         $this->assertEquals(
             'collected_data',
-            $this->LockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
+            $this->lockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
         );
     }
 
@@ -161,21 +173,19 @@ public function testDataCollectedWithParallelGeneration(): void
             return true;
         };
 
-        $closure = \Closure::bind(function ($cacheLoader) {
-            return $cacheLoader->allowParallelGenerationConfigValue = true;
-        }, null, $this->LockGuardedCacheLoader);
-        $closure($this->LockGuardedCacheLoader);
-
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cache/allow_parallel_generation')
+            ->willReturn(true);
         $this->lockManagerInterfaceMock
             ->expects($this->once())->method('lock')
             ->with($lockName, 0)
             ->willReturn(false);
-
         $this->lockManagerInterfaceMock->expects($this->never())->method('unlock');
 
         $this->assertEquals(
             'collected_data',
-            $this->LockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
+            $this->lockGuardedCacheLoader->lockedLoadData($lockName, $dataLoader, $dataCollector, $dataSaver)
         );
     }
 }