ACP2E-4114: Production ACL Permission Check caused Performance Degradation – populateAcl Method is the bottleneck

Author: abukatar

app/code/Magento/Authorization/Model/Acl/Loader/Rule.php

@@ -75,15 +75,15 @@ public function __construct(
         ResourceConnection  $resource,
         CacheInterface      $aclDataCache,
         Json                $serializer,
-        array               $data = [],
-        string              $cacheKey = self::ACL_RULE_CACHE_KEY,
+        ?array              $data = [],
+        ?string             $cacheKey = self::ACL_RULE_CACHE_KEY,
         ?CurrentRoleContext $roleContext = null
     ) {
         $this->_rootResource = $rootResource;
         $this->_resource = $resource;
         $this->aclDataCache = $aclDataCache;
         $this->serializer = $serializer;
-        $this->cacheKey = $cacheKey;
+        $this->cacheKey = $cacheKey ?? self::ACL_RULE_CACHE_KEY;
 
         $this->roleContext = $roleContext ?? \Magento\Framework\App\ObjectManager::getInstance()
             ->get(CurrentRoleContext::class);

app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/MissingDeclineRuleTest.php

@@ -14,6 +14,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Serialize\Serializer\Json;
 use PHPUnit\Framework\MockObject\Exception;
+use Magento\Framework\Acl\Role\CurrentRoleContext;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -80,11 +81,16 @@ static function ($value) {
                 }
             );
 
+        $ruleContext = $this->createMock(CurrentRoleContext::class);
+
         $this->model = new Rule(
             $this->rootResource,
             $this->resourceMock,
             $this->aclDataCacheMock,
-            $this->serializerMock
+            $this->serializerMock,
+            null,
+            null,
+            $ruleContext
         );
     }