Merge pull request #919 from magento-troll/MAGETWO-65293

Stories: - MAGETWO-65181: Remove serialize/unserialize in \Magento\Framework\Unserialize\Unserialize - MAGETWO-65183: Remove serialize/unserialize in \Magento\Framework\Acl\Cache
magento · Mar 15, 2017 · e01d54c · e01d54c
2 parents b14d70e + 7420e24
commit e01d54c
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 341 deletions.
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
@@ -21,15 +21,6 @@ class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $_rootResource;
 
-    /**
-     * Acl object cache
-     *
-     * @var \Magento\Framework\Acl\CacheInterface
-     * @deprecated since 2.2 due to native serialization elimination.
-     * Use data cache \Magento\Framework\Acl\Data\CacheInterface instead.
-     */
-    protected $_aclCache;
-
     /**
      * @var \Magento\Framework\Acl\Builder
      */
@@ -50,7 +41,6 @@ class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Acl\Builder $aclBuilder
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Acl\RootResource $rootResource
-     * @param \Magento\Framework\Acl\CacheInterface $aclCache
      * @param string $connectionName
      * @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
      */
@@ -59,14 +49,12 @@ public function __construct(
         \Magento\Framework\Acl\Builder $aclBuilder,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Acl\RootResource $rootResource,
-        \Magento\Framework\Acl\CacheInterface $aclCache,
         $connectionName = null,
         \Magento\Framework\Acl\Data\CacheInterface $aclDataCache = null
     ) {
         $this->_aclBuilder = $aclBuilder;
         parent::__construct($context, $connectionName);
         $this->_rootResource = $rootResource;
-        $this->_aclCache = $aclCache;
         $this->_logger = $logger;
         $this->aclDataCache = $aclDataCache ?: ObjectManager::getInstance()->get(
             \Magento\Framework\Acl\Data\CacheInterface::class

diff --git a/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php b/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php
@@ -46,11 +46,6 @@ class RulesTest extends \PHPUnit_Framework_TestCase
      */
     private $rootResourceMock;
 
-    /**
-     * @var \Magento\Framework\Acl\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $aclCacheMock;
-
     /**
      * @var \Magento\Framework\Acl\Data\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -117,11 +112,6 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
-        $this->aclCacheMock = $this->getMockBuilder(\Magento\Framework\Acl\CacheInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
         $this->aclDataCacheMock = $this->getMockBuilder(\Magento\Framework\Acl\Data\CacheInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
@@ -145,7 +135,6 @@ protected function setUp()
             $this->aclBuilderMock,
             $this->loggerMock,
             $this->rootResourceMock,
-            $this->aclCacheMock,
             'connection',
             $this->aclDataCacheMock
         );

diff --git a/app/code/Magento/Authorization/etc/di.xml b/app/code/Magento/Authorization/etc/di.xml
@@ -10,7 +10,6 @@
     <type name="Magento\Authorization\Model\ResourceModel\Rules">
         <arguments>
             <argument name="rootResource" xsi:type="object">Magento\Framework\Acl\RootResource\Proxy</argument>
-            <argument name="aclCache" xsi:type="object">Magento\Framework\Acl\Cache\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Acl\Builder">

diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
@@ -89,11 +89,6 @@
             <argument name="resourceLoader" xsi:type="object">Magento\Framework\Acl\Loader\ResourceLoader</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Acl\Cache">
-        <arguments>
-            <argument name="cacheKey" xsi:type="string">backend_acl_resources</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Acl\RootResource">
         <arguments>
             <argument name="identifier" xsi:type="string">Magento_Backend::all</argument>

diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
@@ -202,11 +202,6 @@
             <argument name="default" xsi:type="string">frontend</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Acl\Cache">
-        <arguments>
-            <argument name="cacheKey" xsi:type="string">global_acl_resources</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Config\Initial\Converter">
         <arguments>
             <argument name="nodeMap" xsi:type="array">

diff --git a/app/code/Magento/User/Model/ResourceModel/User.php b/app/code/Magento/User/Model/ResourceModel/User.php
@@ -17,13 +17,6 @@
  */
 class User extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
-    /**
-     * @var \Magento\Framework\Acl\CacheInterface
-     * @deprecated since 2.2 due to native serialization elimination.
-     * Use data cache \Magento\Framework\Acl\Data\CacheInterface instead.
-     */
-    protected $_aclCache;
-
     /**
      * Role model
      *
@@ -45,22 +38,19 @@ class User extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Construct
      *
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param \Magento\Framework\Acl\CacheInterface $aclCache
      * @param \Magento\Authorization\Model\RoleFactory $roleFactory
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param string $connectionName
      * @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-        \Magento\Framework\Acl\CacheInterface $aclCache,
         \Magento\Authorization\Model\RoleFactory $roleFactory,
         \Magento\Framework\Stdlib\DateTime $dateTime,
         $connectionName = null,
         \Magento\Framework\Acl\Data\CacheInterface $aclDataCache = null
     ) {
         parent::__construct($context, $connectionName);
-        $this->_aclCache = $aclCache;
         $this->_roleFactory = $roleFactory;
         $this->dateTime = $dateTime;
         $this->aclDataCache = $aclDataCache ?: \Magento\Framework\App\ObjectManager::getInstance()->get(

diff --git a/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php b/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
@@ -21,9 +21,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\User\Model\User|\PHPUnit_framework_MockObject_MockObject */
     protected $userMock;
 
-    /** @var \Magento\Framework\Acl\CacheInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $aclCacheMock;
-
     /** @var \Magento\Framework\Model\ResourceModel\Db\Context|\PHPUnit_Framework_MockObject_MockObject */
     protected $contextMock;
 
@@ -62,11 +59,6 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
-        $this->aclCacheMock = $this->getMockBuilder(\Magento\Framework\Acl\CacheInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
         $this->roleFactoryMock = $this->getMockBuilder(\Magento\Authorization\Model\RoleFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
@@ -102,7 +94,6 @@ protected function setUp()
             \Magento\User\Model\ResourceModel\User::class,
             [
                 'resource' => $this->resourceMock,
-                'aclCache' => $this->aclCacheMock,
                 'roleFactory' => $this->roleFactoryMock,
                 'dateTime' => $this->dateTimeMock,
                 'aclDataCache' => $this->aclDataCacheMock,

diff --git a/app/code/Magento/User/etc/di.xml b/app/code/Magento/User/etc/di.xml
@@ -6,11 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\User\Model\ResourceModel\User">
-        <arguments>
-            <argument name="aclCache" xsi:type="object">Magento\Framework\Acl\Cache\Proxy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Authorization\Model\Role">
         <plugin name="updateRoleUsersAcl" type="Magento\User\Model\Plugin\AuthorizationRole" sortOrder="20"/>
     </type>

diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -106,7 +106,6 @@
     <preference for="Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface" type="Magento\Framework\Model\ResourceModel\Type\Db\Pdo\Mysql"/>
     <preference for="Magento\Framework\DB\QueryInterface" type="Magento\Framework\DB\Query"/>
     <preference for="Magento\Framework\App\ProductMetadataInterface" type="Magento\Framework\App\ProductMetadata"/>
-    <preference for="Magento\Framework\Acl\CacheInterface" type="Magento\Framework\Acl\Cache" />
     <preference for="Magento\Framework\Acl\Data\CacheInterface" type="Magento\Framework\Acl\Data\Cache" />
     <preference for="Magento\Framework\App\AreaInterface" type="Magento\Framework\App\Area" />
     <preference for="Magento\Framework\Setup\ModuleDataSetupInterface" type="Magento\Setup\Module\DataSetup" />

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4227,4 +4227,7 @@
     ['Magento\Framework\Search\Document', 'Magento\Framework\Api\Search\Document'],
     ['Magento\Framework\Search\DocumentField'],
     ['Magento\Quote\Setup\Recurring'],
+    ['Magento\Framework\Acl\Cache'],
+    ['Magento\Framework\Acl\CacheInterface'],
+    ['Magento\Framework\Acl\Test\Unit\CacheTest'],
 ];
diff --git a/lib/internal/Magento/Framework/Acl/Builder.php b/lib/internal/Magento/Framework/Acl/Builder.php
@@ -25,35 +25,24 @@ class Builder
      */
     protected $_loaderPool;
 
-    /**
-     * ACL cache
-     *
-     * @var \Magento\Framework\Acl\CacheInterface
-     * @deprecated
-     */
-    protected $_cache;
-
     /**
      * @var \Magento\Framework\AclFactory
      */
     protected $_aclFactory;
 
     /**
      * @param \Magento\Framework\AclFactory $aclFactory
-     * @param \Magento\Framework\Acl\CacheInterface $cache
      * @param \Magento\Framework\Acl\LoaderInterface $roleLoader
      * @param \Magento\Framework\Acl\LoaderInterface $resourceLoader
      * @param \Magento\Framework\Acl\LoaderInterface $ruleLoader
      */
     public function __construct(
         \Magento\Framework\AclFactory $aclFactory,
-        \Magento\Framework\Acl\CacheInterface $cache,
         \Magento\Framework\Acl\LoaderInterface $roleLoader,
         \Magento\Framework\Acl\LoaderInterface $resourceLoader,
         \Magento\Framework\Acl\LoaderInterface $ruleLoader
     ) {
         $this->_aclFactory = $aclFactory;
-        $this->_cache = $cache;
         $this->_loaderPool = [$roleLoader, $resourceLoader, $ruleLoader];
     }
 

diff --git a/lib/internal/Magento/Framework/Acl/Cache.php b/lib/internal/Magento/Framework/Acl/Cache.php
diff --git a/lib/internal/Magento/Framework/Acl/CacheInterface.php b/lib/internal/Magento/Framework/Acl/CacheInterface.php