MAGETWO-65287: Remove class, related unit tests, add to obsolete classes

Author: slopukhov

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

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
         );

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(

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,

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'],
 ];

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];
     }
 

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

@@ -39,23 +39,16 @@ class BuilderTest extends \PHPUnit_Framework_TestCase
      */
     protected $_model;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_aclCacheMock;
-
     protected function setUp()
     {
         $this->_aclMock = new \Magento\Framework\Acl();
-        $this->_aclCacheMock = $this->getMock(\Magento\Framework\Acl\CacheInterface::class);
         $this->_aclFactoryMock = $this->getMock(\Magento\Framework\AclFactory::class, [], [], '', false);
         $this->_aclFactoryMock->expects($this->any())->method('create')->will($this->returnValue($this->_aclMock));
         $this->_roleLoader = $this->getMock(\Magento\Framework\Acl\Loader\DefaultLoader::class);
         $this->_ruleLoader = $this->getMock(\Magento\Framework\Acl\Loader\DefaultLoader::class);
         $this->_resourceLoader = $this->getMock(\Magento\Framework\Acl\Loader\DefaultLoader::class);
         $this->_model = new \Magento\Framework\Acl\Builder(
             $this->_aclFactoryMock,
-            $this->_aclCacheMock,
             $this->_roleLoader,
             $this->_resourceLoader,
             $this->_ruleLoader
@@ -64,10 +57,6 @@ protected function setUp()
 
     public function testGetAclUsesLoadersProvidedInConfigurationToPopulateAclIfCacheIsEmpty()
     {
-        $this->_aclCacheMock->expects($this->never())->method('has');
-        $this->_aclCacheMock->expects($this->never())->method('get');
-        $this->_aclCacheMock->expects($this->never())->method('save');
-        $this->_aclCacheMock->expects($this->never())->method('clean');
         $this->_ruleLoader->expects($this->once())->method('populateAcl')->with($this->equalTo($this->_aclMock));
 
         $this->_roleLoader->expects($this->once())->method('populateAcl')->with($this->equalTo($this->_aclMock));
@@ -79,13 +68,6 @@ public function testGetAclUsesLoadersProvidedInConfigurationToPopulateAclIfCache
 
     public function testGetAclReturnsAclStoredInCache()
     {
-        /**
-         * The acl cache of type \Magento\Framework\Acl\CacheInterface is deprecated and should never be called
-         */
-        $this->_aclCacheMock->expects($this->never())->method('has');
-        $this->_aclCacheMock->expects($this->never())->method('get');
-        $this->_aclCacheMock->expects($this->never())->method('save');
-        $this->_aclCacheMock->expects($this->never())->method('clean');
         $this->assertEquals($this->_aclMock, $this->_model->getAcl());
         $this->assertEquals($this->_aclMock, $this->_model->getAcl());
     }