Merge remote-tracking branch 'fork-trigger/session_size' into AC-5893-replace-zend-acl

Author: andrewbess

app/code/Magento/Backend/Model/Auth/Session.php

@@ -18,8 +18,6 @@
  * @api
  * @method \Magento\User\Model\User|null getUser()
  * @method \Magento\Backend\Model\Auth\Session setUser(\Magento\User\Model\User $value)
- * @method \Magento\Framework\Acl|null getAcl()
- * @method \Magento\Backend\Model\Auth\Session setAcl(\Magento\Framework\Acl $value)
  * @method int getUpdatedAt()
  * @method \Magento\Backend\Model\Auth\Session setUpdatedAt(int $value)
  *
@@ -62,6 +60,11 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      */
     private $messageManager;
 
+    /**
+     * @var \Magento\Framework\Acl|null
+     */
+    private $acl = null;
+
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -284,4 +287,33 @@ public function isValidForPath($path)
     {
         return true;
     }
+
+    /**
+     * Set Acl model
+     *
+     * @return \Magento\Framework\Acl
+     */
+    public function getAcl()
+    {
+        return $this->acl;
+    }
+
+    /**
+     * Retrieve Acl
+     *
+     * @param \Magento\Framework\Acl $acl
+     * @return void
+     */
+    public function setAcl(\Magento\Framework\Acl $acl)
+    {
+        $this->acl = $acl;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData($key = '', $clear = false)
+    {
+        return $key === 'acl' ? $this->getAcl() : parent::getData($key, $clear);
+    }
 }

app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php

@@ -79,7 +79,7 @@ protected function setUp(): void
             ['getCookie', 'setPublicCookie']
         );
         $this->storage = $this->getMockBuilder(Storage::class)
-            ->addMethods(['getUser', 'getAcl', 'setAcl'])
+            ->addMethods(['getUser'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->sessionConfig = $this->createPartialMock(
@@ -133,8 +133,6 @@ public function testRefreshAcl($isUserPassedViaParams)
         $userMock->expects($this->any())->method('getReloadAclFlag')->willReturn(true);
         $userMock->expects($this->once())->method('setReloadAclFlag')->with('0')->willReturnSelf();
         $userMock->expects($this->once())->method('save');
-        $this->storage->expects($this->once())->method('setAcl')->with($aclMock);
-        $this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
         if ($isUserPassedViaParams) {
             $this->session->refreshAcl($userMock);
         } else {
@@ -250,7 +248,7 @@ public function testIsAllowed($isUserDefined, $isAclDefined, $isAllowed, $expect
             $aclMock = $this->getMockBuilder(Acl::class)
                 ->disableOriginalConstructor()
                 ->getMock();
-            $this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
+            $this->session->setAcl($aclMock);
         }
         if ($isUserDefined) {
             $userMock = $this->getMockBuilder(User::class)